mochiscript 0.4.0 → 0.4.1

data/lib/mochiscript/core.rb

@@ -4,7 +4,7 @@ require 'json'
 module Mochiscript
   class Context
     def initialize
-      @ctx = V8::Context.new 
+      @ctx = V8::Context.new
       @ctx['_$m_adapter'] = Adapter.new
       @ctx.eval(Parser::JAVASCRIPT)
     end
@@ -45,7 +45,7 @@ module Mochiscript
   class Parser
 JAVASCRIPT = <<'FINISH'
 var $m  = { ROOT: this, ADAPTER: _$m_adapter, PLATFORM: 'ruby' };
-var JS2 = $m; 
+var JS2 = $m;
 (function () {
   // CLASS HELPERS
 (function (undefined, $m) {
@@ -62,12 +62,27 @@ var JS2 = $m;
     if (this.par) this.par.OO.children.push(klass);
   };
 
+  $m.PUSH_ROOT = function (r) {
+    this.ROOTS = this.ROOTS || [];
+    this.ROOTS.push(r);
+    this.ROOT = r;
+  };
+
+  $m.POP_ROOT = function () {
+    this.ROOTS = this.ROOTS || [];
+    if (this.ROOTS.length) {
+      this.ROOTS.pop();
+      this.ROOT = this.ROOTS[this.ROOTS.length-1];
+    }
+
+  };
+
   OO.prototype = {
-    forbiddenMembers: { 
-      'prototype': undefined, 
-      'OO': undefined 
+    forbiddenMembers: {
+      'prototype': undefined,
+      'OO': undefined
     },
- 
+
     include: function(module) {
       this.included.push(module);
       var members = module.OO.members;
@@ -132,7 +147,7 @@ var JS2 = $m;
           member = this.makeSuper(member, this.klass[name]);
         }
       }
-      
+
       this.klass[name] = member;
       this.staticMembers[name] = member;
     }
@@ -154,7 +169,6 @@ var JS2 = $m;
   $m.Class.extend = function(name, klassDef) {
     var klass = function() { if (!noInit) this.initialize.apply(this, arguments); };
     klass.OO  = new OO(klass, this);
-    if (klassDef) klass.name = name;
 
     if (typeof name != 'string') {
       klassDef = name;
@@ -241,7 +255,6 @@ var JS2 = $m;
     }
   };
 
-
   return $m;
 })(undefined, $m);
 
@@ -250,40 +263,40 @@ var JS2 = $m;
 var TOKENS = [
   [ "SPACE", "\\s+"  ],
 
-  [ "STATIC",   "static\\b" ], 
-  [ "MODULE",   "module\\b", 'ModuleParser' ], 
+  [ "STATIC",   "static\\b" ],
+  [ "MODULE",   "module\\b", 'ModuleParser' ],
 
-  [ "EXPORT",   "export\\s+class\\b", 'ClassParser' ], 
-  [ "PUBLIC",   "public\\s+class\\b", 'ClassParser' ], 
+  [ "EXPORT",   "export\\s+class\\b", 'ClassParser' ],
+  [ "PUBLIC",   "public\\s+class\\b", 'ClassParser' ],
 
-  [ "CLASS",    "class\\b",  'ClassParser' ], 
-  [ "FUNCTION", "function\\b" ], 
-  [ "INCLUDE",  "include\\b" ], 
-  [ "VAR",      "var\\b" ], 
-  [ "PRIVATE",  "private\\b" ], 
-  [ "EXTENDS",  "extends\\b" ], 
-  [ "FOREACH",  "foreach\\b", 'ForeachParser' ], 
+  [ "CLASS",    "class\\b",  'ClassParser' ],
+  [ "FUNCTION", "function\\b" ],
+  [ "INCLUDE",  "include\\b" ],
+  [ "VAR",      "var\\b" ],
+  [ "PRIVATE",  "private\\b" ],
+  [ "EXTENDS",  "extends\\b" ],
+  [ "FOREACH",  "foreach\\b", 'ForeachParser' ],
 
-  [ "SHORTHAND_FUNCTION", "#(?:{|\\()", 'ShorthandFunctionParser' ], 
-  [ "ISTRING_START", "%{", 'IStringParser' ], 
-  [ "HEREDOC", "<<[A-Z][0-9A-Z]*", 'HereDocParser' ], 
+  [ "SHORTHAND_FUNCTION", "#(?:{|\\()", 'ShorthandFunctionParser' ],
+  [ "ISTRING_START", "%{", 'IStringParser' ],
+  [ "HEREDOC", "<<[A-Z][0-9A-Z]*", 'HereDocParser' ],
 
-  [ "DSTRING", "\"(?:\\\\.|[^\"])*\"" ], 
-  [ "SSTRING", "\'(?:\\\\.|[^\'])*\'" ], 
+  [ "DSTRING", "\"(?:\\\\.|[^\"])*\"" ],
+  [ "SSTRING", "\'(?:\\\\.|[^\'])*\'" ],
 
-  [ "SEMICOLON", ";" ], 
+  [ "SEMICOLON", ";" ],
   [ "OPERATOR",  "\\+|\\-|\\++" ],
   [ "EQUALS",    "=" ],
 
-  [ "COMMENT", "\\/\\/|\\/\\*", "CommentParser" ], 
-  [ "REGEX", "/", 'RegexParser' ], 
+  [ "COMMENT", "\\/\\/|\\/\\*", "CommentParser" ],
+  [ "REGEX", "/", 'RegexParser' ],
 
   [ "LBRACE", "\\(" ],
   [ "RBRACE", "\\)" ],
   [ "LCURLY", "\\{" ],
   [ "RCURLY", "\\}" ],
 
-  [ "IDENT", IDENT ], 
+  [ "IDENT", IDENT ],
   [ "WHATEVER", "." ]
 ];
 
@@ -294,7 +307,7 @@ var MAIN_REGEX = null;
 var RTYPES  = {};
 
 for(var i=0,_c1=TOKENS,_l1=_c1.length,t;(t=_c1[i])||(i<_l1);i++){
-  TYPES[t[0]] = i; 
+  TYPES[t[0]] = i;
   RTYPES[i]   = t[0];
   REGEXES.push("(" + t[1] + ")");
 }
@@ -405,7 +418,7 @@ JS2.Class.extend('RootParser', function(KLASS, OO){
 
   OO.addMember("parse",function (tokens) {
     var len = tokens.length();
-    if (this.startParse(tokens) === false || this.parseTokens(tokens) === false || this.endParse(tokens) === false) return false 
+    if (this.startParse(tokens) === false || this.parseTokens(tokens) === false || this.endParse(tokens) === false) return false
     return len != tokens.length();
   });
 
@@ -424,13 +437,13 @@ JS2.Class.extend('RootParser', function(KLASS, OO){
         var handler = new $c[handlerClass];
         handler._TYPE = handlerClass;
         if (handler.parse(tokens) !== false) {
-          this.out.push(handler); 
+          this.out.push(handler);
           tokens.lastHandler = handler;
         } else {
           this.handleToken(token, tokens);
         }
-      } 
-      
+      }
+
       // no parser class, use "this" to just consume it
       else {
         this.handleToken(token, tokens);
@@ -457,7 +470,7 @@ JS2.Class.extend('RootParser', function(KLASS, OO){
   OO.addMember("toString",function () {
     var ret = [];
     for(var _i1=0,_c1=this.out,_l1=_c1.length,ele;(ele=_c1[_i1])||(_i1<_l1);_i1++){
-      ret.push(ele === undefined ? '' : ele.toString()); 
+      ret.push(ele === undefined ? '' : ele.toString());
     }
     return ret.join("");
   });
@@ -483,8 +496,8 @@ JS2.Class.extend('RootParser', function(KLASS, OO){
           generic = [];
         }
         ret.push(ele.pp(space));
-      } 
-      
+      }
+
       else {
         generic.push(ele);
       }
@@ -534,10 +547,10 @@ RootParser.extend('ClassParser', function(KLASS, OO){
     var content = new $c.ClassContentParser();
     content.parse(tokens);
 
-    var isPublic  = ($m.PLATFORM == 'node' && m[2] == 'public') ? "\nexports." + name + '=' + name + ';' : '';
-    var isExports = ($m.PLATFORM == 'node' && m[1] == 'export') ? "\nmodule.exports." + name + '=' + name + ';' : '';
+    var isPublic  = ($m.PLATFORM == 'node' && m[2] && m[2].indexOf('public') == 0) ? "exports." + name + '=' + name + ';' : '';
+    var isExports = ($m.PLATFORM == 'node' && m[1] && m[1].indexOf('export') == 0) ? "module.exports=" + name + ';' : '';
 
-    this.out = [ "var ", name, " = " + extending + ".extend(function(KLASS, OO)", content, ");", isPublic, isExports ];
+    this.out = [ extending, ".extend(", JSON.stringify(name), ", function(KLASS, OO)", content, ");", isPublic, isExports ];
   });
 });
 
@@ -556,7 +569,7 @@ RootParser.extend('ModuleParser', function(KLASS, OO){
     var content = new $c.ClassContentParser();
     content.parse(tokens);
 
-    this.out = [ "var ", name, " = $m.Module.extend(function(KLASS, OO)", content, ");" ];
+    this.out = [ "$m.Module.extend(", JSON.stringify(name), ", function(KLASS, OO)", content, ");" ];
   });
 });
 
@@ -656,8 +669,8 @@ RootParser.extend('IStringParser', function(KLASS, OO){
         tokens.consume(len-1);
         this.parseMiddle(tokens);
         this.out.push(')+"');
-      } 
-      
+      }
+
       else if (m[2] == '}') {
         this.out.push(str);
         this.out.push('"');
@@ -668,7 +681,7 @@ RootParser.extend('IStringParser', function(KLASS, OO){
   });
 
   OO.addMember("parseMiddle",function (tokens) {
-    var parser = new CurlyParser(true); 
+    var parser = new $c.CurlyParser(true);
     parser.parse(tokens);
     this.out.push(parser);
   });
@@ -685,17 +698,17 @@ RootParser.extend('StaticParser', function(KLASS, OO){
     var varMatch = tokens.match(VAR_REGEX);
     if (varMatch) {
       tokens.consume(varMatch[1].length);
-      var parser = new MemberParser();
+      var parser = new $c.MemberParser();
       parser.isStatic = true;
       parser.parse(tokens);
       this.out.push(parser);
-    } 
-    
+    }
+
     else {
       var functMatch = tokens.match(FUNCT_REGEX);
       tokens.consume(functMatch[1].length);
 
-      var parser = new MethodParser();
+      var parser = new $c.MethodParser();
       parser.isStatic = true;
       parser.parse(tokens);
       this.out.push(parser);
@@ -723,6 +736,8 @@ RootParser.extend('MemberParser', function(KLASS, OO){
   });
 });
 
+var MemberParser = $m.MemberParser;
+
 
 
 RootParser.extend('IncludeParser', function(KLASS, OO){
@@ -777,11 +792,11 @@ RootParser.extend('MethodParser', function(KLASS, OO){
     var name = m[2];
     var args = m[3];
 
-    var body = new CurlyParser();
+    var body = new $c.CurlyParser();
     body.parse(tokens);
 
     var addMethod = this.isStatic ? 'addStaticMember' : 'addMember';
-    
+
 
     this.out = [ 'OO.' + addMethod + '(', JSON.stringify(name), ', function', args, body, ');' ];
   });
@@ -805,7 +820,7 @@ RootParser.extend('ShorthandFunctionParser', function(KLASS, OO){
       args = "($1,$2,$3)";
     }
 
-    var body = new CurlyParser();
+    var body = new $c.CurlyParser();
     body.parse(tokens);
     var semi = tokens.match(/^\s*[,;\)]/) ? '' : ';';
 
@@ -827,7 +842,7 @@ RootParser.extend('CommentParser', function(KLASS, OO){
       tokens.consume(m2[0].length);
       this.out = [ m2[0] ];
       return;
-    } 
+    }
 
     return false;
   });
@@ -846,9 +861,9 @@ RootParser.extend('RegexParser', function(KLASS, OO){
     if (back.match(DIVIDE)) {
       this._TYPE = 'DIVIDE';
       tokens.consume(1);
-      this.out.push("/"); 
-    } 
-    
+      this.out.push("/");
+    }
+
     else {
       var m = tokens.match(REGEX);
       if (m) {
@@ -891,7 +906,7 @@ CurlyParser.extend('ForeachParser', function(KLASS, OO){
   OO.addMember("endParse",function (tokens) {
     tokens.iterator--;
   });
- 
+
 });
 
 
@@ -935,7 +950,7 @@ JS2.Class.extend('JSML', function(KLASS, OO){
       this.getLast().push(ele);
       this.stack.push(ele);
     } else if (ele.scope > scope) {
-      this.getLast().push(ele); 
+      this.getLast().push(ele);
       this.stack.push(ele);
     } else if (ele.scope < scope) {
       var diff = scope - ele.scope + 1;
@@ -999,12 +1014,12 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     var content  = splitted[4];
 
     if (tokens) {
-      tokens.replace(this.TOKEN_REGEX, function(match, type, name){ 
+      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 '';
       });
     }
@@ -1034,7 +1049,7 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
 
   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++){
@@ -1126,7 +1141,7 @@ JS2.Class.extend('CLI', function(KLASS, OO){
       if (endedArgs) {
         files.push(arg);
       }
-      
+
       else if (COMMANDS[arg]) {
         command   = arg;
         endedArgs = true;

data/lib/mochiscript.rb

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

data/vendor/assets/javascripts/mochiscript.js

@@ -1,12 +1,12 @@
 (function (window) {
 var $m  = {
   ROOT: window,
-  ADAPTER: {                                                                                             
-    out: console.log,
+  ADAPTER: {
+    out:  console.log,
     outs: console.log,
   },
   PLATFORM: 'browser'
-}; 
+};
 
 window.$m = $m;
 
@@ -25,12 +25,27 @@ window.$m = $m;
     if (this.par) this.par.OO.children.push(klass);
   };
 
+  $m.PUSH_ROOT = function (r) {
+    this.ROOTS = this.ROOTS || [];
+    this.ROOTS.push(r);
+    this.ROOT = r;
+  };
+
+  $m.POP_ROOT = function () {
+    this.ROOTS = this.ROOTS || [];
+    if (this.ROOTS.length) {
+      this.ROOTS.pop();
+      this.ROOT = this.ROOTS[this.ROOTS.length-1];
+    }
+
+  };
+
   OO.prototype = {
-    forbiddenMembers: { 
-      'prototype': undefined, 
-      'OO': undefined 
+    forbiddenMembers: {
+      'prototype': undefined,
+      'OO': undefined
     },
- 
+
     include: function(module) {
       this.included.push(module);
       var members = module.OO.members;
@@ -95,7 +110,7 @@ window.$m = $m;
           member = this.makeSuper(member, this.klass[name]);
         }
       }
-      
+
       this.klass[name] = member;
       this.staticMembers[name] = member;
     }
@@ -117,7 +132,6 @@ window.$m = $m;
   $m.Class.extend = function(name, klassDef) {
     var klass = function() { if (!noInit) this.initialize.apply(this, arguments); };
     klass.OO  = new OO(klass, this);
-    if (klassDef) klass.name = name;
 
     if (typeof name != 'string') {
       klassDef = name;
@@ -204,7 +218,6 @@ window.$m = $m;
     }
   };
 
-
   return $m;
 })(undefined, $m);
 

metadata

@@ -2,7 +2,7 @@
 name: mochiscript
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: therubyracer