mochiscript 0.6.11 → 0.6.12

data/lib/mochiscript/core.rb

@@ -724,6 +724,7 @@ RootParser.extend("ClassParser", function(KLASS, OO){
   });
 });
 
+
 RootParser.extend("ModuleParser", function(KLASS, OO){
   
     var REGEX = Tokens.regex("<MODULE> <CLASSNAME><LCURLY>");
@@ -775,6 +776,39 @@ RootParser.extend("CurlyParser", function(KLASS, OO){
 
 var CurlyParser = $c.CurlyParser;
 
+RootParser.extend("BraceParser", function(KLASS, OO){
+  OO.addMember("_TYPE", 'BraceParser');
+
+  OO.addMember("initialize", function(chop){var self=this;
+    this.chop = chop;
+    this.$super();
+  });
+
+  OO.addMember("handleToken", function(token, tokens){var self=this;
+    if (this.brace === undefined) this.brace = 0;
+    if (token[0] == TYPES.LBRACE) {
+      this.brace--;
+    } else if (token[0] == TYPES.RBRACE) {
+      this.brace++;
+    }
+
+    this.$super(token, tokens);
+
+    if (this.brace == 0) {
+      this.finished = true;
+    }
+  });
+
+  OO.addMember("endParse", function(tokens){var self=this;
+    if (this.chop) {
+      this.out.pop();
+      this.out.shift();
+    }
+  });
+});
+
+var BraceParser = $c.BraceParser;
+
 CurlyParser.extend("ClassContentParser", function(KLASS, OO){
   OO.addMember("getHandler", function(token){var self=this;
     switch(token[0]) {
@@ -1109,19 +1143,28 @@ 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>\\s*)<LBRACE>");
+    var REGEX_INNER = Tokens.regex("<LBRACE><VAR> <IDENT>(?:**:**<IDENT>)?\\s+in\\s+(.*)<RBRACE>");
   
 
   OO.addMember("startParse", function(tokens){var self=this;
     var m = tokens.match(REGEX);
-    namespace = tokens.iterator++;
+    if (!m) return false;
+    tokens.consume(m[0].length-1);
 
-    this.item     = m[4];
-    this.iterator = m[5] || "_i_" + namespace;
-    this.list     = m[6];
 
-    // TODO ugly, revisit this later
-    tokens.consume(m[0].length-1);
+    var content = new $c.BraceParser();
+    content.parse(tokens);
+
+    var mInner    = content.toString().match(REGEX_INNER);
+    if (!mInner) return false;
+
+    var namespace = tokens.iterator++;
+
+    this.item     = mInner[3];
+    this.iterator = mInner[4] || "_i_" + namespace;
+    this.list     = mInner[5];
+
     var declare = [ this.iterator + "=0", this.item + "=null", "_list_" + namespace + "=" + this.list, "_len_" + namespace + "=_list_" + namespace + ".length" ].join(',');
 
     var bool = "(" + this.item + "=" + "_list_" + namespace + "[" + this.iterator + "])||" + this.iterator + "<_len_" + namespace;

data/lib/mochiscript/version.rb

@@ -1,3 +1,3 @@
 module Mochiscript
-  VERSION = "0.6.11"
+  VERSION = "0.6.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mochiscript
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer