Changeset 9340 for lang/elisp

Timestamp:

04/12/08 09:26:15 (8 months ago)

Author:

lieutar

Message:

lang/elisp/trunk: I built new directory composition for my project.

Location:

lang/elisp/escm/trunk

Files:

• Makefile.el (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• src (added)
• src/elisp (added)
• src/elisp/DEVELOPERSTOOLS.el (moved) (moved from lang/elisp/escm/trunk/DEVELOPERSTOOLS.el) (2 diffs)
• src/elisp/escm-arity.el (moved) (moved from lang/elisp/escm/trunk/escm-arity.el)
• src/elisp/escm-base.el (moved) (moved from lang/elisp/escm/trunk/escm-base.el)
• src/elisp/escm-cbos.el (moved) (moved from lang/elisp/escm/trunk/escm-cbos.el)
• src/elisp/escm-compile.el (moved) (moved from lang/elisp/escm/trunk/escm-compile.el)
• src/elisp/escm-context.el (moved) (moved from lang/elisp/escm/trunk/escm-context.el)
• src/elisp/escm-debug.el (moved) (moved from lang/elisp/escm/trunk/escm-debug.el)
• src/elisp/escm-env.el (moved) (moved from lang/elisp/escm/trunk/escm-env.el)
• src/elisp/escm-iblock-content.el (moved) (moved from lang/elisp/escm/trunk/escm-iblock-content.el)
• src/elisp/escm-iblock.el (moved) (moved from lang/elisp/escm/trunk/escm-iblock.el)
• src/elisp/escm-icode.el (moved) (moved from lang/elisp/escm/trunk/escm-icode.el)
• src/elisp/escm-port.el (moved) (moved from lang/elisp/escm/trunk/escm-port.el) (8 diffs)
• src/elisp/escm-preprocess.el (moved) (moved from lang/elisp/escm/trunk/escm-preprocess.el)
• src/elisp/escm-proc.el (moved) (moved from lang/elisp/escm/trunk/escm-proc.el)
• src/elisp/escm-syntax.el (moved) (moved from lang/elisp/escm/trunk/escm-syntax.el) (2 diffs)
• src/elisp/escm-test.el (moved) (moved from lang/elisp/escm/trunk/escm-test.el)
• src/elisp/escm-util.el (moved) (moved from lang/elisp/escm/trunk/escm-util.el)
• src/elisp/escm-util.file.el (moved) (moved from lang/elisp/escm/trunk/escm-util.file.el)
• src/elisp/escm-util.minimal.el (moved) (moved from lang/elisp/escm/trunk/escm-util.minimal.el)
• src/elisp/escm-vm.el (moved) (moved from lang/elisp/escm/trunk/escm-vm.el) (3 diffs)
• src/elisp/escm.el (moved) (moved from lang/elisp/escm/trunk/escm.el)
• src/escm (added)
• src/test (added)

lang/elisp/escm/trunk/Makefile.el

@@ -44 +44 @@
 (defun escm-make.elc ()
   (mapcar (function escm-make::compile) escm-make::els))
+
+(defun escm)
+
 ;;(escm-make.elc)

lang/elisp/escm/trunk/Makefile.in

@@ -35 +35 @@
 clean:
         rm -rf *.elc
+
+distclean: clean
+        rm -rf config.log config.status Makefile

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

@@ -25 +25 @@
 (when nil
 
-  (escm-vm::eval (escm-vm::new)  '(+ 0 1 2 3))
   (escm-vm::eval (escm-vm::new)  '(+ 0 1 (* 2 3) 4))
   (escm-vm::eval (escm-vm::new)  '(if nil 1 2))
@@ -106 +105 @@
   ((elambda (a b) (+ a b)) 1 2)
   )
-
-

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

@@ -28 +28 @@
 
 (require 'escm-base)
+(require 'escm-preprocess)
 
 (escm-cbos::define-class (escm-port))
@@ -35 +36 @@
 
 ;; [R5RS]
-(escm-cbos::define-method escm-port escmp-port::input-port? (self) nil)
 ;; [R5RS]
-(escm-cbos::define-method escm-port escmp-port::output-port? (self) nil)
-
+(escm-cbos::define-method escm-port escm-port::input-port? (self) nil)
+(escm-cbos::define-method escm-port escm-port::output-port? (self) nil)
 
 (escm-cbos::define-class (escm-output-port escm-port))
@@ -45 +45 @@
 ;;     [R5RS] Closes input and output port, respectively 
 
+(escm-cbos::define-class (escm-input-port escm-port))
+(escm-cbos::define-method escm-input-port escm-port::input-port? (self) t)
+(escm-cbos::define-method escm-input-port escm-input-port::read (self))
+(escm-cbos::define-method escm-input-port escm-input-port::close-input-port (self))
+(escm-cbos::define-method escm-input-port escm-input-port::read-char (self))
+(escm-cbos::define-method escm-input-port escm-input-port::peek-char (self))
+(escm-cbos::define-method escm-input-port escm-input-port::char-ready? (self))
 
-(escm-cbos::define-class (escm-input-port escm-port))
-
-(escm-cbos::define-method escm-input-port
-  escm-input-port::read (self))
-
-(escm-cbos::define-method escm-input-port
-  escm-input-port::close-input-port (self))
-
-(escm-cbos::define-method escm-input-port
-  escm-input-port::read-char (self))
-
-(escm-cbos::define-method escm-input-port
-  escm-input-port::peek-char (self))
-
-(escm-cbos::define-method escm-input-port
-  escm-input-port::char-ready? (self))
-
-
-
-(escm-cbos::define-class (escm-input-file escm-input-port) buffer position)
+(escm-cbos::define-class (escm-input-file escm-input-port) buffer position file)
 
 (defsubst escm-input-file::new (file)
-  "creates a filehandle that bound to given path."
+  "Create input port that associated the FILE."
   (let* ((self (create-escm-input-file))
          (buf  (find-file-noselect file nil nil)))
@@ -74 +62 @@
       (set-buffer buf)
       (rename-buffer (format " *escm-open %s*" file)))
-    (escm-input-file::set-buffer  buf)
-    (escm-input-file::set-positon 1)
+    (escm-input-file::set-file    self file)
+    (escm-input-file::set-buffer  self buf)
+    (escm-input-file::set-positon self 1)
     self))
+
+(defsubst escm-input-file::read (self)
+  "Reads sexp from port."
+  (let ((buf (escm-input-file::get-buffer self))
+        (ret nil))
+  (save-excursion
+    (set-buffer buf)
+    (goto-char (escm-input-file::get-positon self))
+    (setq ret (escm-preprocess::process-elisp-quotes (read buf)))
+    (escm-input-file::set-positon self (point))
+    ret)))
 
 (defsubst escm-input-file::at-eof? (self)
@@ -93 +93 @@
       (when r (aref r 0)))))
 
-
 (defsubst escm-input-file::peek-char (self)
   (if (escm-input-file::at-eof? self) nil
@@ -105 +104 @@
 
 (defsubst escm-input-file::close-input-port (self)
-  "closes filehandle."
+  "Closes the port that is givened as SELF."
   (kill-buffer (escm-input-file::get-buffer self))
   (escm-input-file::set-buffer self nil))
@@ -112 +111 @@
   (not (escm-input-file::at-eof? self)))
 
+(escm-cbos::define-method escm-input-file
+  escm-input-port::read (self)
+  (escm-input-file::read self))
 
 (escm-cbos::define-method escm-input-file
@@ -129 +131 @@
   (escm-input-file::char-ready? self))
 
-
-
+(escm-test::define-test )
 
 (provide 'escm-stream)

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

@@ -56 +56 @@
     self))
 
-
 (defsubst escm-builtin-syntax::new (proc)
   (let ((self (create-escm-builtin-syntax)))
@@ -66 +65 @@
                    name
                    (escm-builtin-syntax::new fun)))
+
 (put 'escm-define-builtin-syntax 'lisp-indent-function 'defun)
 

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

@@ -32 +32 @@
 (require 'escm-compile    )
 (require 'escm-debug      )
-
+(require 'escm-port       )
 
 (defvar   escm-vm::init-hook    ())
@@ -170 +170 @@
 ;;(escm-test::run 'escm 'escm-vm-eval)
 
-(defsubst escm-vm::compile (vm sexp)
-  (escm-iproc::merge 
-   (escm-compile (escm-context::set-tail?
-                  (escm-context::new (escm-vm::current-env vm) vm) t)
-                 (escm-preprocess::process-elisp-quotes sexp))
-   (escm-icode '((ret)))))
-
-(defsubst escm-vm::compile-top-level (vm sexp)
-  (let ((iproc (escm-vm::compile vm sexp)))
-    (escm-iproc::set-src iproc sexp)
-    (escm-iproc::to-proc iproc
-                         (escm-arity::new ())
-                         (escm-vm::current-env vm))))
-
-(defun escm-vm::eval (vm sexp)
-  (escm-vm::apply vm (escm-vm::compile-top-level vm sexp)  nil))
+(escm-util::expand
+ (let ((build
+        (lambda (suffix pp)
+          `((defsubst ,(intern (concat "escm-vm::compile" suffix)) (vm sexp)
+               (escm-iproc::merge 
+                (escm-compile (escm-context::set-tail?
+                               (escm-context::new
+                                (escm-vm::current-env vm) vm) t)
+                              ,(funcall pp 'sexp))
+                (escm-icode '((ret)))))
+
+             (defsubst ,(intern (concat "escm-vm::compile-top-level" suffix)) (vm sexp)
+               (let ((iproc (escm-vm::compile vm sexp)))
+                 (escm-iproc::set-src iproc sexp)
+                 (escm-iproc::to-proc iproc
+                                      (escm-arity::new ())
+                                      (escm-vm::current-env vm))))
+
+             (defun ,(intern (concat "escm-vm::eval" suffix)) (vm sexp)
+               (escm-vm::apply vm (escm-vm::compile-top-level vm sexp)  nil))
+             ))))
+
+   `( ,@(funcall build "" (lambda (sexp)
+                             `(escm-preprocess::process-elisp-quotes ,sexp)))
+      ,@(funcall build "1" (lambda (sexp) sexp)))))
+
 
 (defsubst escm-vm::define (vm sym val)
@@ -211 +221 @@
     ret))
 
-(defsubst escm-vm::load1 (vm path)
-  
-  )
-
 (defun escm-vm::load (vm name)
   (let ((path (escm-vm::locate-library vm name)))
     (when path (escm-vm::load1 path))))
 
+(defsubst escm-vm::load1 (vm path)
+  (let ((port (escm-input-file::new path))
+        (sexp ))
+    (while (setq sexp (escm-input-file::read port))
+      (escm-vm::eval vm sexp))))
+
 (provide 'escm-vm)
 ;;; escm-vm.el ends here