mochiscript 0.6.10 → 0.6.11

data/lib/mochiscript/core.rb

@@ -921,7 +921,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);
@@ -1020,6 +1020,7 @@ RootParser.extend("ShorthandFunctionParser", function(KLASS, OO){
     var exec    = nhashes == 2;
     
     tokens.consume(nhashes);
+
     var argsMatch = tokens.match(ARGS_REGEX);
     var args = null;
 
@@ -1033,7 +1034,7 @@ RootParser.extend("ShorthandFunctionParser", function(KLASS, OO){
     var body = new $c.CurlyParser();
     body.parse(tokens);
     var semi = tokens.match(/^\s*[,;\)\}\]]/) ? '' : ';';
-    var out  = [ 'function', args, body ];
+    var out  = [ 'function', args, body, semi ];
 
     if (exec) {
       out.unshift('(');
@@ -1108,7 +1109,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;

data/lib/mochiscript/version.rb

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

metadata

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