Don't use the built-in eval.

jbarnette · Apr 23, 2008 · 5ffd6cf · 5ffd6cf
1 parent 12809c7
commit 5ffd6cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/js/johnson/prelude.js b/js/johnson/prelude.js
@@ -51,7 +51,7 @@ Johnson.require = function(file) {
 
     if(Ruby.File.send("file?", path)) {
       Johnson.required[file] = true;
-      eval(Ruby.File.read(path));
+      Johnson.currentContext.load(path);
 
       return true;
     }

diff --git a/lib/johnson/context.rb b/lib/johnson/context.rb
@@ -4,7 +4,8 @@ class Context
 
     def initialize(delegate=Johnson::SpiderMonkey::Context)
       @delegate = delegate.is_a?(Class) ? delegate.new : delegate
-      evaluate(Johnson::PRELUDE, 'Johnson::PRELUDE')
+      evaluate(Johnson::PRELUDE, "Johnson::PRELUDE", 1)
+      global.Johnson.currentContext = self
     end
 
     def [](key)
@@ -25,7 +26,7 @@ def global
     end
 
     def load(file)
-      delegate.evaluate(IO.read(file), file)
+      delegate.evaluate(IO.read(file), file, 1)
     end
   end
 end