Do not include prelude.js

[jscl.git] / lispstrack.lisp

diff --git a/lispstrack.lisp b/lispstrack.lisp
index 66d59bc..386caed 100644 (file)
--- a/lispstrack.lisp
+++ b/lispstrack.lisp
@@ -54,21 +54,6 @@
   (let ((binding (assoc symbol env)))
     (and binding (format nil "~a" (cdr binding)))))
 
-(defvar *literal-ns* '())
-
-(let ((counter 0))
-  (defun make-literal (literal)
-    (cons (format nil "l~d" (incf counter))
-         (literal-lisp->js literal))))
-
-(defvar *modified-literals* "")
-(defun ls-compile-toplevel (sexp &optional env fenv)
-  (setq *modified-literals* nil)
-  (let ((code (ls-compile sexp env fenv)))
-    (format nil "~a" *modified-literals*)
-    (format nil "~a" code))
-  (setq *modified-literals* ""))
-
 (defun lookup-variable (symbol env)
   (or (ls-lookup symbol env)
       (ls-lookup symbol *env*)
@@ -129,18 +114,30 @@
 (define-compilation setq (var val)
   (format nil "~a = ~a" (lookup-variable var env) (ls-compile val env fenv)))
 
-(defun literal-lisp->js (sexp)
+
+;;; Literals
+
+(defvar *literals* '())
+
+(defun literal->js (sexp)
   (cond
     ((null sexp) "undefined")
     ((integerp sexp) (format nil "~a" sexp))
     ((stringp sexp) (format nil "\"~a\"" sexp))
-    ((listp sexp) (concat "{car: " (literal-lisp->js (car sexp)) ", cdr: "
-                         (literal-lisp->js (cdr sexp)) "}"))))
+    ((symbolp sexp) (format nil "{name: \"~a\"}" (symbol-name sexp)))
+    ((consp sexp) (concat "{car: "
+                          (literal->js (car sexp))
+                          ", cdr: "
+                         (literal->js (cdr sexp)) "}"))))
+
+(let ((counter 0))
+  (defun literal (form)
+    (let ((var (format nil "l~d" (incf counter))))
+      (push (cons var (literal->js form)) *literals*)
+      var)))
 
 (define-compilation quote (sexp)
-  (let ((literal (make-literal sexp)))
-    (setq *modified-literals* (cdr sexp))
-    (format nil "~a" (car literal))))
+  (literal sexp))
 
 (define-compilation debug (form)
   (format nil "console.log(~a)" (ls-compile form env fenv)))
@@ -162,6 +159,18 @@
       nil
       *eval-when-compilations*))
 
+
+(defmacro define-transformation (name args form)
+  `(define-compilation ,name ,args
+     (ls-compile ,form env fenv)))
+
+(define-transformation progn (&rest body)
+  `((lambda () ,@body)))
+
+(define-transformation let (bindings &rest body)
+  `((lambda ,(mapcar 'car bindings) ,@body)
+    ,@(mapcar 'cadr bindings)))
+
 ;;; aritmetic primitives
 (define-compilation + (x y)
   (concat "((" (ls-compile x env fenv) ") + (" (ls-compile y env fenv) "))"))
@@ -179,13 +188,21 @@
   (concat "((" (ls-compile x env fenv) ") == (" (ls-compile y env fenv) "))"))
 
 (define-compilation cons (x y)
-  (concat "(new Cons("y", " x "))"))
+  (concat "{car: " (ls-compile x env fenv) ", cdr: " (ls-compile y env fenv) "}"))
 
 (define-compilation car (x)
-  (concat "(x.car)"))
+  (concat "(" (ls-compile x env fenv) ").car"))
 
 (define-compilation cdr (x)
-  (concat "(x.cdr)"))
+  (concat "(" (ls-compile x env fenv) ").cdr"))
+
+(define-compilation symbol-name (x)
+  (concat "(" (ls-compile x env fenv) ").name"))
+
+(define-compilation eq (x y)
+  (concat "(" (ls-compile x env fenv) " === " (ls-compile y env fenv) ")"))
+
+
 
 (defmacro with-eval-when-compilation (&body body)
   `(setq *eval-when-compilations*
@@ -204,17 +221,25 @@
 (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 compile-funcall (function args env fenv)
+  (cond
+    ((symbolp function)
+     (format nil "~a(~{~a~^, ~})"
+             (lookup-function function fenv)
+             (mapcar (lambda (x) (ls-compile x env fenv)) args)))
+    ((and (listp function) (eq (car function) 'lambda))
+     (format nil "(~a)(~{~a~^, ~})"
+             (ls-compile function env fenv)
+             (mapcar (lambda (x) (ls-compile x env fenv)) args)))
+    (t
+     (error "Invalid function designator ~a." function))))
+
 (defun ls-compile (sexp &optional env fenv)
   (cond
     ((symbolp sexp) (lookup-variable sexp env))
@@ -227,13 +252,25 @@
              (apply compiler-func env fenv (cdr sexp))
              (compile-funcall (car sexp) (cdr sexp) env fenv)))))))
 
+(defun ls-compile-toplevel (sexp)
+  (setq *literals* nil)
+  (let ((code (ls-compile sexp)))
+    (prog1
+        (concat (join (mapcar (lambda (lit)
+                                (concat "var " (car lit) " = " (cdr lit) ";
+"))
+                              *literals*)
+                      "")
+                code)
+      (setq *literals* nil))))
+
 
 (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)
+         for compilation = (ls-compile-toplevel x)
          when compilation do (write-line (concat compilation "; ") out)))))