Conses are working

diff --git a/lispstrack.lisp b/lispstrack.lisp
index 9add3b3..d3771fe 100644 (file)
--- a/lispstrack.lisp
+++ b/lispstrack.lisp
@@ -175,13 +175,13 @@
   (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"))
 
 (defmacro with-eval-when-compilation (&body body)
   `(setq *eval-when-compilations*
@@ -241,7 +241,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)))))
 
 

diff --git a/prelude.js b/prelude.js
deleted file mode 100644 (file)
index 3b566b1..0000000
--- a/prelude.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-
-function Symbol(name){
-    this.name = name;
-}
-
-function Cons(car, cdr){
-    this.car = car;
-    this.cdr = cdr;
-}
-
-
-
-console.log('Running test.js...');

diff --git a/test.lisp b/test.lisp
index 210ef66..4b87743 100644 (file)
--- a/test.lisp
+++ b/test.lisp
@@ -33,6 +33,9 @@
 (defmacro incf (x)
   (list 'setq x (list '+ 1 x)))
 
+(eval-when-compile
+  (%compile-defvar 'x))
+
 (setq x 10)
 (incf x)
 (debug x)
@@ -44,6 +47,12 @@
 (debug (lambda (x y &rest z) z))
 (debug (lambda (x y &rest z) x))
 
+;;; Conses
+(debug (cons 1 2))
+(debug (car (cons 1 2)))
+(debug (cdr (cons 1 2)))
+
+
 ;; (eval-when-compile
 ;;   (%compile-defmacro 'defun
 ;;                  (lambda (name args &rest body)