mochiscript 0.4.1 → 0.4.3.pre1

data/lib/mochiscript/core.rb

@@ -241,7 +241,7 @@ var JS2 = $m;
   });
 
   $m.out = function () {
-    for(var i=0,_c1=arguments,_l1=_c1.length,arg;(arg=_c1[i])||(i<_l1);i++){
+    for (var 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 _i1=0,_c1=arguments,_l1=_c1.length,arg;(arg=_c1[_i1])||(_i1<_l1);_i1++){
+    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++){
       $m.ADAPTER.outs(arg);
     }
   };
@@ -259,6 +259,210 @@ var JS2 = $m;
 })(undefined, $m);
 
 
+$m.Class.extend("JSML", function(KLASS, OO){
+  OO.addStaticMember("process", function(txt){
+    return new $m.JSML(txt);
+  });
+
+  OO.addMember("initialize", function(txt){
+    var lines = txt.split(/\n/);
+    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++){
+      if (l.match(/^\s*$/)) continue;
+      this.processLine(l);
+    }
+
+    var toEval = 'function stuff() { var out = [];\n' + this.flatten().join('') + '\n return out.join("");\n}';
+    eval(toEval);
+
+    this.result = function(bound) {
+      bound = bound || {};
+      return stuff.call(bound);
+    };
+  });
+
+  OO.addMember("flatten", function(){
+    return this.root.flatten();
+  });
+
+  OO.addMember("processLine", function(line){
+    if (line.match(/^\s*$/)) return;
+
+    var ele   = new $m.JSMLElement(line);
+    var scope = this.getScope();
+
+    if (ele.scope == scope) {
+      this.stack.pop();
+      this.getLast().push(ele);
+      this.stack.push(ele);
+    } else if (ele.scope > scope) {
+      this.getLast().push(ele);
+      this.stack.push(ele);
+    } else if (ele.scope < scope) {
+      var diff = scope - ele.scope + 1;
+      while(diff-- > 0) {
+        this.stack.pop();
+      }
+      this.getLast().push(ele);
+      this.stack.push(ele);
+    }
+  });
+
+
+  OO.addMember("getScope", function(){
+    return this.stack.length - 1;
+  });
+
+  OO.addMember("getLast", function(){
+    return this.stack[this.stack.length-1];
+  });
+
+});
+
+$m.Class.extend("JSMLElement", function(KLASS, OO){
+  OO.addMember("SCOPE_REGEX", /^(\s*)(.*)$/);
+  OO.addMember("SPLIT_REGEX", /^((?:\.|\#|\%)[^=\s\{]*)?(\{.*\})?(=|-)?(?:\s*)(.*)$/);
+  OO.addMember("TOKEN_REGEX", /(\%|\#|\.)([\w][\w\-]*)/g);
+  OO.addMember("JS_REGEX", /^(-|=)(.*)$/g);
+  OO.addMember("SCOPE_OFFSET", 1);
+  OO.addMember("SELF_CLOSING", { area: null, basefont: null, br: null, hr: null, input: null, img: null, link: null, meta: null });
+
+  OO.addMember("initialize", function(line){
+    this.children = [];
+
+    if (line == null) {
+      this.scope = this.SCOPE_OFFSET;
+      return;
+    }
+
+    var spaceMatch = line.match(this.SCOPE_REGEX);
+    this.scope = spaceMatch[1].length / 2 + this.SCOPE_OFFSET;
+
+    this.classes  = [];
+    this.nodeID   = null;
+
+    this.parse(spaceMatch[2]);
+  });
+
+  OO.addMember("push", function(child){
+    this.children.push(child);
+  });
+
+  OO.addMember("parse", function(line){
+    this.attributes;
+    this.line = line;
+    var self = this;
+
+    var splitted = line.match(this.SPLIT_REGEX);
+    var tokens   = splitted[1];
+    var attrs    = splitted[2];
+    var jsType   = splitted[3];
+    var content  = splitted[4];
+
+    if (tokens) {
+      tokens.replace(this.TOKEN_REGEX, function(match, type, name) {
+        switch(type) {
+          case '%': self.nodeType = name; break;
+          case '.': self.classes.push(name); break;
+          case '#': self.nodeID = name; break;
+        }
+        return '';
+      });
+    }
+
+    if (jsType == '=') {
+      this.jsEQ = content;
+    } else if (jsType == '-') {
+      this.jsExec = content;
+    } else {
+      this.content = content;
+    }
+
+    if (attrs) {
+      this.attributes = attrs;
+    }
+
+    if (!this.nodeType && (this.classes.length || this.nodeID)) {
+      this.nodeType = 'div';
+    }
+
+    if (this.SELF_CLOSING.hasOwnProperty(this.nodeType) && this.children.length == 0) {
+      this.selfClose = '/';
+    } else {
+      this.selfClose = '';
+    }
+  });
+
+  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++){
+      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++){
+        out.push(item);
+      }
+    }
+
+    if (this.nodeType) {
+      this.handleJsEQ(out);
+      this.handleContent(out);
+      out.unshift('out.push("<' + this.nodeType + '"+$m.ROOT.JSMLElement.parseAttributes(' + (this.attributes || "{}") + ', ' + JSON.stringify(this.classes || []) + ', ' + JSON.stringify(this.id || null) + ')+"' + this.selfClose + '>");\n');
+      if (this.selfClose == '') {
+        out.push('out.push(' + JSON.stringify("</"+(this.nodeType)+">") + ');\n');
+      }
+    } else {
+      this.handleJsExec(out);
+      this.handleJsEQ(out);
+      this.handleContent(out);
+    }
+
+    return out;
+  });
+
+  OO.addMember("handleJsEQ", function(out){
+    if (this.jsEQ) {
+      this.jsEQ = this.jsEQ.replace(/;\s*$/, '');
+      out.unshift('out.push(' + this.jsEQ + ');\n');
+    }
+  });
+
+  OO.addMember("handleContent", function(out){
+    if (this.content != null && this.content.length > 0) {
+      out.unshift('out.push(' + JSON.stringify(this.content) + ');\n');
+    }
+  });
+
+
+  OO.addMember("handleJsExec", function(out){
+    if (this.jsExec) {
+      out.unshift(this.jsExec);
+      if (this.jsExec.match(/\{\s*$/)) {
+        out.push("}\n");
+      }
+    }
+  });
+
+  OO.addStaticMember("parseAttributes", function(hash, classes, id){
+    var out = [];
+    classes = classes || [];
+    if (hash['class']) classes.push(hash['class']);
+    if (classes.length) hash['class'] = classes.join(" ");
+
+    for (var k in hash) {
+      if (hash.hasOwnProperty(k)) {
+        out.push(k + '=' + JSON.stringify(hash[k]));
+      }
+    }
+    return (out.length ? ' ' : '') + out.join(' ');
+  });
+});
+
+$m.JSML = $m.ROOT.JSML;
+$m.JSMLElement = $m.ROOT.JSMLElement;
+
+
   var IDENT  = "[\\$\\w]+";
 var TOKENS = [
   [ "SPACE", "\\s+"  ],
@@ -306,7 +510,7 @@ var REGEXES = [];
 var MAIN_REGEX = null;
 var RTYPES  = {};
 
-for(var i=0,_c1=TOKENS,_l1=_c1.length,t;(t=_c1[i])||(i<_l1);i++){
+for (var 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] + ")");
@@ -319,26 +523,26 @@ var EXTRA_REGEX_STRINGS = {
 
 var MAIN_REGEX = new RegExp("^" + REGEXES.join('|'));
 
-JS2.Class.extend('Tokens', function(KLASS, OO){
-  OO.addMember("initialize",function (str) {
+$m.Class.extend("Tokens", function(KLASS, OO){
+  OO.addMember("initialize", function(str){
     this.orig     = str;
     this.str      = str;
     this.iterator = 0;
     this.consumed = 0;
   });
 
-  OO.addMember("peek",function () {
+  OO.addMember("peek", function(){
     if (this._peek) return this._peek;
 
     var m = this.str.match(MAIN_REGEX);
     if (!m) return null;
 
-    for(var i=0,_c1=TOKENS,_l1=_c1.length,ele;(ele=_c1[i])||(i<_l1);i++){
+    for (var 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] ];
     }
   });
 
-  OO.addStaticMember("regex",function (str) {
+  OO.addStaticMember("regex", function(str){
     var regexStr = str.replace(/\*\*/g, "\\s*").replace(/\s+/g, "\\s+").replace(/\>\</g, ">\\s*<").replace(/\<(\w+)\>/g, function($1,$2,$3){
       return "(" + (EXTRA_REGEX_STRINGS[$2] || TOKENS[TYPES[$2]][1])  + ")";
     });
@@ -346,17 +550,17 @@ JS2.Class.extend('Tokens', function(KLASS, OO){
     return new RegExp("^" + regexStr);
   });
 
-  OO.addMember("consume",function (n) {
+  OO.addMember("consume", function(n){
     this.str   = this.str.substr(n, this.str.length-n);
     this._peek = null;
     this.consumed += n;
   });
 
-  OO.addMember("length",function () {
+  OO.addMember("length", function(){
     return this.str.length;
   });
 
-  OO.addMember("lookback",function (n) {
+  OO.addMember("lookback", function(n){
     var starting = this.consumed - 1;
 
     //$m.outs(JSON.stringify(this.orig.substr(starting-10, 10)));
@@ -370,18 +574,18 @@ JS2.Class.extend('Tokens', function(KLASS, OO){
     return this.orig.substr(starting-n+1, n);
   });
 
-  OO.addMember("lookahead",function (n) {
+  OO.addMember("lookahead", function(n){
     var starting = this.consumed;
     while (this.orig.charAt(starting).match(/\s/)) starting++;
     return this.orig.substr(starting, n);
   });
 
 
-  OO.addMember("any",function () {
+  OO.addMember("any", function(){
     return this.str.length > 0;
   });
 
-  OO.addMember("match",function (regex) {
+  OO.addMember("match", function(regex){
     return this.str.match(regex);
   });
 });
@@ -408,22 +612,22 @@ $m.pp = function (str) {
 
 
 
-JS2.Class.extend('RootParser', function(KLASS, OO){
-  OO.addMember("handlers",{});
+$m.Class.extend("RootParser", function(KLASS, OO){
+  OO.addMember("handlers", {});
 
-  OO.addMember("initialize",function () {
+  OO.addMember("initialize", function(){
     this.out = [];
     this.finished = false;
   });
 
-  OO.addMember("parse",function (tokens) {
+  OO.addMember("parse", function(tokens){
     var len = tokens.length();
     if (this.startParse(tokens) === false || this.parseTokens(tokens) === false || this.endParse(tokens) === false) return false
     return len != tokens.length();
   });
 
   // TODO: messy clean this process up
-  OO.addMember("parseTokens",function (tokens) {
+  OO.addMember("parseTokens", function(tokens){
     var sanity  = 100;
     var origLen = tokens.length();
 
@@ -459,32 +663,32 @@ JS2.Class.extend('RootParser', function(KLASS, OO){
     }
   });
 
-  OO.addMember("startParse",function () { });
-  OO.addMember("endParse",function () { });
+  OO.addMember("startParse", function(){ });
+  OO.addMember("endParse", function(){ });
 
-  OO.addMember("handleToken",function (token, tokens) {
+  OO.addMember("handleToken", function(token, tokens){
     this.out.push(token[1]);
     tokens.consume(token[1].length);
   });
 
-  OO.addMember("toString",function () {
+  OO.addMember("toString", function(){
     var ret = [];
-    for(var _i1=0,_c1=this.out,_l1=_c1.length,ele;(ele=_c1[_i1])||(_i1<_l1);_i1++){
+    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++){
       ret.push(ele === undefined ? '' : ele.toString());
     }
     return ret.join("");
   });
 
-  OO.addMember("toJSON",function () {
+  OO.addMember("toJSON", function(){
     return JSON.stringify(this.toStruct());
   });
 
-  OO.addMember("pp",function (space) {
+  OO.addMember("pp", function(space){
     space = space == null ? "  " : space + "  ";
 
     var ret = [ space + (this._TYPE || 'NODE') ];
     var generic = [];
-    for(var _i1=0,_c1=this.out,_l1=_c1.length,ele;(ele=_c1[_i1])||(_i1<_l1);_i1++){
+    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++){
       if (ele === undefined) {
         ret.push(space + "  UNDEFINED!");
         continue;
@@ -510,34 +714,33 @@ JS2.Class.extend('RootParser', function(KLASS, OO){
     return ret.join("\n");
   });
 
-  OO.addMember("toStruct",function () {
+  OO.addMember("toStruct", function(){
     var ret = [];
-    for(var _i1=0,_c1=this.out,_l1=_c1.length,ele;(ele=_c1[_i1])||(_i1<_l1);_i1++){
+    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++){
       ret.push(ele.toStruct ? ele.toStruct() : ele);
     }
     return ret;
   });
 
   // intercepts parser class for special cases
-  OO.addMember("getHandler",function (token) {
+  OO.addMember("getHandler", function(token){
     return null;
   });
 
-  OO.addMember("chop",function () {
+  OO.addMember("chop", function(){
     this.out.pop();
   });
 });
 
 var RootParser = $c.RootParser;
 
-RootParser.extend('ClassParser', function(KLASS, OO){
-  // private closure
-
+RootParser.extend("ClassParser", function(KLASS, OO){
+  
     var REGEX   = Tokens.regex("(?:<EXPORT>|<PUBLIC>|<CLASS>) <CLASSNAME><LCURLY>");
     var EXTENDS = Tokens.regex("(?:<EXPORT>|<PUBLIC>|<CLASS>) <CLASSNAME><EXTENDS><CLASSNAME><LCURLY>");
   
 
-  OO.addMember("parse",function (tokens) {
+  OO.addMember("parse", function(tokens){
     var m = tokens.match(REGEX) || tokens.match(EXTENDS);
     var name      = m[4];
     var extending = m[6] || "$m.Class";
@@ -554,13 +757,12 @@ RootParser.extend('ClassParser', function(KLASS, OO){
   });
 });
 
-RootParser.extend('ModuleParser', function(KLASS, OO){
-  // private closure
-
+RootParser.extend("ModuleParser", function(KLASS, OO){
+  
     var REGEX = Tokens.regex("<MODULE> <CLASSNAME><LCURLY>");
   
 
-  OO.addMember("parse",function (tokens) {
+  OO.addMember("parse", function(tokens){
     var m = tokens.match(REGEX);
     if (!m) return false;
     var name = m[2];
@@ -573,15 +775,15 @@ RootParser.extend('ModuleParser', function(KLASS, OO){
   });
 });
 
-RootParser.extend('CurlyParser', function(KLASS, OO){
-  OO.addMember("_TYPE",'CurlyParser');
+RootParser.extend("CurlyParser", function(KLASS, OO){
+  OO.addMember("_TYPE", 'CurlyParser');
 
-  OO.addMember("initialize",function (chop) {
+  OO.addMember("initialize", function(chop){
     this.chop = chop;
     this.$super();
   });
 
-  OO.addMember("handleToken",function (token, tokens) {
+  OO.addMember("handleToken", function(token, tokens){
     if (this.curly === undefined) this.curly = 0;
     if (this.foo) console.log(RTYPES[token[0]], token[1]);
     if (token[0] == TYPES.RCURLY) {
@@ -597,7 +799,7 @@ RootParser.extend('CurlyParser', function(KLASS, OO){
     }
   });
 
-  OO.addMember("endParse",function (tokens) {
+  OO.addMember("endParse", function(tokens){
     if (this.chop) {
       this.out.pop();
       this.out.shift();
@@ -607,8 +809,8 @@ RootParser.extend('CurlyParser', function(KLASS, OO){
 
 var CurlyParser = $c.CurlyParser;
 
-CurlyParser.extend('ClassContentParser', function(KLASS, OO){
-  OO.addMember("getHandler",function (token) {
+CurlyParser.extend("ClassContentParser", function(KLASS, OO){
+  OO.addMember("getHandler", function(token){
     switch(token[0]) {
       case TYPES.STATIC:   return "StaticParser";
       case TYPES.VAR:      return "MemberParser";
@@ -620,8 +822,8 @@ CurlyParser.extend('ClassContentParser', function(KLASS, OO){
 
 });
 
-RootParser.extend('LineParser', function(KLASS, OO){
-  OO.addMember("handleToken",function (token, tokens) {
+RootParser.extend("LineParser", function(KLASS, OO){
+  OO.addMember("handleToken", function(token, tokens){
     this.$super(token, tokens);
     if (token[0] == TYPES.SEMICOLON) {
       this.finished = true;
@@ -629,31 +831,29 @@ RootParser.extend('LineParser', function(KLASS, OO){
   });
 });
 
-CurlyParser.extend('PrivateParser', function(KLASS, OO){
-  // private closure
-
+CurlyParser.extend("PrivateParser", function(KLASS, OO){
+  
     var REGEX = Tokens.regex("<PRIVATE>\\s*");
   
 
-  OO.addMember("startParse",function (tokens) {
+  OO.addMember("startParse", function(tokens){
     var m = tokens.match(REGEX);
     tokens.consume(m[0].length);
   });
 
-  OO.addMember("endParse",function (tokens) {
+  OO.addMember("endParse", function(tokens){
     this.out.pop();
     this.out.shift();
   });
 });
 
 
-RootParser.extend('IStringParser', function(KLASS, OO){
-  // private closure
-
+RootParser.extend("IStringParser", function(KLASS, OO){
+  
     var BEGIN = Tokens.regex("<ISTRING_START>");
   
 
-  OO.addMember("parse",function (tokens) {
+  OO.addMember("parse", function(tokens){
     var m = tokens.match(BEGIN);
     tokens.consume(m[0].length);
     this.out.push('"');
@@ -680,21 +880,20 @@ RootParser.extend('IStringParser', function(KLASS, OO){
     }
   });
 
-  OO.addMember("parseMiddle",function (tokens) {
+  OO.addMember("parseMiddle", function(tokens){
     var parser = new $c.CurlyParser(true);
     parser.parse(tokens);
     this.out.push(parser);
   });
 });
 
-RootParser.extend('StaticParser', function(KLASS, OO){
-  // private closure
-
+RootParser.extend("StaticParser", function(KLASS, OO){
+  
     var VAR_REGEX = Tokens.regex("(<STATIC>(\\s+))<VAR>");
     var FUNCT_REGEX = Tokens.regex("(<STATIC>(\\s+))<FUNCTION>");
   
 
-  OO.addMember("parseTokens",function (tokens) {
+  OO.addMember("parseTokens", function(tokens){
     var varMatch = tokens.match(VAR_REGEX);
     if (varMatch) {
       tokens.consume(varMatch[1].length);
@@ -716,13 +915,12 @@ RootParser.extend('StaticParser', function(KLASS, OO){
   });
 });
 
-RootParser.extend('MemberParser', function(KLASS, OO){
-  // private closure
-
+RootParser.extend("MemberParser", function(KLASS, OO){
+  
     var REGEX = Tokens.regex("var <IDENT>\\s*=\\s*?");
   
 
-  OO.addMember("parse",function (tokens) {
+  OO.addMember("parse", function(tokens){
     var m = tokens.str.match(REGEX);
     this.name = m[1];
     tokens.consume(m[0].length);
@@ -740,27 +938,25 @@ var MemberParser = $m.MemberParser;
 
 
 
-RootParser.extend('IncludeParser', function(KLASS, OO){
-  // private closure
-
+RootParser.extend("IncludeParser", function(KLASS, OO){
+  
     var REGEX = Tokens.regex("<INCLUDE> <CLASSNAME><SEMICOLON>");
   
 
-  OO.addMember("parse",function (tokens) {
+  OO.addMember("parse", function(tokens){
     var m = tokens.match(REGEX);
     tokens.consume(m[0].length);
     this.out = [ 'OO.include(',  m[2], ');' ];
   });
 });
 
-RootParser.extend('HereDocParser', function(KLASS, OO){
-  // private closure
-
+RootParser.extend("HereDocParser", function(KLASS, OO){
+  
     var REGEX = Tokens.regex("<HEREDOC>");
   
 
-  OO.addMember("parse",function (tokens) {
-    var beginning = tokens.match(/^<<(\w+)\s*([;\)])*\n/);
+  OO.addMember("parse", function(tokens){
+    var beginning = tokens.match(/^<<(\w+)(?::(\w+))?\s*([;\)])*\n/);
     tokens.consume(beginning[0].length);
 
     var spacing = tokens.match(/^(\s*)/);
@@ -771,22 +967,25 @@ RootParser.extend('HereDocParser', function(KLASS, OO){
     var toParse  = strMatch[1] || '';
 
     toParse = toParse.replace(regexSub, '');
-    toParse = toParse.replace("\n", "\\n");
+    toParse = toParse.replace(/\n/g, "\\n");
 
     var string = $m.parse('%{' + toParse + '}');
     tokens.consume(strMatch[0] ? strMatch[0].length : 0);
 
-    this.out = [ string, beginning[2] || ';' ];
+    if (beginning[2]) {
+      this.out = [ '$m.JSML.process(', string, ')',  beginning[3] || ';' ];
+    } else {
+      this.out = [ string, beginning[3] || ';' ];
+    }
   });
 });
 
-RootParser.extend('MethodParser', function(KLASS, OO){
-  // private closure
-
+RootParser.extend("MethodParser", function(KLASS, OO){
+  
     var REGEX = Tokens.regex("<FUNCTION> <IDENT><ARGS><SPACE>");
   
 
-  OO.addMember("parse",function (tokens) {
+  OO.addMember("parse", function(tokens){
     var m = tokens.str.match(REGEX);
     tokens.consume(m[0].length);
     var name = m[2];
@@ -802,13 +1001,12 @@ RootParser.extend('MethodParser', function(KLASS, OO){
   });
 });
 
-RootParser.extend('ShorthandFunctionParser', function(KLASS, OO){
-  // private closure
-
+RootParser.extend("ShorthandFunctionParser", function(KLASS, OO){
+  
     var ARGS_REGEX = Tokens.regex("<ARGS>\\s*");
   
 
-  OO.addMember("parse",function (tokens) {
+  OO.addMember("parse", function(tokens){
     tokens.consume(1);
     var argsMatch = tokens.match(ARGS_REGEX);
     var args = null;
@@ -828,8 +1026,8 @@ RootParser.extend('ShorthandFunctionParser', function(KLASS, OO){
   });
 });
 
-RootParser.extend('CommentParser', function(KLASS, OO){
-  OO.addMember("parse",function (tokens) {
+RootParser.extend("CommentParser", function(KLASS, OO){
+  OO.addMember("parse", function(tokens){
     var m = tokens.match(/^\/\/.*?\n/);
     if (m) {
       tokens.consume(m[0].length);
@@ -848,14 +1046,13 @@ RootParser.extend('CommentParser', function(KLASS, OO){
   });
 });
 
-RootParser.extend('RegexParser', function(KLASS, OO){
-  // private closure
-
+RootParser.extend("RegexParser", function(KLASS, OO){
+  
     var REGEX  = /^\/(\\.|[^\/])+\/[imgy]{0,4}/;
     var DIVIDE = /(\}|\)|\+\+|\-\-|[\w\$])$/;
   
 
-  OO.addMember("parseTokens",function (tokens) {
+  OO.addMember("parseTokens", function(tokens){
     var back = tokens.lookback(2);
 
     if (back.match(DIVIDE)) {
@@ -878,15 +1075,14 @@ RootParser.extend('RegexParser', function(KLASS, OO){
 
 });
 
-CurlyParser.extend('ForeachParser', function(KLASS, OO){
-  OO.addMember("_TYPE",'Foreach');
-
-  // private closure
+CurlyParser.extend("ForeachParser", function(KLASS, OO){
+  OO.addMember("_TYPE", 'Foreach');
 
+  
     var REGEX = Tokens.regex("<FOREACH><LBRACE><VAR> <IDENT>(?:**:**<IDENT>)? in (.*?)**<RBRACE>**{");
   
 
-  OO.addMember("startParse",function (tokens) {
+  OO.addMember("startParse", function(tokens){
     var m = tokens.match(REGEX);
     namespace = tokens.iterator++;
 
@@ -900,221 +1096,18 @@ CurlyParser.extend('ForeachParser', function(KLASS, OO){
 
     var bool = "(" + this.item + "=" + "_list_" + namespace + "[" + this.iterator + "])||" + this.iterator + "<_len_" + namespace;
 
-    this.out = [ "for (", declare, ";", bool, ';', this.iterator + "++)" ];
+    this.out = [ "for (var ", declare, ";", bool, ';', this.iterator + "++)" ];
   });
 
-  OO.addMember("endParse",function (tokens) {
+  OO.addMember("endParse", function(tokens){
     tokens.iterator--;
   });
 
 });
 
 
-
-JS2.Class.extend('JSML', function(KLASS, OO){
-  OO.addStaticMember("process",function (txt) {
-    return new KLASS(txt);
-  });
-
-  OO.addMember("initialize",function (txt) {
-    var lines = txt.split(/\n/);
-    this.root    = new JS2.JSMLElement();
-    this.stack   = [ this.root ];
-
-    for(var _i1=0,_c1=lines,_l1=_c1.length,l;(l=_c1[_i1])||(_i1<_l1);_i1++){
-      if (l.match(/^\s*$/)) continue;
-      this.processLine(l);
-    }
-
-    var toEval = 'function process() { var out = [];\n' + this.flatten().join('') + '\n return out.join("");\n}';
-    eval(toEval);
-
-    this.result = function(bound) {
-      bound = bound || {};
-      return process.call(bound);
-    };
-  });
-
-  OO.addMember("flatten",function () {
-    return this.root.flatten();
-  });
-
-  OO.addMember("processLine",function (line) {
-    if (line.match(/^\s*$/)) return;
-
-    var ele   = new JS2.JSMLElement(line);
-    var scope = this.getScope();
-
-    if (ele.scope == scope) {
-      this.stack.pop();
-      this.getLast().push(ele);
-      this.stack.push(ele);
-    } else if (ele.scope > scope) {
-      this.getLast().push(ele);
-      this.stack.push(ele);
-    } else if (ele.scope < scope) {
-      var diff = scope - ele.scope + 1;
-      while(diff-- > 0) {
-        this.stack.pop();
-      }
-      this.getLast().push(ele);
-      this.stack.push(ele);
-    }
-  });
-
-
-  OO.addMember("getScope",function () {
-    return this.stack.length - 1;
-  });
-
-  OO.addMember("getLast",function () {
-    return this.stack[this.stack.length-1];
-  });
-
-});
-
-JS2.Class.extend('JSMLElement', function(KLASS, OO){
-  OO.addMember("SCOPE_REGEX",/^(\s*)(.*)$/);
-  OO.addMember("SPLIT_REGEX",/^((?:\.|\#|\%)[^=\s\{]*)?(\{.*\})?(=|-)?(?:\s*)(.*)$/);
-  OO.addMember("TOKEN_REGEX",/(\%|\#|\.)([\w][\w\-]*)/g);
-  OO.addMember("JS_REGEX",/^(-|=)(.*)$/g);
-  OO.addMember("SCOPE_OFFSET",1);
-  OO.addMember("SELF_CLOSING",{ area: null, basefont: null, br: null, hr: null, input: null, img: null, link: null, meta: null });
-
-  OO.addMember("initialize",function (line) {
-    this.children = [];
-
-    if (line == null) {
-      this.scope = this.SCOPE_OFFSET;
-      return;
-    }
-
-    var spaceMatch = line.match(this.SCOPE_REGEX);
-    this.scope = spaceMatch[1].length / 2 + this.SCOPE_OFFSET;
-
-    this.classes  = [];
-    this.nodeID   = null;
-
-    this.parse(spaceMatch[2]);
-  });
-
-  OO.addMember("push",function (child) {
-    this.children.push(child);
-  });
-
-  OO.addMember("parse",function (line) {
-    this.attributes;
-    this.line = line;
-    var self = this;
-
-    var splitted = line.match(this.SPLIT_REGEX);
-    var tokens   = splitted[1];
-    var attrs    = splitted[2];
-    var jsType   = splitted[3];
-    var content  = splitted[4];
-
-    if (tokens) {
-      tokens.replace(this.TOKEN_REGEX, function(match, type, name){
-        switch(type) {
-          case '%': self.nodeType = name; break;
-          case '.': self.classes.push(name); break;
-          case '#': self.nodeID = name; break;
-        }
-        return '';
-      });
-    }
-
-    if (jsType == '=') {
-      this.jsEQ = content;
-    } else if (jsType == '-') {
-      this.jsExec = content;
-    } else {
-      this.content = content;
-    }
-
-    if (attrs) {
-      this.attributes = attrs;
-    }
-
-    if (!this.nodeType && (this.classes.length || this.nodeID)) {
-      this.nodeType = 'div';
-    }
-
-    if (this.SELF_CLOSING.hasOwnProperty(this.nodeType) && this.children.length == 0) {
-      this.selfClose = '/';
-    } else {
-      this.selfClose = '';
-    }
-  });
-
-  OO.addMember("flatten",function () {
-    var out = [];
-
-    for(var _i1=0,_c1=this.children,_l1=_c1.length,c;(c=_c1[_i1])||(_i1<_l1);_i1++){
-      var arr = c.flatten();
-      for(var _i2=0,_c2=arr,_l2=_c2.length,item;(item=_c2[_i2])||(_i2<_l2);_i2++){
-        out.push(item);
-      }
-    }
-
-    if (this.nodeType) {
-      this.handleJsEQ(out);
-      this.handleContent(out);
-      out.unshift('out.push("<' + this.nodeType + '"+JS2.JSMLElement.parseAttributes(' + (this.attributes || "{}") + ', ' + JSON.stringify(this.classes || []) + ', ' + JSON.stringify(this.id || null) + ')+"' + this.selfClose + '>");\n');
-      if (this.selfClose == '') {
-        out.push('out.push(' + JSON.stringify("</"+(this.nodeType)+">") + ');\n');
-      }
-    } else {
-      this.handleJsExec(out);
-      this.handleJsEQ(out);
-      this.handleContent(out);
-    }
-
-    return out;
-  });
-
-  OO.addMember("handleJsEQ",function (out) {
-    if (this.jsEQ) {
-      this.jsEQ = this.jsEQ.replace(/;\s*$/, '');
-      out.unshift('out.push(' + this.jsEQ + ');\n');
-    }
-  });
-
-  OO.addMember("handleContent",function (out) {
-    if (this.content != null && this.content.length > 0) {
-      out.unshift('out.push(' + JSON.stringify(this.content) + ');\n');
-    }
-  });
-
-
-  OO.addMember("handleJsExec",function (out) {
-    if (this.jsExec) {
-      out.unshift(this.jsExec);
-      if (this.jsExec.match(/\{\s*$/)) {
-        out.push("}\n");
-      }
-    }
-  });
-
-  OO.addStaticMember("parseAttributes",function (hash, classes, id) {
-    var out = [];
-    classes = classes || [];
-    if (hash['class']) classes.push(hash['class']);
-    if (classes.length) hash['class'] = classes.join(" ");
-
-    for (var k in hash) {
-      if (hash.hasOwnProperty(k)) {
-        out.push(k + '=' + JSON.stringify(hash[k]));
-      }
-    }
-    return (out.length ? ' ' : '') + out.join(' ');
-  });
-});
-
-
-JS2.Class.extend('CLI', function(KLASS, OO){
-  // private closure
-
+$m.Class.extend("CLI", function(KLASS, OO){
+  
     var COMMANDS = {
       help:    'help',
       render:  'render',
@@ -1123,21 +1116,21 @@ JS2.Class.extend('CLI', function(KLASS, OO){
     };
   
 
-  OO.addMember("run",function (args) {
+  OO.addMember("run", function(args){
     var opts = this.parseOpts(args);
     var options = opts[0];
     var command = opts[1];
     var files   = opts[2];
   });
 
-  OO.addMember("parseOpts",function (args) {
+  OO.addMember("parseOpts", function(args){
     var files   = [];
     var options = {};
     var command = null;
 
     var endedArgs = false;
 
-    for(var i=0,_c1=args,_l1=_c1.length,arg;(arg=_c1[i])||(i<_l1);i++){
+    for (var 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.1".sub("-", '.')
+  VERSION = "0.4.3.pre1".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,_c1=arguments,_l1=_c1.length,arg;(arg=_c1[i])||(i<_l1);i++){
+    for (var 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 _i1=0,_c1=arguments,_l1=_c1.length,arg;(arg=_c1[_i1])||(_i1<_l1);_i1++){
+    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++){
       $m.ADAPTER.outs(arg);
     }
   };
@@ -222,4 +222,208 @@ window.$m = $m;
 })(undefined, $m);
 
 
+$m.Class.extend("JSML", function(KLASS, OO){
+  OO.addStaticMember("process", function(txt){
+    return new $m.JSML(txt);
+  });
+
+  OO.addMember("initialize", function(txt){
+    var lines = txt.split(/\n/);
+    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++){
+      if (l.match(/^\s*$/)) continue;
+      this.processLine(l);
+    }
+
+    var toEval = 'function stuff() { var out = [];\n' + this.flatten().join('') + '\n return out.join("");\n}';
+    eval(toEval);
+
+    this.result = function(bound) {
+      bound = bound || {};
+      return stuff.call(bound);
+    };
+  });
+
+  OO.addMember("flatten", function(){
+    return this.root.flatten();
+  });
+
+  OO.addMember("processLine", function(line){
+    if (line.match(/^\s*$/)) return;
+
+    var ele   = new $m.JSMLElement(line);
+    var scope = this.getScope();
+
+    if (ele.scope == scope) {
+      this.stack.pop();
+      this.getLast().push(ele);
+      this.stack.push(ele);
+    } else if (ele.scope > scope) {
+      this.getLast().push(ele);
+      this.stack.push(ele);
+    } else if (ele.scope < scope) {
+      var diff = scope - ele.scope + 1;
+      while(diff-- > 0) {
+        this.stack.pop();
+      }
+      this.getLast().push(ele);
+      this.stack.push(ele);
+    }
+  });
+
+
+  OO.addMember("getScope", function(){
+    return this.stack.length - 1;
+  });
+
+  OO.addMember("getLast", function(){
+    return this.stack[this.stack.length-1];
+  });
+
+});
+
+$m.Class.extend("JSMLElement", function(KLASS, OO){
+  OO.addMember("SCOPE_REGEX", /^(\s*)(.*)$/);
+  OO.addMember("SPLIT_REGEX", /^((?:\.|\#|\%)[^=\s\{]*)?(\{.*\})?(=|-)?(?:\s*)(.*)$/);
+  OO.addMember("TOKEN_REGEX", /(\%|\#|\.)([\w][\w\-]*)/g);
+  OO.addMember("JS_REGEX", /^(-|=)(.*)$/g);
+  OO.addMember("SCOPE_OFFSET", 1);
+  OO.addMember("SELF_CLOSING", { area: null, basefont: null, br: null, hr: null, input: null, img: null, link: null, meta: null });
+
+  OO.addMember("initialize", function(line){
+    this.children = [];
+
+    if (line == null) {
+      this.scope = this.SCOPE_OFFSET;
+      return;
+    }
+
+    var spaceMatch = line.match(this.SCOPE_REGEX);
+    this.scope = spaceMatch[1].length / 2 + this.SCOPE_OFFSET;
+
+    this.classes  = [];
+    this.nodeID   = null;
+
+    this.parse(spaceMatch[2]);
+  });
+
+  OO.addMember("push", function(child){
+    this.children.push(child);
+  });
+
+  OO.addMember("parse", function(line){
+    this.attributes;
+    this.line = line;
+    var self = this;
+
+    var splitted = line.match(this.SPLIT_REGEX);
+    var tokens   = splitted[1];
+    var attrs    = splitted[2];
+    var jsType   = splitted[3];
+    var content  = splitted[4];
+
+    if (tokens) {
+      tokens.replace(this.TOKEN_REGEX, function(match, type, name) {
+        switch(type) {
+          case '%': self.nodeType = name; break;
+          case '.': self.classes.push(name); break;
+          case '#': self.nodeID = name; break;
+        }
+        return '';
+      });
+    }
+
+    if (jsType == '=') {
+      this.jsEQ = content;
+    } else if (jsType == '-') {
+      this.jsExec = content;
+    } else {
+      this.content = content;
+    }
+
+    if (attrs) {
+      this.attributes = attrs;
+    }
+
+    if (!this.nodeType && (this.classes.length || this.nodeID)) {
+      this.nodeType = 'div';
+    }
+
+    if (this.SELF_CLOSING.hasOwnProperty(this.nodeType) && this.children.length == 0) {
+      this.selfClose = '/';
+    } else {
+      this.selfClose = '';
+    }
+  });
+
+  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++){
+      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++){
+        out.push(item);
+      }
+    }
+
+    if (this.nodeType) {
+      this.handleJsEQ(out);
+      this.handleContent(out);
+      out.unshift('out.push("<' + this.nodeType + '"+$m.ROOT.JSMLElement.parseAttributes(' + (this.attributes || "{}") + ', ' + JSON.stringify(this.classes || []) + ', ' + JSON.stringify(this.id || null) + ')+"' + this.selfClose + '>");\n');
+      if (this.selfClose == '') {
+        out.push('out.push(' + JSON.stringify("</"+(this.nodeType)+">") + ');\n');
+      }
+    } else {
+      this.handleJsExec(out);
+      this.handleJsEQ(out);
+      this.handleContent(out);
+    }
+
+    return out;
+  });
+
+  OO.addMember("handleJsEQ", function(out){
+    if (this.jsEQ) {
+      this.jsEQ = this.jsEQ.replace(/;\s*$/, '');
+      out.unshift('out.push(' + this.jsEQ + ');\n');
+    }
+  });
+
+  OO.addMember("handleContent", function(out){
+    if (this.content != null && this.content.length > 0) {
+      out.unshift('out.push(' + JSON.stringify(this.content) + ');\n');
+    }
+  });
+
+
+  OO.addMember("handleJsExec", function(out){
+    if (this.jsExec) {
+      out.unshift(this.jsExec);
+      if (this.jsExec.match(/\{\s*$/)) {
+        out.push("}\n");
+      }
+    }
+  });
+
+  OO.addStaticMember("parseAttributes", function(hash, classes, id){
+    var out = [];
+    classes = classes || [];
+    if (hash['class']) classes.push(hash['class']);
+    if (classes.length) hash['class'] = classes.join(" ");
+
+    for (var k in hash) {
+      if (hash.hasOwnProperty(k)) {
+        out.push(k + '=' + JSON.stringify(hash[k]));
+      }
+    }
+    return (out.length ? ' ' : '') + out.join(' ');
+  });
+});
+
+$m.JSML = $m.ROOT.JSML;
+$m.JSMLElement = $m.ROOT.JSMLElement;
+
+
 })(window);

metadata

@@ -1,49 +1,45 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mochiscript
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.1
+version: !ruby/object:Gem::Version
+  version: 0.4.3.pre1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Jeff Su
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: therubyracer
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70315670553940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70315670553940
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70315670552880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70315670552880
 description: Javascript Dessert
-email: 
+email:
 - me@jeffsu.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
@@ -52,32 +48,28 @@ files:
 - lib/mochiscript/rails/engine.rb
 - mochiscript.gemspec
 - vendor/assets/javascripts/mochiscript.js
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: mochiscript
-rubygems_version: 1.8.9
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Javascript Dessert
 test_files: []
-