Changeset 10654 for lang/elisp

Timestamp:

04/28/08 17:49:07 (7 months ago)

Author:

lieutar

Message:

I made changes of elisp files to compilable.

Location:

lang/elisp/escm/trunk

Files:

• Makefile.el (deleted)
• Makefile.in (modified) (2 diffs)
• README.rd (modified) (2 diffs)
• emacs-config.el (added)
• src/elisp/DEVELOPERSTOOLS.el (modified) (5 diffs)
• src/elisp/escm-arity.el (modified) (1 diff)
• src/elisp/escm-base.el (modified) (1 diff)
• src/elisp/escm-cbos.el (modified) (3 diffs)
• src/elisp/escm-compile.el (modified) (18 diffs)
• src/elisp/escm-debug.el (modified) (4 diffs)
• src/elisp/escm-env.el (modified) (12 diffs)
• src/elisp/escm-iblock-content.el (modified) (18 diffs)
• src/elisp/escm-iblock.el (modified) (3 diffs)
• src/elisp/escm-icode.el (modified) (1 diff)
• src/elisp/escm-port.el (modified) (6 diffs)
• src/elisp/escm-preprocess.el (deleted)
• src/elisp/escm-proc.el (modified) (7 diffs)
• src/elisp/escm-test.el (modified) (1 diff)
• src/elisp/escm-util.el (modified) (1 diff)
• src/elisp/escm-vm.el (modified) (6 diffs)
• src/elisp/escm.el (modified) (2 diffs)
• src/escm/init.escm (added)
• src/test/input-file.00 (added)
• src/test/test.escm (added)

lang/elisp/escm/trunk/Makefile.in

@@ -1 +1 @@
 
 EMACS=@EMACS@
-EMACSFLAGS= -batch -q -L .
+SITELISP=@SITELISP@
+
+ELDIR=src/elisp
+ESCMDIR=src/escm
+
 ELS= escm-util.minimal.el \
      escm-test.el \
@@ -8 +12 @@
 \
      escm-base.el \
-     escm-preprocess.el \
+\
+     escm-env.el \
 \
      escm-arity.el \
-     escm-env.el \
      escm-proc.el \
+\
      escm-syntax.el \
+     escm-iblock-content.el \
+     escm-iblock.el \
+     escm-icode.el \
+     escm-elizer.el \
+     escm-compile.el \
+     escm-port.el \
 \
-      escm-iblock-content.el \
-      escm-iblock.el \
-      escm-icode.el \
-\
-      escm-context.el \
-      escm-compile.el \
-\
-      escm-debug.el \
-      escm-vm.el \
-      escm.el 
+     escm-debug.el \
+     escm-vm.el \
+     escm.el 
 
-.SUFFIXES: .el .elc
+EMACSFLAGS= -batch -q -L .
+
+.SUFFIXES: .el .elc .escm .escmc
 
 .el.elc:
         $(EMACS) $(EMACSFLAGS) -f batch-byte-compile $<
 
-elc: $(ELS:.el=.elc)
+.escm.escmc:
+        $(EMACS) $(EMACSFLAGS) -l escm.el -f escm-batch-byte-compile $<
+
+
+
+elc:
+        cd src/elisp; \
+        make -f ../../Makefile.in elcs EMACS=$(EMACS)
+
+elcs:  $(ELS:.el=.elc)
+
 
 clean:
-        rm -rf *.elc
+        find . -type f -name \*.elc |xargs rm
+
+install: install.el
+        $(EMACS) $(EMACSFLAGS) -l emacs-config.el
 
 distclean: clean

lang/elisp/escm/trunk/README.rd

@@ -12 +12 @@
 * $BKvHx:F5"$N:GE,2=(B
 * call/cc
