Merge pull request #3380 from madprgmr/master

Rudimentary fix for #3379.
jashkenas · Feb 17, 2014 · c41a14f · c41a14f
2 parents a216f93 + a323160
commit c41a14f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/coffee-script/lexer.js b/lib/coffee-script/lexer.js
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -187,7 +187,7 @@ exports.Lexer = class Lexer
   # are balanced within the string's contents, and within nested interpolations.
   stringToken: ->
     switch quote = @chunk.charAt 0
-      when "'" then [string] = SIMPLESTR.exec @chunk
+      when "'" then [string] = SIMPLESTR.exec(@chunk) || []
       when '"' then string = @balancedString @chunk, '"'
     return 0 unless string
     trimmed = @removeNewlines string[1...-1]