trailing foreaches

jeffsu · Sep 5, 2012 · 979b4fe · 979b4fe
1 parent c84d11c
commit 979b4fe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/platforms/gem/lib/mochiscript/core.rb b/platforms/gem/lib/mochiscript/core.rb
@@ -921,7 +921,7 @@ class Parser
   
 
   OO.addMember("parse", function(tokens){var self=this;
-    var beginning  = tokens.match(/^<<(\w+)(?::(\w+))?(.*?)\n/);
+    var beginning  = tokens.match(/^<<(\w+)(?::(\w+))?(.*?)?\n/);
     var terminator = beginning[1];
 
     tokens.consume(beginning[0].length);
@@ -1108,7 +1108,7 @@ class Parser
   OO.addMember("_TYPE", 'Foreach');
 
   
-    var REGEX = Tokens.regex("<FOREACH><LBRACE><VAR> <IDENT>(?:**:**<IDENT>)? in (.*?)**<RBRACE>**{");
+    var REGEX  = Tokens.regex("<FOREACH><LBRACE><VAR> <IDENT>(?:**:**<IDENT>)? in (.*?)**<RBRACE>**");
   
 
   OO.addMember("startParse", function(tokens){var self=this;

diff --git a/platforms/npm/lib/mochiscript/mochiscript.js b/platforms/npm/lib/mochiscript/mochiscript.js
@@ -908,7 +908,7 @@ RootParser.extend("HereDocParser", function(KLASS, OO){
 
 
   OO.addMember("parse", function(tokens){var self=this;
-    var beginning  = tokens.match(/^<<(\w+)(?::(\w+))?(.*?)\n/);
+    var beginning  = tokens.match(/^<<(\w+)(?::(\w+))?(.*?)?\n/);
     var terminator = beginning[1];
 
     tokens.consume(beginning[0].length);
@@ -1095,7 +1095,7 @@ CurlyParser.extend("ForeachParser", function(KLASS, OO){
   OO.addMember("_TYPE", 'Foreach');
 
 
-    var REGEX = Tokens.regex("<FOREACH><LBRACE><VAR> <IDENT>(?:**:**<IDENT>)? in (.*?)**<RBRACE>**{");
+    var REGEX  = Tokens.regex("<FOREACH><LBRACE><VAR> <IDENT>(?:**:**<IDENT>)? in (.*?)**<RBRACE>**");
 
 
   OO.addMember("startParse", function(tokens){var self=this;

diff --git a/src/parsers.ms b/src/parsers.ms
@@ -361,7 +361,7 @@ class HereDocParser extends RootParser {
   }
 
   function parse(tokens) {
-    var beginning  = tokens.match(/^<<(\w+)(?::(\w+))?(.*?)\n/);
+    var beginning  = tokens.match(/^<<(\w+)(?::(\w+))?(.*?)?\n/);
     var terminator = beginning[1];
 
     tokens.consume(beginning[0].length);
@@ -548,7 +548,7 @@ class ForeachParser extends CurlyParser {
   var _TYPE = 'Foreach';
 
   private {
-    var REGEX = Tokens.regex("<FOREACH><LBRACE><VAR> <IDENT>(?:**:**<IDENT>)? in (.*?)**<RBRACE>**{");
+    var REGEX  = Tokens.regex("<FOREACH><LBRACE><VAR> <IDENT>(?:**:**<IDENT>)? in (.*?)**<RBRACE>**");
   }
 
   function startParse(tokens) {

diff --git a/tests/trailing-foreach.ms b/tests/trailing-foreach.ms
@@ -0,0 +1,5 @@
+var list = [ 'hello', 'world', 'foo', 'bar', null, {}, false, 'bar2' ];
+
+foreach (var item in list) container = item;
+
+$m.test(#{ $1.eq(container, 'bar2') });