Some refactoring

[jscl.git] / src / toplevel.lisp

diff --git a/src/toplevel.lisp b/src/toplevel.lisp
index 04423d3..7dddf6e 100644 (file)
--- a/src/toplevel.lisp
+++ b/src/toplevel.lisp
@@ -16,9 +16,10 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with JSCL.  If not, see <http://www.gnu.org/licenses/>.
 
+(/debug "loading toplevel.lisp!")
 
 (defun eval (x)
-  (js-eval (ls-compile-toplevel x t)))
+  (js-eval (compile-toplevel x t)))
 
 (defvar * nil)
 (defvar ** nil)
@@ -249,14 +250,16 @@
 
 (setq *package* *user-package*)
 
+(defvar *root* (%js-vref "window"))
+
 ;;; 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) (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) (compile-toplevel (ls-read-from-string str) t))))
+