Fix Issue #55, and version bump to 1.4.0b

maxtaco · Jan 31, 2013 · b53cdfc · b53cdfc
1 parent fb16015
commit b53cdfc
Show file tree

Hide file tree

Showing 22 changed files with 49 additions and 31 deletions.
diff --git a/extras/coffee-script-iced-large.js b/extras/coffee-script-iced-large.js
diff --git a/extras/coffee-script-iced.js b/extras/coffee-script-iced.js
diff --git a/extras/coffee-script.js b/extras/coffee-script.js
diff --git a/lib/coffee-script/browser.js b/lib/coffee-script/browser.js
diff --git a/lib/coffee-script/cake.js b/lib/coffee-script/cake.js
diff --git a/lib/coffee-script/coffee-script.js b/lib/coffee-script/coffee-script.js
diff --git a/lib/coffee-script/command.js b/lib/coffee-script/command.js
diff --git a/lib/coffee-script/grammar.js b/lib/coffee-script/grammar.js
diff --git a/lib/coffee-script/helpers.js b/lib/coffee-script/helpers.js
diff --git a/lib/coffee-script/iced.js b/lib/coffee-script/iced.js
diff --git a/lib/coffee-script/icedlib.js b/lib/coffee-script/icedlib.js
diff --git a/lib/coffee-script/index.js b/lib/coffee-script/index.js
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/lib/coffee-script/optparse.js b/lib/coffee-script/optparse.js
diff --git a/lib/coffee-script/repl.js b/lib/coffee-script/repl.js
diff --git a/lib/coffee-script/rewriter.js b/lib/coffee-script/rewriter.js
diff --git a/lib/coffee-script/scope.js b/lib/coffee-script/scope.js
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description":  "IcedCoffeeScript",
   "keywords":     ["javascript", "language", "coffeescript", "compiler"],
   "author":       "Maxwell Krohn",
-  "version":      "1.4.0a",
+  "version":      "1.4.0b",
   "licenses":     [{
     "type":       "MIT",
     "url":        "https://raw.github.com/jashkenas/coffee-script/master/LICENSE"

diff --git a/src/coffee-script.coffee b/src/coffee-script.coffee
@@ -32,7 +32,7 @@ else if require.registerExtension
     require.registerExtension e, (content) -> compile content
 
 # The current CoffeeScript version number.
-exports.VERSION = '1.4.0a'
+exports.VERSION = '1.4.0b'
 
 # Words that cannot be used as identifiers in CoffeeScript code
 exports.RESERVED = RESERVED

diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -2888,7 +2888,12 @@ exports.Switch = class Switch extends Base
   icedCallContinuation : ->
     for [condition,block] in @cases
       block.icedThreadReturn()
-    @otherwise?.icedThreadReturn()
+    if @otherwise?
+      @otherwise.icedThreadReturn()
+    else
+      # See github issue #55.  If no else: was specified,
+      # we still need to call back the current continuation
+      @otherwise = new Block [ new IcedTailCall ]
 
   compileNode: (o) ->
     idt1 = o.indent + TAB

diff --git a/test/iced.coffee b/test/iced.coffee
@@ -72,6 +72,15 @@ atest "for k,v in arr testing", (cb) ->
     s += v + " " + i + " "
   cb( s is "the 0 quick 1 brown 2 ", {} )
 
+atest "switch --- github issue #55", (cb) ->
+  await delay defer()
+  switch "blah"
+    when "a"
+      await delay defer()
+    when "b"
+      await delay defer()
+  cb( true, {} )
+
 atest "switch-a-roos", (cb) ->
   res = 0
   for i in [0..4]