mochiscript 0.4.3.pre1 → 0.4.3.pre2

data/lib/mochiscript/core.rb

@@ -241,7 +241,7 @@ var JS2 = $m;
   });
 
   $m.out = function () {
-    for (var i=0,arg=null,_list_0=arguments,_len_0=_list_0.length;(arg=_list_0[i])||i<_len_0;i++){
+    for (i=0,arg=null,_list_0=arguments,_len_0=_list_0.length;(arg=_list_0[i])||i<_len_0;i++){
       $m.ADAPTER.out(arg);
       if (i < arguments.length-1) {
         $m.ADAPTER.out(',');
@@ -250,7 +250,7 @@ var JS2 = $m;
   };
 
   $m.outs = function () {
-    for (var _i_0=0,arg=null,_list_0=arguments,_len_0=_list_0.length;(arg=_list_0[_i_0])||_i_0<_len_0;_i_0++){
+    for (_i_0=0,arg=null,_list_0=arguments,_len_0=_list_0.length;(arg=_list_0[_i_0])||_i_0<_len_0;_i_0++){
       $m.ADAPTER.outs(arg);
     }
   };
@@ -269,7 +269,8 @@ $m.Class.extend("JSML", function(KLASS, OO){
     this.root    = new $c.JSMLElement();
     this.stack   = [ this.root ];
 
-    for (var _i_0=0,l=null,_list_0=lines,_len_0=_list_0.length;(l=_list_0[_i_0])||_i_0<_len_0;_i_0++){
+    for (var i=0; i<lines.length; i++) {
+      var l = lines[i];
       if (l.match(/^\s*$/)) continue;
       this.processLine(l);
     }
@@ -398,9 +399,11 @@ $m.Class.extend("JSMLElement", function(KLASS, OO){
   OO.addMember("flatten", function(){
     var out = [];
 
-    for (var _i_0=0,c=null,_list_0=this.children,_len_0=_list_0.length;(c=_list_0[_i_0])||_i_0<_len_0;_i_0++){
+    for (var i=0; i<this.children.length; i++) {
+      var c = this.children[i];
       var arr = c.flatten();
-      for (var _i_1=0,item=null,_list_1=arr,_len_1=_list_1.length;(item=_list_1[_i_1])||_i_1<_len_1;_i_1++){
+      for (var j=0; j<arr.length; j++) {
+        var item = arr[j];
         out.push(item);
       }
     }
@@ -510,7 +513,7 @@ var REGEXES = [];
 var MAIN_REGEX = null;
 var RTYPES  = {};
 
-for (var i=0,t=null,_list_0=TOKENS,_len_0=_list_0.length;(t=_list_0[i])||i<_len_0;i++){
+for (i=0,t=null,_list_0=TOKENS,_len_0=_list_0.length;(t=_list_0[i])||i<_len_0;i++){
   TYPES[t[0]] = i;
   RTYPES[i]   = t[0];
   REGEXES.push("(" + t[1] + ")");
@@ -537,7 +540,7 @@ $m.Class.extend("Tokens", function(KLASS, OO){
     var m = this.str.match(MAIN_REGEX);
     if (!m) return null;
 
-    for (var i=0,ele=null,_list_0=TOKENS,_len_0=_list_0.length;(ele=_list_0[i])||i<_len_0;i++){
+    for (i=0,ele=null,_list_0=TOKENS,_len_0=_list_0.length;(ele=_list_0[i])||i<_len_0;i++){
       if (m[i+1]) return this._peek = [ i, m[i+1], ele[2] ];
     }
   });
@@ -611,7 +614,6 @@ $m.pp = function (str) {
 };
 
 
-
 $m.Class.extend("RootParser", function(KLASS, OO){
   OO.addMember("handlers", {});
 
@@ -673,7 +675,8 @@ $m.Class.extend("RootParser", function(KLASS, OO){
 
   OO.addMember("toString", function(){
     var ret = [];
-    for (var _i_0=0,ele=null,_list_0=this.out,_len_0=_list_0.length;(ele=_list_0[_i_0])||_i_0<_len_0;_i_0++){
+    for (var i=0; i<this.out.length; i++) {
+      var ele = this.out[i];
       ret.push(ele === undefined ? '' : ele.toString());
     }
     return ret.join("");
@@ -688,7 +691,7 @@ $m.Class.extend("RootParser", function(KLASS, OO){
 
     var ret = [ space + (this._TYPE || 'NODE') ];
     var generic = [];
-    for (var _i_0=0,ele=null,_list_0=this.out,_len_0=_list_0.length;(ele=_list_0[_i_0])||_i_0<_len_0;_i_0++){
+    for (_i_0=0,ele=null,_list_0=this.out,_len_0=_list_0.length;(ele=_list_0[_i_0])||_i_0<_len_0;_i_0++){
       if (ele === undefined) {
         ret.push(space + "  UNDEFINED!");
         continue;
@@ -716,7 +719,7 @@ $m.Class.extend("RootParser", function(KLASS, OO){
 
   OO.addMember("toStruct", function(){
     var ret = [];
-    for (var _i_0=0,ele=null,_list_0=this.out,_len_0=_list_0.length;(ele=_list_0[_i_0])||_i_0<_len_0;_i_0++){
+    for (_i_0=0,ele=null,_list_0=this.out,_len_0=_list_0.length;(ele=_list_0[_i_0])||_i_0<_len_0;_i_0++){
       ret.push(ele.toStruct ? ele.toStruct() : ele);
     }
     return ret;
@@ -956,22 +959,25 @@ RootParser.extend("HereDocParser", function(KLASS, OO){
   
 
   OO.addMember("parse", function(tokens){
-    var beginning = tokens.match(/^<<(\w+)(?::(\w+))?\s*([;\)])*\n/);
+    var beginning  = tokens.match(/^<<(\w+)(?::(\w+))?\s*([;\)])*\n/);
+    var terminator = beginning[1];
+
     tokens.consume(beginning[0].length);
 
-    var spacing = tokens.match(/^(\s*)/);
+    var spacing  = tokens.match(/^(\s*)/);
     var regexSub = new RegExp("^" + (spacing[0] || ''), "mg");
 
-
-    var strMatch = tokens.match(new RegExp("^([\\s\\S]*?)\\n\\s*" + beginning[1] + "\\s*\\n"));
+    var strMatch = tokens.match(new RegExp("^([\\s\\S]*?)\\n\\s*" + terminator + "\\b"));
     var toParse  = strMatch[1] || '';
 
     toParse = toParse.replace(regexSub, '');
     toParse = toParse.replace(/\n/g, "\\n");
 
-    var string = $m.parse('%{' + toParse + '}');
+    // TODO handle options for interpolation
+    var string = '"' + toParse.replace(/"/g, '\\"') + '"';
     tokens.consume(strMatch[0] ? strMatch[0].length : 0);
 
+    // TODO put this in register
     if (beginning[2]) {
       this.out = [ '$m.JSML.process(', string, ')',  beginning[3] || ';' ];
     } else {
@@ -1130,7 +1136,7 @@ $m.Class.extend("CLI", function(KLASS, OO){
 
     var endedArgs = false;
 
-    for (var i=0,arg=null,_list_0=args,_len_0=_list_0.length;(arg=_list_0[i])||i<_len_0;i++){
+    for (i=0,arg=null,_list_0=args,_len_0=_list_0.length;(arg=_list_0[i])||i<_len_0;i++){
       if (endedArgs) {
         files.push(arg);
       }

data/lib/mochiscript.rb

@@ -1,5 +1,5 @@
 module Mochiscript
-  VERSION = "0.4.3.pre1".sub("-", '.')
+  VERSION = "0.4.3.pre2".sub("-", '.')
 end
 
 require File.dirname(__FILE__) + '/mochiscript/core'

data/vendor/assets/javascripts/mochiscript.js

@@ -204,7 +204,7 @@ window.$m = $m;
   });
 
   $m.out = function () {
-    for (var i=0,arg=null,_list_0=arguments,_len_0=_list_0.length;(arg=_list_0[i])||i<_len_0;i++){
+    for (i=0,arg=null,_list_0=arguments,_len_0=_list_0.length;(arg=_list_0[i])||i<_len_0;i++){
       $m.ADAPTER.out(arg);
       if (i < arguments.length-1) {
         $m.ADAPTER.out(',');
@@ -213,7 +213,7 @@ window.$m = $m;
   };
 
   $m.outs = function () {
-    for (var _i_0=0,arg=null,_list_0=arguments,_len_0=_list_0.length;(arg=_list_0[_i_0])||_i_0<_len_0;_i_0++){
+    for (_i_0=0,arg=null,_list_0=arguments,_len_0=_list_0.length;(arg=_list_0[_i_0])||_i_0<_len_0;_i_0++){
       $m.ADAPTER.outs(arg);
     }
   };
@@ -232,7 +232,8 @@ $m.Class.extend("JSML", function(KLASS, OO){
     this.root    = new $c.JSMLElement();
     this.stack   = [ this.root ];
 
-    for (var _i_0=0,l=null,_list_0=lines,_len_0=_list_0.length;(l=_list_0[_i_0])||_i_0<_len_0;_i_0++){
+    for (var i=0; i<lines.length; i++) {
+      var l = lines[i];
       if (l.match(/^\s*$/)) continue;
       this.processLine(l);
     }
@@ -361,9 +362,11 @@ $m.Class.extend("JSMLElement", function(KLASS, OO){
   OO.addMember("flatten", function(){
     var out = [];
 
-    for (var _i_0=0,c=null,_list_0=this.children,_len_0=_list_0.length;(c=_list_0[_i_0])||_i_0<_len_0;_i_0++){
+    for (var i=0; i<this.children.length; i++) {
+      var c = this.children[i];
       var arr = c.flatten();
-      for (var _i_1=0,item=null,_list_1=arr,_len_1=_list_1.length;(item=_list_1[_i_1])||_i_1<_len_1;_i_1++){
+      for (var j=0; j<arr.length; j++) {
+        var item = arr[j];
         out.push(item);
       }
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mochiscript
 version: !ruby/object:Gem::Version
-  version: 0.4.3.pre1
+  version: 0.4.3.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70315670553940 !ruby/object:Gem::Requirement
+  requirement: &70119397417580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315670553940
+  version_requirements: *70119397417580
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70315670552880 !ruby/object:Gem::Requirement
+  requirement: &70119397416740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315670552880
+  version_requirements: *70119397416740
 description: Javascript Dessert
 email:
 - me@jeffsu.com