More accurately emulating node's REPL behaviour with regard to _

assignment. Also addresses `i for i in [1..3]` regression introduced by fff4c9c and noticed by @satyr
jashkenas · Jul 6, 2011 · b9c3e0e · satyr · Jul 6, 2011 · satyr
1 parent 60e51a2
commit b9c3e0e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/lib/coffee-script.js b/lib/coffee-script.js
diff --git a/src/coffee-script.coffee b/src/coffee-script.coffee
@@ -101,10 +101,11 @@ exports.eval = (code, options = {}) ->
   o = {}
   o[k] = v for own k, v of options
   o.bare = on # ensure return value
-  js = compile "(#{code}\n)", o
-  _ = Script.runInContext js, sandbox
-  sandbox._ = _ if _?
-  _
+  js = compile "_=(#{code}\n)", o
+  _ = sandbox._
+  returnValue = Script.runInContext js, sandbox
+  sandbox._ = _ if returnValue is undefined
+  returnValue
 
 # Instantiate a Lexer for our use here.
 lexer = new Lexer