Merge pull request jashkenas#1892 from marijnh/master

Two tiny fixes
vol4ok · Nov 25, 2011 · 6cb13f4 · 6cb13f4
2 parents 7d22a01 + 26d5c99
commit 6cb13f4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/lib/coffee-script/lexer.js b/lib/coffee-script/lexer.js
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -112,7 +112,7 @@ exports.Lexer = class Lexer
         id  = new String id
         id.reserved = yes
       else if id in RESERVED
-        @error "reserved word \"#{word}\""
+        @error "reserved word \"#{id}\""
 
     unless forcedIdentifier
       id  = COFFEE_ALIAS_MAP[id] if id in COFFEE_ALIASES

diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -309,8 +309,8 @@ exports.Literal = class Literal extends Base
     name is @value
 
   jumps: (o) ->
-    return no unless @isStatement()
-    if not (o and (o.loop or o.block and (@value isnt 'continue'))) then this else no
+    return this if @value is 'break' and not (o?.loop or o?.block)
+    return this if @value is 'continue' and not o?.loop
 
   compileNode: (o) ->
     code = if @isUndefined