X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=lispstrack.lisp;h=883d25efeb19de1264a29dddd35fec850692ba39;hb=1d3ea0158e2e12e5296d1e8816ec3fb5c76173d2;hp=c3b664218b8a4fc76fafb828c083fef5648da827;hpb=32874353beb0212d92d943041aab68db59ea13dd;p=jscl.git

diff --git a/lispstrack.lisp b/lispstrack.lisp
index c3b6642..883d25e 100644
--- a/lispstrack.lisp
+++ b/lispstrack.lisp
@@ -13,8 +13,13 @@
 
 
 (let ((counter 0))
-  (defun make-binding (symbol)
-    (cons symbol (format nil "V_~d" (incf counter)))))
+  (defun make-var-binding (symbol)
+    (cons symbol (format nil "v~d" (incf counter)))))
+
+(let ((counter 0))
+  (defun make-func-binding (symbol)
+    (cons symbol (format nil "f~d" (incf counter)))))
+
 
 ;;; Concatenate a list of strings, with a separator
 (defun join (list separator)
@@ -32,54 +37,82 @@
 
 (defvar *compilations* nil)
 
-(defun ls-compile-sexps (sexps env)
+(defun ls-compile-block (sexps env fenv)
   (concat (join (mapcar (lambda (x)
-                          (concat (ls-compile x env) ";"))
+                          (concat (ls-compile x env fenv) ";"))
                         sexps)
-                "
+                ";
 ")))
 
-(defun ls-compile-block (sexps env)
-  (concat (ls-compile-sexps (butlast sexps env) env)
-          ";
-return " (ls-compile (car (last sexps)) env) ";"))
-
-
 (defun extend-env (args env)
-  (append (mapcar #'make-binding args) env))
+  (append (mapcar #'make-var-binding args) env))
+
+(defparameter *env* '())
+(defparameter *fenv* '())
 
 (defun ls-lookup (symbol env)
   (let ((binding (assoc symbol env)))
-    (if binding
-	(format nil "~a" (cdr binding))
-	(error "Undefined variable `~a'"  symbol))))
+    (and binding (format nil "~a" (cdr binding)))))
+
+(defun lookup-variable (symbol env)
+  (or (ls-lookup symbol env)
+      (ls-lookup symbol *env*)
+      (error "Undefined variable `~a'"  symbol)))
+
+(defun lookup-function (symbol env)
+  (or (ls-lookup symbol env)
+      (ls-lookup symbol *fenv*)
+      (error "Undefined function `~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"
-  `(push (list ',name (lambda (env ,@args) ,@body))
+  ;; 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 fenv ,@args) ,@body))
          *compilations*))
 
 (define-compilation if (condition true false)
   (format nil "((~a)? (~a) : (~a))"
-          (ls-compile condition env)
-          (ls-compile true env)
-          (ls-compile false env)))
-
-(define-compilation lambda (args &rest body)
-  (let ((new-env (extend-env args env)))
-    (concat "(function ("
-	    (join (mapcar (lambda (x) (ls-lookup x new-env))
-                          args)
-                  ",")
-	    "){
+          (ls-compile condition env fenv)
+          (ls-compile true env fenv)
+          (ls-compile false env fenv)))
+
+;;; Return the required args of a lambda list
+(defun lambda-list-required-argument (lambda-list)
+  (if (or (null lambda-list) (eq (car lambda-list) '&rest))
+      nil
+      (cons (car lambda-list) (lambda-list-required-argument (cdr lambda-list)))))
+
+(defun lambda-list-rest-argument (lambda-list)
+  (second (member '&rest lambda-list)))
+
+(define-compilation lambda (lambda-list &rest body)
+  (let ((required-arguments (lambda-list-required-argument lambda-list))
+        (rest-argument (lambda-list-rest-argument lambda-list)))
+    (let ((new-env (extend-env (cons rest-argument required-arguments) env)))
+      (concat "(function ("
+              (join (mapcar (lambda (x) (lookup-variable x new-env))
+                            required-arguments)
+                    ",")
+              "){
 "
-	    (ls-compile-block body new-env)
-	    "
-})")))
+              (if rest-argument
+                  (concat "var " (lookup-variable rest-argument new-env)
+                          " = arguments.slice("
+                          (prin1-to-string (length required-arguments)) ");
+")
+                  "")
+
+              (concat (ls-compile-block (butlast body) new-env fenv)
+                      "return " (ls-compile (car (last body)) new-env fenv) ";")
+              "
+})"))))
+
+(define-compilation fsetq (var val)
+  (format nil "~a = ~a" (lookup-function var fenv) (ls-compile val env fenv)))
 
 (define-compilation setq (var val)
-  (format nil "~a = ~a" (ls-lookup var env) (ls-compile val env)))
+  (format nil "~a = ~a" (lookup-variable var env) (ls-compile val env fenv)))
 
 (defun lisp->js (sexp)
   (cond
@@ -91,24 +124,93 @@ body can access to the local environment through the variable env"
   (lisp->js sexp))
 
 (define-compilation debug (form)
-  (format nil "console.log(~a)" (ls-compile form env)))
+  (format nil "console.log(~a)" (ls-compile form env fenv)))
 
 (define-compilation while (pred &rest body)
   (format nil "(function(){while(~a){~a}})() "
-	  (ls-compile pred env)
-	  (ls-compile-sexps body env)))
+	  (ls-compile pred env fenv)
+	  (ls-compile-block body env fenv)))
 
-(defparameter *env* '())
-(defparameter *env-fun* '())
+(defmacro eval-when-compile (&body body)
+  `(eval-when (:compile-toplevel :execute)
+     ,@body))
+
+(defvar *eval-when-compilations*)
+(define-compilation eval-when-compile (&rest body)
+  (setq *eval-when-compilations* "")
+  (eval (cons 'progn body))
+  (if (string= *eval-when-compilations* "")
+      nil
+      *eval-when-compilations*))
+
+;;; aritmetic primitives
+(define-compilation + (x y)
+  (concat "((" (ls-compile x env fenv) ") + (" (ls-compile y env fenv) "))"))
+
+(define-compilation - (x y)
+  (concat "((" (ls-compile x env fenv) ") - (" (ls-compile y env fenv) "))"))
 
-(defun ls-compile (sexp &optional env)
+(define-compilation * (x y)
+  (concat "((" (ls-compile x env fenv) ") * (" (ls-compile y env fenv) "))"))
+
+(define-compilation / (x y)
+  (concat "((" (ls-compile x env fenv) ") / (" (ls-compile y env fenv) "))"))
+
+(define-compilation = (x y)
+  (concat "((" (ls-compile x env fenv) ") == (" (ls-compile y env fenv) "))"))
+
+
+(defmacro with-eval-when-compilation (&body body)
+  `(setq *eval-when-compilations*
+         (concat *eval-when-compilations* (progn ,@body))))
+
+(defun %compile-defvar (name)
+  (push (make-var-binding name) *env*)
+  (with-eval-when-compilation
+    (format nil "var ~a" (lookup-variable name *env*))))
+
+(defun %compile-defun (name)
+  (push (make-func-binding name) *fenv*)
+  (with-eval-when-compilation
+    (format nil "var ~a" (lookup-variable name *fenv*))))
+
+(defun %compile-defmacro (name lambda)
+  (push (cons name (cons 'macro lambda)) *fenv*))
+
+(defun compile-funcall (name args env fenv)
+  (format nil "~a(~{~a~^, ~})"
+          (lookup-function name fenv)
+          (mapcar (lambda (x) (ls-compile x env fenv)) args)))
+
+(defun ls-macroexpand-1 (form &optional env fenv)
+  (let ((function (cdr (assoc (car form) *fenv*))))
+    (if (and (listp function) (eq (car function) 'macro))
+        (apply (eval (cdr function)) (cdr form))
+        form)))
+
+(defun ls-compile (sexp &optional env fenv)
   (cond
-    ((symbolp sexp) (ls-lookup sexp env))
+    ((symbolp sexp) (lookup-variable sexp env))
     ((integerp sexp) (format nil "~a" sexp))
-    ((stringp sexp) (format nil " \"~a\" " sexp))
+    ((stringp sexp) (format nil "\"~a\"" sexp))
     ((listp sexp)
-     (let ((compiler-func (second (assoc (car sexp) *compilations*))))
-       (if compiler-func
-           (apply compiler-func env (cdr sexp))
-           ;; funcall
-           )))))
+     (let ((sexp (ls-macroexpand-1 sexp env fenv)))
+       (let ((compiler-func (second (assoc (car sexp) *compilations*))))
+         (if compiler-func
+             (apply compiler-func env fenv (cdr sexp))
+             (compile-funcall (car sexp) (cdr sexp) env fenv)))))))
+
+
+(defun ls-compile-file (filename output)
+  (with-open-file (in filename)
+    (with-open-file (out output :direction :output :if-exists :supersede)
+      (loop
+         for x = (read in nil) while x
+         for compilation = (ls-compile x)
+         when compilation do (write-line (concat compilation "; ") out)))))
+
+
+;;; Testing
+
+(defun compile-test ()
+  (ls-compile-file "test.lisp" "test.js"))