mochiscript 0.4.0.pre14 → 0.4.0

data/lib/mochiscript/core.rb

@@ -252,6 +252,10 @@ var TOKENS = [
 
   [ "STATIC",   "static\\b" ], 
   [ "MODULE",   "module\\b", 'ModuleParser' ], 
+
+  [ "EXPORT",   "export\\s+class\\b", 'ClassParser' ], 
+  [ "PUBLIC",   "public\\s+class\\b", 'ClassParser' ], 
+
   [ "CLASS",    "class\\b",  'ClassParser' ], 
   [ "FUNCTION", "function\\b" ], 
   [ "INCLUDE",  "include\\b" ], 
@@ -453,7 +457,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.toString()); 
+      ret.push(ele === undefined ? '' : ele.toString()); 
     }
     return ret.join("");
   });
@@ -468,6 +472,11 @@ JS2.Class.extend('RootParser', function(KLASS, OO){
     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++){
+      if (ele === undefined) {
+        ret.push(space + "  UNDEFINED!");
+        continue;
+      }
+
       if (ele.pp) {
         if (generic.length) {
           ret.push(space + "  TOKENS:" + JSON.stringify(generic.join('')));
@@ -511,24 +520,22 @@ var RootParser = $c.RootParser;
 RootParser.extend('ClassParser', function(KLASS, OO){
   // private closure
 
-    var REGEX   = Tokens.regex("<CLASS> <CLASSNAME><LCURLY>");
-    var EXTENDS = Tokens.regex("<CLASS> <CLASSNAME><EXTENDS><CLASSNAME><LCURLY>");
+    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) {
     var m = tokens.match(REGEX) || tokens.match(EXTENDS);
-    var name      = m[2];
-    var extending = m[4] || "$m.Class";
+    var name      = m[4];
+    var extending = m[6] || "$m.Class";
 
     tokens.consume(m[0].length-1);
 
     var content = new $c.ClassContentParser();
     content.parse(tokens);
 
-    var behind = tokens.lookback(7);
-    var isPublic  = ($m.PLATFORM == 'node' && behind.match(/public$/)) ? "\nexports." + name + '=' + name + ';' : '';
-    var isExports = ($m.PLATFORM == 'node' && behind == 'export') ? "\nmodule.exports." + name + '=' + name + ';' : '';
-
+    var isPublic  = ($m.PLATFORM == 'node' && m[2] == 'public') ? "\nexports." + name + '=' + name + ';' : '';
+    var isExports = ($m.PLATFORM == 'node' && m[1] == 'export') ? "\nmodule.exports." + name + '=' + name + ';' : '';
 
     this.out = [ "var ", name, " = " + extending + ".extend(function(KLASS, OO)", content, ");", isPublic, isExports ];
   });

data/lib/mochiscript.rb

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

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mochiscript
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.4.0.pre14
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 Z
+date: 2011-11-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: therubyracer
@@ -69,9 +69,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: mochiscript