-
 
 == elisp $B$C$]$$$H$3$m(B
@@ -29 +28 @@
 * $BG$0U8D?t$N(BVM$B%$%s%9%?%s%9$,:n$l$k(B
 
-
 =end
-

lang/elisp/escm/trunk/src/elisp/DEVELOPERSTOOLS.el

@@ -6 +6 @@
 
   (require 'escm)
-
   (global-set-key [?\C-c ?e ?a] 'escm-debug::activate)
   (global-set-key [?\C-c ?e ?d] 'escm-debug::deactivate)
@@ -25 +24 @@
 (when nil
   (escm-vm::eval (escm-vm::new)  '(+ 0 1 (* 2 3) 4))
+
   (escm-vm::eval (escm-vm::new)  '(if nil 1 2))
-  (escm-vm::eval
-   (escm-vm::new)
-   '((lambda ()
-       (define (fact n) (if (= n 1) n (* n (fact (- n 1)))))
-       (fact 10))))
+
+  (escm-vm::eval (escm-vm::new)
+                 '((lambda ()
+                     (define (fact n) (if (= n 1) n (* n (fact (- n 1)))))
+                     (fact 10))))
 
   (progn 
+
     (defun fib (n)
       (if (< n 2)
@@ -38 +39 @@
         (+ (fib (- n 2))
            (fib (- n 1)))))
-    (escm-eval '(fib 10)))
+
+    (escm-eval '(fib 10))
+
+    )
 
   (escm-vm::eval
@@ -65 +69 @@
 ))
 
-(funcall
-#[(vm) "\306\307\310\307\311\312\306\211\211\211\211&\307\313\306\314\315!\316       \317\320\306BB\"\210    )\320\306%\307\321\322\323\307\303\324\325\326\327\330\331\312\307\310\307\311\332\330\306B\306\211\211\211&\307\333\306\314\315!\316 \330\320\334\335\306BBBB\"\210  )\314\336!\316 \334\306\211BB\"\210    )\307\311\332\330\306B\306\211\211\211&\334\330\306BB&\307\321\322\337\307\303\324\325\326\327\330\331\312\307\310\307\311\340\341\342\330\306BBB\306\211\211\211&\307\333\306\314\315!\316 \341\320\342\335\330\343\306BBBBBB\"\210        )\314\336!\307\311\340\341\342\330\306BBB\306\211\211\211&\330\342\341\306BBB&\307\321\322\344\307\303\330\345\327\324\325\331\312\332\346\306\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\326\370&
-\371$\321\322\372\307\303\330\331\312\373\320\374\375&\335$\321\322\376\307\303\330\345\327\324\325\331\312\332\346\306\347\342\350\351\377\201@\352\340\341\320\201A\354\355\356\357\360\361\362\363\364\365\366\367\201B\326\370&%\371$\321\322\201C\307\303\201B\330\345\327\324\331\312\373\377\201@\332\346\306\347\352\350\351\340\201D\354\355\356\357\360\361\362\363\364\365\366\367\325\326\370&#\371$\321\322\201E\307\303\201B\327\324\325\370\331\312\373\377\201@\332\334\350\354\356\201F\360\201G\362\201H\364\365\374\367&\335$\321\322\201I\307\303\330\331\312\332\374\375&\335$\321\322\201J\307\303\330\345\327\324\325\331\312\332\346\306\347\342\350\351\341\352\201A\354\356\201F\360\201G\362\201H\364\365\374\367\326\370&\371$\321\322\201K\307\303\331\312\201L\201M\201N\201O\201P&\340$&\306\307\201Q\201R\201S#&\350\201T\373\332\334\201U\352\340\346\306\347\320\351\335\354\356\201F\360\201G\362\201H\364\365\374\367\345\370&$\371$\321\322\201K\307\303\331\312\201L\201M\201N\201O\201P&\340$\"\306\307\201Q\201V\201W#&\350\201T\373\332\317\201U\352\340\346\306\347\320\201X\377\201@\335\354\356\201F\360\201G\362\201H\364\365\374\367\345\201B\370&'\343$\321\322\201K\307\303\331\312\201L\201M\201N\201O\201P&\340$\"\306\307\201Q\201Y\201Z#&\211)\211\201[!@)
-\211
-\352I\210*
-
-8\355 \2108\206\332\356!
-8\357\3608!\"\210\361\3628!\"\210\363\3648\"\"\210\365!\210\366\367\",\207" [escm-util::gensym::18441/32920/95488/8 sym top vm val obj nil vector escm-proc escm-arity 0 escm-fixed-env make-symbol "*dic*" setplist fib 4 make-byte-code (vm *env*) "\306\307\"\210\310C\311\312
-        #*\313!\240\210*\306\314\"\210\315\313!@)D\311\316
-        #\210*\306\317\"\210\315\313!\240\210*\306\320\"\210\314
-\321!
-$
-\307V\203c\322$B$
-S\211\202Q\323$\"\210+\306\324\"\210\325
-%\326%\327!B\"\210*\306\330\"\210\315C\311\331
-        #*
-&&\206\233\332!
-&\333\334&!\"\210\335\336&!\"\210\337\340&\"\"\210\341!\210\342\343\"+\207" args *object* v *env* n escm-debug 1 escm-dynamic-env iter 5 "*valdic*" "\306\307\"\210\310C\311\312
-        #*\313!\240\210*\306\314\"\210\315\313!@)D\311\316
-        #\210*\306\317\"\210\315\313!\240\210*\306\320\"\210\314
-\321!
-\"
-\307V\203c\322\"B\"
-S\211\202Q\323\"\"\210+\306\324\"\210\305C\311\325
-        #*\314\307\321!@)BBB\321!\240\210*\306\326\"\210\315C\311\327
-        #*
-##\206\254\330!
-#\331\332#!\"\210\333\334#!\"\210\335\336#\"\"\210\337!\210\340\341\"+\207" 3 a b 6 "\306\307\"\210\310\311!     \307V\203
-\312
-B      S\211\202\313
-\"\210+\306\310\"\210\307\301C
-
-\314\315
-#*\311!@)BB
-
-\311!
-\240\210*\306\316\"\210\317C
-
-\314\320
-#*
-
-\321 \210
-\206i\322!
-
-\323\324
-!\"\210\325\326
-!\"\210\327\330
-\"\"\210\331!\210\332\333\"+\207" stack escm-vm::get-arg-stack escm-vm::set-arg-stack escm-cbos::run-method escm-env::gref 2 = escm-env::fref escm-debug::enter escm-vm::current-val escm-vm::push-src escm-proc::get-src escm-vm::push-proc escm-proc::get-body escm-vm::push-env escm-proc::runtime-env escm-vm::pop-arg escm-vm::push-pc -1 proc 7 "\302\303\"\210\304!@)\205
-\305\306    \307!\\\"*\207" escm-vm::get-val-stack escm-vm::set-current-pc escm-vm::current-pc "\306\307\"\210\310\311!      \307V\203
-\312
-B      S\211\202\313
-\"\210+\306\310\"\210\314C
-
-\315\316
-#*
-\"\317\"\320!B\"\210*\306\321\"\210\310\311!  \307V\203a\312
-B      S\211\202Q\313
-\"\210+\306\322\"\210\314C
-
-\315\316
-#*\323C
-
-\315\316
-#*\311!@)BB
-#\311!#\240\210*\306\324\"\210\325C
-
-\315\326
-#*
-$\327 \210$\206\266\330!
-$\331\332$!\"\210\333\334$!\"\210\335\336$\"\"\210\337!\210\340\341\"+\207" escm-vm::set-current-arg escm-vm::current-arg + arg "\306\307\"\210\211\310!@)\311  \312!B\"\210*\306\313\"\210\313\314!
-\307V\2037\315B
-S\211\202'\316\"\210+\306\317\"\210\313\302C
-
- \320\321 
-#*\314!@)BB
-!\314!!\240\210*\306\322\"\210\323C
-
- \320\324 
-#*
-\"\325 \210\"\206\206\326!
-\"\327\330\"!\"\210\331\332\"!\"\210\333\334\"\"\"\210\335!\210\336\337\"+\207" - "\306\307\"\210\211\310!@)\311        \312!B\"\210*\306\313\"\210
-\314C
-\315\316#*
-
-\2063\317!
-\320\321
-!\"\210\322\323
-!\"\210\324\325
-\"\"\210\326!\210\327\330\"+\207" escm-vm::set-current-src escm-vm::set-current-proc escm-vm::set-current-env "\302\303\"\210\304\305   \306!\\\"*\207" "\306\307\"\210\310\311! \307V\203
-\312
-B      S\211\202\313
-\"\210+\306\310\"\210\314C
-
-\315\316
-#*\317C
-
-\315\316
-#*\311!@)BB
-
-\311!
-\240\210*\306\320\"\210\321C
-
-\315\322
-#*
-
-
-\206p\323!
-
-\324\325
-!\"\210\326\327
-!\"\210\330\331
-\"\"\210\332!\210\333\334\"+\207" "\301\302\"\210\303!\210\304!\210\305!\210\306!\210\307 )\207" escm-vm::pop-src escm-vm::pop-proc escm-vm::pop-env escm-vm::pop-pc escm-debug::leave escm-iproc (list (vector (quote escm-iblock) (quote (list nil nil nil)) (quote t)) (vector (quote escm-iblock) (quote (list nil)) (quote t)) (vector (quote escm-iblock) (quote (list nil nil nil nil nil)) (quote t)) (vector (quote escm-iblock) (quote (list nil nil nil nil)) (quote t)) (vector (quote escm-iblock) (quote (list nil nil)) (quote t)) (vector (quote escm-iblock) (quote (list nil)) (quote t)) (vector (quote escm-iblock) (quote (list nil nil nil)) (quote t)) (vector (quote escm-iblock) (quote (list nil)) (quote t))) (lambda (a b n) (if (= n 0) (+ a b) (iter b (+ a b) (- n 1)))) escm-proc::activate escm-env::gset! (list (vector (quote escm-iblock) (quote (list nil nil nil nil nil nil)) (quote t)) (vector (quote escm-iblock) (quote (list nil)) (quote t))) (lambda (n) (define (iter a b n) (if (= n 0) (+ a b) (iter b (+ a b) (- n 1)))) (iter 0 1 n)) 10 (list (vector (quote escm-iblock) (quote (list nil nil nil nil nil nil)) (quote t)) (vector (quote escm-iblock) (quote (list nil)) (quote t))) (lambda nil (define (fib n) (define (iter a b n) (if (= n 0) (+ a b) (iter b (+ a b) (- n 1)))) (iter 0 1 n)) (fib 10)) escm-vm::get-env-stack] 83]
-
-(escm-vm::new)
-)
-
-
-
-
+(when nil
 
   (escm-vm::eval
@@ -237 +123 @@
   (escm-eval '(fact 20))
   (fact 1)
-  ((elambda (a b) (+ a b)) 1 2)
-  )
+
+  ((elambda (a b) (+ a b)) 1 2) )
+)

lang/elisp/escm/trunk/src/elisp/escm-arity.el

@@ -27 +27 @@
 ;;; Code:
 (require 'escm-base)
-;;(require 'escm-env)
+(require 'escm-env)
 
 (escm-cbos::define-class (escm-arity escm-object)

lang/elisp/escm/trunk/src/elisp/escm-base.el

@@ -22 +22 @@
    (escm-unsupported   "")))
 
+
+
+
 ;; variables
-(defconst escm-compiler-varsion 0.01)
+(defconst escm-compiler-version 0.01)
 (defconst escm-icode::indent "" "")
 
+;; utilities that only in this project.
+
+(defun escm-project-directory (purpose)
+  "Returns absolute path to the directory that is purposed by PURPOSE."
+  (expand-file-name
+   (case purpose
+     ((test) "test")
+     ((escm) "escm")
+     (t (signal 'error (list "unknown project-directory type" purpose))))
+   (expand-file-name
+    "../"
+    (file-name-directory (locate-library "escm")))))
 
 (provide 'escm-base)

lang/elisp/escm/trunk/src/elisp/escm-cbos.el

@@ -64 +64 @@
   (get 'escm-cbos::class-fields class))
 
-(defsubst escm-cbos::register-class (name super fields)
-  ""
-  (put 'escm-cbos::class-vmt
-       name (let ((tbl (make-symbol (format "*spec:%s*" name))))
-              (set tbl
-                   (cons name
-                         (symbol-value (get 'escm-cbos::class-vmt
-                                            super))))
-              tbl))
-  (let ((retval
+(defsubst escm-cbos::make-class-info (name super fields)
+  ""
+  (unless (or (null super)
+              (escm-cbos::classp super))
+    (signal 'error `(classp ,super)))
+  (let ((fields
          (if super (append (escm-cbos::get-fields-of super) fields) fields)))
-    (put 'escm-cbos::class-fields name retval)
-    retval))
+    (cons fields
+          `(progn
+             (put 'escm-cbos::class-fields ',name ',fields)
+             (put 'escm-cbos::class-vmt
+                  ',name (let ((*tbl* (make-symbol (format "*spec:%s*" ',name))))
+                           (set *tbl*
+                                (cons ',name
+                                      ',(symbol-value (get 'escm-cbos::class-vmt
+                                                           super))))
+                           *tbl*))))))
+
+;;(escm-cbos::make-class-info 'a nil '(c d))
+
+(defun escm-cbos::register-class  (name super fields)
+  (eval (cdr (escm-cbos::make-class-info name super fields))))
 
 (defmacro escm-cbos::define-method (class name args &rest body)
   "defines method of escm-cbos objects."   
   `(progn
-     ,(when (not (fboundp 'name))
-        `(defsubst ,name (*object* &rest args)
+     (when (not (fboundp ',name))
+        (defun ,name (*object* &rest args)
            (escm-cbos::run-method ',name *object* args)))
      ,(if (null class)
@@ -184 +193 @@
   (let* ((name      (car inhspec))
          (super     (or (cadr inhspec) 'escm-cbos::Object))
-         (fields    (escm-cbos::register-class name super fields))
+         (classinfo (escm-cbos::make-class-info name super fields))
+         (fields    (car classinfo))
          (len       (length fields))
          (new       (intern (format "create-%s" name)))
          (pred      (intern (format "%s-p"      name))))
     `(progn
+       ,(cdr classinfo)
        (defsubst ,new ()
          (let ((new (make-vector ,(+ 1 len) nil)))
@@ -292 +303 @@
   (equal a b))
 
-(escm-cbos::define-method nil escm-cbos::stringify (self)
-  (format "#<normal : %S>" self))
-
 (escm-cbos::define-method
   escm-cbos::Object escm-cbos::stringify (self)

lang/elisp/escm/trunk/src/elisp/escm-compile.el

@@ -30 +30 @@
 (require 'escm-syntax )
 (require 'escm-icode  )
+
 (require 'escm-env    )
-(require 'escm-context)
+(require 'escm-arity  )
+
+;;(require 'escm-context)
+(escm-cbos::define-class
+ (escm-context escm-object t)
+ (vm)            ;; virtual machine.
+ (env    :copy)  ;; environment of current context.
+ (tail?  :copy)  ;; non nil if current context is terminal.
+ (func?  :copy))
+
+(defsubst escm-context::new (env &optional vm)
+  (let ((new (escm-context::set-env (create-escm-context) env)))
+    (escm-context::set-vm     new vm)
+    new))
+
+(defsubst escm-context::push (self &optional syms)
+  (escm-context::new
+   (escm-dynamic-env::new (escm-context::get-env self) syms)
+   (escm-context::get-vm self)))
+;;
 
 (defun escm-elize (context)
-  `(lambda (vm)
-     (let ,(escm-context::get-all-symbols context)
-       ,@(escm-context::build-object-definer context)
-       ,@(escm-context::build-vm-manupilator context))))
+  (list 'lambda '(vm)
+        (append (list 'let (escm-context::get-all-symbols context))
+                (escm-context::build-object-definer context)
+                (escm-context::build-vm-manupilator context))))
 
 
@@ -67 +87 @@
    ((and sexp
          (symbolp sexp))
-    (escm-icode `(( ,(if (escm-context::get-func? context) 'fref 'ref)
-                    ,sexp
-                    ,(escm-context::get-env context)))))
+    (escm-icode (list (list (if (escm-context::get-func? context) 'fref 'ref)
+                            sexp
+                            (escm-context::get-env context)))))
 
    ;; sexp
-   (t (escm-icode `((store  ,sexp))))))
+   (t (escm-icode (list (list 'store  sexp))))))
 ;;(escm-vm::eval (escm-vm::new) '(+ 1 2))
 
@@ -88 +108 @@
 
     (escm-test varref (equal (escm-test::p 'icode (escm-compile context 'a))
-                             (escm-icode `((ref a ,root)))))
+                             (escm-icode (list (list 'ref 'a root)))))
 
     (escm-test::p 'built (escm-iproc::build (escm-compile context 'a)))))
@@ -105 +125 @@
                             (escm-context::set-func? context t)  head))
     (escm-iproc::merge ret
-                       (escm-icode `((,(if (escm-context::get-tail? context)
-                                           'tcall
-                                         'call)))))))
+                       (escm-icode (list (list (if (escm-context::get-tail? context)
+                                                   'tcall
+                                                 'call)))))))
 ;;; test code
 (escm-test::define-test escm escm-compile-apply
@@ -140 +160 @@
     (when nega1 (escm-iblock::add-contents
                  posi0 (escm-inimonic::new 'jmp (list (length nega1)))))
-    (escm-iproc::merge condx (escm-icode `((ifv ,posi0 ,nega0))))
+    (escm-iproc::merge condx (escm-icode (list (list 'ifv posi0 nega0))))
     (escm-iproc::merge condx (escm-iproc::new nega1))))
 
@@ -150 +170 @@
     (when posi1 (escm-iblock::add-contents
                  nega0 (escm-inimonic::new 'jmp (list (length posi1)))))
-    (escm-iproc::merge condx (escm-icode `((ifv ,posi0 ,nega0))))
+    (escm-iproc::merge condx (escm-icode (list (list 'ifv posi0 nega0))))
     (escm-iproc::merge condx (escm-iproc::new posi1))))
 
@@ -156 +176 @@
   ""
   (escm-iproc::merge negativex
-                     (escm-icode `((jmp ,(escm-iproc::length positivex)))))
+                     (escm-icode (list (list 'jmp (escm-iproc::length positivex)))))
   (escm-iproc::merge condx
-                     (escm-icode `((jt  ,(escm-iproc::length negativex)))))
+                     (escm-icode (list (list 'jt  (escm-iproc::length negativex)))))
   (escm-iproc::merge condx negativex)
   (escm-iproc::merge condx positivex))
@@ -212 +232 @@
 (defun escm-compile-elamba (context sexp)
   (let* ((elfun (byte-compile (cons 'lambda (cdr sexp)))))
-    (escm-icode `((store ,(escm-wrapped-proc::new elfun))))))
-
-(defun escm-compile-elmeth ()
+    (escm-icode (list (list 'store (escm-wrapped-proc::new elfun))))))
+
+(defun escm-compile-elmeth (context sexp)
   (let* ((elfun (byte-compile (cons 'lambda (cdr sexp)))))
-    (escm-icode `((store ,(escm-wrapped-vm-method::new elfun))))))
-
+    (escm-icode (list (list 'store (escm-wrapped-vm-method::new elfun))))))
+
+(defun escm-compile-set! (context sexp)
+  (let* ((sym   (cadr sexp))
+         (val   (caddr sexp))
+         (iproc (escm-compile (escm-context::set-tail? context nil) val)))
+    (escm-iproc::merge iproc
+                       (escm-icode (list (list 'set! sym (escm-context::get-env context)))))))
 
 
@@ -223 +249 @@
   (let* ((bindings (cadr sexp))
          (body     (cddr sexp))
-         (name     (unless (listp binding)
+         (name     (unless (listp bindings)
                      (let ((name bindings))
                        (setq bindings (car body))
@@ -238 +264 @@
      bindings)
     (when name (setq syms (cons name syms)))
-    (let ((proc (escm-compile context `(lambda ,syms ,body)))
+    (let ((proc (escm-compile context (list 'lambda syms body)))
           (ret  (escm-iproc::new ())))
      
       (mapcar
        (lambda (v) (escm-iproc::merge ret v))
-       (if name (cons (escm-iproc `((store-to-arg ,proc))) vals)
+       (if name (cons (escm-iproc (list (list 'store-to-arg proc))) vals)
          vals))
       ret)))
@@ -257 +283 @@
                       name
                       (escm-syntax::new proc))
-    (escm-icode `((store ',name)))))
+    (escm-icode (list (list 'store (list 'quote name))))))
 
 (escm-test::define-test escm define-syntax
@@ -322 +348 @@
 ;;
 (defun escm-compile-lambda (context sexp)
-  (escm-icode `((store-proc ,(escm-compile-lambda1 context sexp)))))
+  (escm-icode (list (list 'store-proc (escm-compile-lambda1 context sexp)))))
 
 ;;
@@ -340 +366 @@
      "compiled"
      (escm-iproc::to-string
-      (escm-icode `((store-proc ,(escm-compile-lambda1 context sexp))))))
+      (escm-icode (list (list 'store-proc (escm-compile-lambda1 context sexp))))))
     (funcall test (escm-compile-lambda1 context sexp))
     (funcall test (escm-vm::eval vm sexp))))
@@ -349 +375 @@
   (let ((body (cdr sexp)))
     (escm-icode
-     `((store-proc
-        ,(escm-wrapped-proc::new
-          (if  (= (length body) 1)
-              body
-            (byte-compile (cons 'lambda body)))))))))
+     (list (list 'store-proc
+                 (escm-wrapped-proc::new
+                  (if  (= (length body) 1)
+                      body
+                    (byte-compile (cons 'lambda body)))))))))
 
 ;;
@@ -359 +385 @@
   (let* ((spec (cadr sexp)))
     (if (listp spec)
-        `(,(car spec) (lambda ,(cdr spec) ,@(cddr sexp)))
-      `(, name ,(caddr sexp)))))
+        (list (car spec)
+              (append (list 'lambda (cdr spec))
+                      (cddr   sexp)))
+      (list spec
+            (caddr sexp)))))
 
 ;;
@@ -370 +399 @@
     (escm-env::define  env  name)
     (escm-iproc::merge (escm-compile context body)
-                       (escm-icode `((set!  ,name ,env)
-                                     (store ',name))))))
+                       (escm-icode (list (list 'set!  name env)
+                                         (list 'store (list 'quote name)))))))
 
 ;;
@@ -402 +431 @@
 ;;
 (defun escm-compile-quote (context sexp)
-  (escm-icode `((store ',(cadr sexp)))))
+  (escm-icode (list (list 'store (list 'quote (cadr sexp))))))
 
 ;;
@@ -411 +440 @@
      (escm-define-builtin-syntax