Remove some js-vset by (setf oget)

diff --git a/jscl.lisp b/jscl.lisp
index 4b2ac4a..e5b6582 100644 (file)
--- a/jscl.lisp
+++ b/jscl.lisp
@@ -34,8 +34,8 @@
     ("sequence"         :target)
     ("print"            :target)
     ("package"          :target)
-    ("ffi"              :target)
     ("misc"             :target)
+    ("ffi"              :both)
     ("read"             :both)
     ("defstruct"        :both)
     ("lambda-list"      :both)

diff --git a/src/prelude.js b/src/prelude.js
index c40d0fa..9214436 100644 (file)
--- a/src/prelude.js
+++ b/src/prelude.js
@@ -4,6 +4,8 @@
 var window = this;
 var nil;
 
+var lisp = {};
+
 globalEval = eval;  // Just an indirect eval
 
 function pv (x) { return x==undefined? nil: x; }

diff --git a/src/toplevel.lisp b/src/toplevel.lisp
index 04423d3..a396554 100644 (file)
--- a/src/toplevel.lisp
+++ b/src/toplevel.lisp
@@ -251,12 +251,12 @@
 
 ;;; Set some external entry point to the Lisp implementation to the
 ;;; console. It would not be necessary when FFI is finished.
-(js-eval "var lisp")
-(%js-vset "lisp" (new))
-(%js-vset "lisp.read" #'ls-read-from-string)
-(%js-vset "lisp.print" #'prin1-to-string)
-(%js-vset "lisp.eval" #'eval)
-(%js-vset "lisp.compile" (lambda (s) (ls-compile-toplevel s t)))
-(%js-vset "lisp.evalString" (lambda (str) (eval (ls-read-from-string str))))
-(%js-vset "lisp.evalInput" (lambda (str) (eval-interactive (ls-read-from-string str))))
-(%js-vset "lisp.compileString" (lambda (str) (ls-compile-toplevel (ls-read-from-string str) t)))
+(let ((*root* #j:lisp))
+  (setf #j:read #'ls-read-from-string)
+  (setf #j:print #'prin1-to-string)
+  (setf #j:eval #'eval)
+  (setf #j:compile (lambda (s) (ls-compile-toplevel s t)))
+  (setf #j:evalString (lambda (str) (eval (ls-read-from-string str))))
+  (setf #j:evalInput (lambda (str) (eval-interactive (ls-read-from-string str))))
+  (setf #j:compileString (lambda (str) (ls-compile-toplevel (ls-read-from-string str) t))))
+