Do not include prelude.js

[jscl.git] / lispstrack.lisp

diff --git a/lispstrack.lisp b/lispstrack.lisp
index 9add3b3..386caed 100644 (file)
--- a/lispstrack.lisp
+++ b/lispstrack.lisp
@@ -124,6 +124,7 @@
     ((null sexp) "undefined")
     ((integerp sexp) (format nil "~a" sexp))
     ((stringp sexp) (format nil "\"~a\"" sexp))
+    ((symbolp sexp) (format nil "{name: \"~a\"}" (symbol-name sexp)))
     ((consp sexp) (concat "{car: "
                           (literal->js (car sexp))
                           ", cdr: "
@@ -158,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) "))"))
@@ -175,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*
@@ -200,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))
@@ -241,7 +270,7 @@
     (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)))))