mochiscript 0.6.10 → 0.6.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/mochiscript/core.rb +4 -3
- data/lib/mochiscript/version.rb +1 -1
- metadata +2 -2
data/lib/mochiscript/core.rb
CHANGED
@@ -921,7 +921,7 @@ RootParser.extend("HereDocParser", function(KLASS, OO){
|
|
921
921
|
|
922
922
|
|
923
923
|
OO.addMember("parse", function(tokens){var self=this;
|
924
|
-
var beginning = tokens.match(/^<<(\w+)(?::(\w+))?(.*?)
|
924
|
+
var beginning = tokens.match(/^<<(\w+)(?::(\w+))?(.*?)?\n/);
|
925
925
|
var terminator = beginning[1];
|
926
926
|
|
927
927
|
tokens.consume(beginning[0].length);
|
@@ -1020,6 +1020,7 @@ RootParser.extend("ShorthandFunctionParser", function(KLASS, OO){
|
|
1020
1020
|
var exec = nhashes == 2;
|
1021
1021
|
|
1022
1022
|
tokens.consume(nhashes);
|
1023
|
+
|
1023
1024
|
var argsMatch = tokens.match(ARGS_REGEX);
|
1024
1025
|
var args = null;
|
1025
1026
|
|
@@ -1033,7 +1034,7 @@ RootParser.extend("ShorthandFunctionParser", function(KLASS, OO){
|
|
1033
1034
|
var body = new $c.CurlyParser();
|
1034
1035
|
body.parse(tokens);
|
1035
1036
|
var semi = tokens.match(/^\s*[,;\)\}\]]/) ? '' : ';';
|
1036
|
-
var out = [ 'function', args, body ];
|
1037
|
+
var out = [ 'function', args, body, semi ];
|
1037
1038
|
|
1038
1039
|
if (exec) {
|
1039
1040
|
out.unshift('(');
|
@@ -1108,7 +1109,7 @@ CurlyParser.extend("ForeachParser", function(KLASS, OO){
|
|
1108
1109
|
OO.addMember("_TYPE", 'Foreach');
|
1109
1110
|
|
1110
1111
|
|
1111
|
-
var REGEX
|
1112
|
+
var REGEX = Tokens.regex("<FOREACH><LBRACE><VAR> <IDENT>(?:**:**<IDENT>)? in (.*?)**<RBRACE>**");
|
1112
1113
|
|
1113
1114
|
|
1114
1115
|
OO.addMember("startParse", function(tokens){var self=this;
|
data/lib/mochiscript/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mochiscript
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.11
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-09-05 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: therubyracer
|