X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=lispstrack.lisp;h=d531561a08b090e54d0f725cdaceeec62b4fbc87;hb=2bcc11276620557ab635a9698bd9b230a60e2e61;hp=0057c2eb80ce6f6c042e9111f88319bf506afd58;hpb=894164decccd2dc2e2a58d0b9fa0dd2a839b609c;p=jscl.git

diff --git a/lispstrack.lisp b/lispstrack.lisp
index 0057c2e..d531561 100644
--- a/lispstrack.lisp
+++ b/lispstrack.lisp
@@ -32,6 +32,18 @@
 
 (defvar *compilations* nil)
 
+(defun ls-compile-sexps (sexps env)
+  (concat (join (mapcar (lambda (x)
+                          (concat (ls-compile x env) ";"))
+                        sexps)
+                ";
+")))
+
+(defun ls-compile-block (sexps env)
+  (concat (ls-compile-sexps (butlast sexps) env)
+          "return " (ls-compile (car (last sexps)) env) ";"))
+
+
 (defun extend-env (args env)
   (append (mapcar #'make-binding args) env))
 
@@ -42,8 +54,9 @@
 	(error "Undefined variable `~a'"  symbol))))
 
 (defmacro define-compilation (name args &body body)
-  "creates a new primitive `name' with parameters args and @body. The
-body can access to the local environment through the variable env"
+  ;; Creates a new primitive `name' with parameters args and
+  ;; @body. The body can access to the local environment through the
+  ;; variable ENV.
   `(push (list ',name (lambda (env ,@args) ,@body))
          *compilations*))
 
@@ -77,10 +90,37 @@ body can access to the local environment through the variable env"
 (define-compilation quote (sexp)
   (lisp->js sexp))
 
+(define-compilation debug (form)
+  (format nil "console.log(~a)" (ls-compile form env)))
+
 (define-compilation while (pred &rest body)
-  (format nil "(function(){while(~a){~{~a~}}})()"
+  (format nil "(function(){while(~a){~a}})() "
 	  (ls-compile pred env)
-	  (mapcar (lambda (x) (ls-compile x env)) body)))
+	  (ls-compile-sexps body env)))
+
+(defmacro eval-when-compile (&body body)
+  `(eval-when (:compile-toplevel :execute)
+     ,@body))
+
+(define-compilation eval-when-compile (when &rest body)
+  (eval body))
+
+;;; aritmetic primitives
+(define-compilation + (x y)
+  (concat "((" (ls-compile x env) ") + (" (ls-compile y env) "))"))
+
+(define-compilation - (x y)
+  (concat "((" (ls-compile x env) ") - (" (ls-compile y env) "))"))
+
+(define-compilation * (x y)
+  (concat "((" (ls-compile x env) ") * (" (ls-compile y env) "))"))
+
+(define-compilation / (x y)
+  (concat "((" (ls-compile x env) ") / (" (ls-compile y env) "))"))
+
+(define-compilation = (x y)
+  (concat "((" (ls-compile x env) ") == (" (ls-compile y env) "))"))
+
 
 (defparameter *env* '())
 (defparameter *env-fun* '())
@@ -90,22 +130,20 @@ body can access to the local environment through the variable env"
     ((symbolp sexp) (ls-lookup sexp env))
     ((integerp sexp) (format nil "~a" sexp))
     ((stringp sexp) (format nil " \"~a\" " sexp))
-					; list
     ((listp sexp)
      (let ((compiler-func (second (assoc (car sexp) *compilations*))))
        (if compiler-func
            (apply compiler-func env (cdr sexp))
+	   (funcall (ls-compile (car sexp) env)  )
            ;; funcall
            )))))
 
-(defun ls-compile-sexps (sexps env)
-  (concat (join (mapcar (lambda (x)
-                          (ls-compile x env))
-                        sexps)
-                ";
-")))
 
-(defun ls-compile-block (sexps env)
-  (concat (ls-compile-sexps (butlast sexps env) env)
-          ";
-return " (ls-compile (car (last sexps)) env) ";"))
+;;; Testing
+
+(defun compile-test ()
+  (with-open-file (in "test.lisp")
+    (with-open-file (out "test.js" :direction :output :if-exists :supersede)
+      (loop
+         for x = (read in nil) while x
+         do (write-string (concat (ls-compile x) "; ") out)))))