js2 0.3.4 → 0.3.5

data/CHANGELOG

@@ -1,3 +1,13 @@
+0.3.5
+  * Added scope and binding support to shorthand functions
+	* Added support for modules
+
+0.3.4
+  * coded reduce to clojure spec
+  * fixed collect and some other iterators
+
 0.3.3
-- using closure for classes instead of hashes
-- adding static methods
+  * using closure for classes instead of hashes
+  * adding static methods
+
+

data/lib/js2/js2.js

@@ -14,6 +14,7 @@ function mainFunction (arg) {
 
   var JS2 = root.JS2 = mainFunction;
   var js2 = root.js2 = JS2;
+  js2.VERSION = "0.3.5";
 
   JS2.ROOT = JS2;
   
@@ -24,22 +25,39 @@ function mainFunction (arg) {
     this.klass = klass;
     this.par   = par;
 
-    this['static'] = {
-      methods: {},
-      members: {},
-    };
-
-    this.methods  = {};
-    this.members  = {};
+    this.members       = {};
+    this.staticMembers = {};
     this.children = [];
+    this.included = [];
 
-    if (this.par) this.par.oo.children.push(klass);
+    if (this.par) this.par.OO.children.push(klass);
   };
 
   OO.prototype = {
     forbiddenMembers: { 
       'prototype': undefined, 
-      'oo': undefined 
+      'OO': undefined 
+    },
+ 
+    include: function(module) {
+      this.included.push(module);
+      var members = module.OO.members;
+      for (var name in members) {
+        if (members.hasOwnProperty(name)) {
+          this.addMember(name, members[name]);
+        }
+      }
+
+      var staticMembers = module.OO.staticMembers;
+      for (var name in staticMembers) {
+        if (staticMembers.hasOwnProperty(name)) {
+          this.addStaticMember(name, staticMembers[name]);
+        }
+      }
+
+      if (typeof staticMembers['included'] == 'function') {
+        staticMembers['included'](this.klass);
+      }
     },
 
     createNamespace: function(name) {
@@ -74,6 +92,7 @@ function mainFunction (arg) {
       }
 
       proto[name] = member;
+      this.members[name] = member;
     },
 
     addStaticMember: function(name, member) {
@@ -86,14 +105,15 @@ function mainFunction (arg) {
       }
       
       this.klass[name] = member;
+      this.staticMembers[name] = member;
     }
   };
 
   JS2.Class = function() { this.initialize.apply(this, arguments); };
-  JS2.Class.oo = new OO(JS2.Class);
+  JS2.Class.OO = new OO(JS2.Class);
   JS2.Class.prototype = {
     initialize: function () {},
-    oo: JS2.Class.oo
+    oo: JS2.Class.OO
   };
 
   var namedClasses = {};
@@ -104,13 +124,13 @@ function mainFunction (arg) {
   var noInit = false;
   JS2.Class.extend = function(name, klassDef) {
     var klass = function() { if (!noInit) this.initialize.apply(this, arguments); };
-    klass.oo  = new OO(klass, this);
+    klass.OO  = new OO(klass, this);
 
     if (typeof name != 'string') {
       klassDef = name;
     } else {
       namedClasses[name] = klass;
-      var namespace = this.oo.createNamespace(name);
+      var namespace = this.OO.createNamespace(name);
       namespace[0][namespace[1]] = klass;
     }
 
@@ -120,8 +140,8 @@ function mainFunction (arg) {
     noInit = false;
 
     klass.prototype = proto;
-    var oo   = klass.oo;
-    proto.oo = oo;
+    var oo   = klass.OO;
+    proto.OO = oo;
 
     for (var name in this) {
       oo.addStaticMember(name, this[name]);
@@ -138,6 +158,8 @@ function mainFunction (arg) {
     return klass;
   };
 
+  JS2.Module = JS2.Class;
+
   var assert = {
     'eq': function(expected, actual) { if (expected != actual) console.log("Expected "+expected+", but got "+actual+".") },
     'isFalse': function(val) { if (val) console.log("Expected false, but got "+val+".") },
@@ -159,7 +181,9 @@ function mainFunction (arg) {
     [ 'SPACE', "\\s+" ],
     [ 'REGEX', "\\/" ],
     [ 'CLASS', "class" ],
+    [ 'MODULE', "module" ],
     [ 'STATIC', "static" ],
+    [ 'include', "include" ],
     [ 'SHORT_FUNCT', "#\\{|#\\(" ],
     [ 'FOREACH', "foreach" ],
     [ 'CURRY', "curry" ],
@@ -437,6 +461,7 @@ function mainFunction (arg) {
       this.index  = 0;
       this.str    = str;
       this.orig   = str;
+      this.before = [];
     },
 
     toArray: function() {
@@ -478,7 +503,9 @@ function mainFunction (arg) {
     },
 
     pop: function() {
-      return this.tokens.pop();
+      var ret = this.tokens.pop();
+      this.before.push(ret);
+      return ret;
     },
 
     peek: function() {
@@ -494,6 +521,7 @@ function mainFunction (arg) {
         case '(': this.braceCount++; break;
         case ')': this.braceCount--; break;
       }
+      this.before.unshift(token);
       return token;
     },
 
@@ -539,7 +567,7 @@ function mainFunction (arg) {
     }
   };
 
-  var KEYWORDS = { 'var': null, 'class': null, 'function': null, 'in': null, 'with': null, 'curry': null, 'static': null };
+  var KEYWORDS = { 'var': null, 'class': null, 'function': null, 'in': null, 'with': null, 'curry': null, 'static': null, 'module':null };
   var IDS = JS2.Lexer.IDS;
   IDS['NODE'] = -1;
 
@@ -655,6 +683,7 @@ function mainFunction (arg) {
     handOff: function(token) {
       switch (token[1]) {
         case IDS.CLASS: return Klass;
+        case IDS.MODULE: return Module;
         case IDS.FOREACH: return Foreach;
         case IDS.SHORT_FUNCT: return ShortFunct;
         case IDS.CURRY: return Curry;
@@ -692,6 +721,23 @@ function mainFunction (arg) {
     }
   });
 
+  var Module = Klass.extend({
+    name: 'Module',
+    toString: function() {
+      var v    = this.validate(/(module)(\s+)/);
+      var last = v.last;
+      var m = last.match(/^([\w$]+(\.[\w$]+)*)/);
+      if (m) {
+        var name   = m[1];
+        var source = last.substr(name.length);
+        return JS2.DECORATOR.createModule(name, source);
+      } else {
+        // raise error
+      }
+    }
+  });
+
+
   var Block = Content.extend({
     name: 'Block',
     handleToken: function(token) {
@@ -708,6 +754,7 @@ function mainFunction (arg) {
         case 'var': return Member;
         case 'function': return Method;
         case 'static': return StaticMember;
+        case 'include': return Include;
       }
     },
 
@@ -719,10 +766,23 @@ function mainFunction (arg) {
 
     toString: function() {
       var str = this.$super();
-      return str.replace(/^{/, 'function(KLASS, OO){').replace(/}$/, "}");
+      return str.replace(/^{/, 'function(KLASS, OO){');
     }
   });
 
+  var Include = Content.extend({
+    name: 'Include',
+    handleToken: function(token) {
+      if (token[0] == ';') this.closed = true;
+    },
+
+    toString: function() {
+      var v = this.validate(/^(include)(\s+)/);
+      return "OO.include(" + v.last.replace(/;$/, ');');
+    }
+    
+  });
+
   var StaticMember = Content.extend({
     name: 'StaticMember',
     handOff: function(token) {
@@ -829,9 +889,8 @@ function mainFunction (arg) {
     handOff: function(token) {
       if (this.started) {
         this.closed = true;
-        var foo = (new Validator(this.tokens.toArray())).getString(2);
         this.semi = (new Validator(this.tokens.toArray())).validate(/^(\s*)([^\s\w$])/, 2) ? '' : ';';
-      }
+      } 
 
       switch (token[0]) {
         case '(': return Braces;
@@ -839,9 +898,50 @@ function mainFunction (arg) {
       }
     },
 
+    parseArgs: function(str) {
+      // (arg1, arg2 with scope1, scope2 binds bindingVar)
+      var m =  str.match(/^\((\s*([\w\$]+)(\s*,\s*[\w\$]+)*)?(\s*with\s+(([\w\$]+)(\s*,\s*[\w\$]+)*))?(\s*binds\s+(.+))?\)/);
+      if (!m) {}  // raise error
+
+      return {
+        braces: '(' + (m[1] || '') + ')',
+        scope:  m[5],
+        binds:  m[9]
+      };
+    },
+
     toString: function() {
-      var v = this.validate(/(#)(Braces)?(\s*)(Block)/);
-      return "function" + (v[2] ? v[2] : "($1,$2,$3)") + v[4] + this.semi;
+      var scopes   = null;
+      var inScopes = null;
+
+      var v    = this.validate(/(#)(Braces)?(\s*)(Block)/);
+      var args = this.parseArgs(v[2] ? v[2].toString() : '($1,$2,$3)');
+      var body = v[4];
+
+      // we need a function within a function
+      if (args.binds || args.scope) {
+        var scope   = args.scope || '';
+        var inScope = scope;
+
+        // need to pass in __self and bind to __self
+        if (args.binds) {
+          var comma = scope == '' ? '' : ',';
+          inScope = scope.replace(/^/, '__self' + comma);
+          scope   = scope.replace(/^/,  args.binds + comma);
+          
+          return '(function(' + inScope + '){' + 'var f = function' + args.braces + body + ';' + ' return function() { return f.apply(__self, arguments)};})(' + scope + ')' + this.semi; 
+        } 
+        
+        // no binding, just use scoping 
+        else {
+          return '(function(' + inScope + '){' + 'return function' + args.braces + body + ';' + '})(' + scope + ')' + this.semi; 
+        }
+      } 
+      
+      // just a normal function
+      else {
+        return "function" + args.braces + body + this.semi;
+      }
     }
   });
 
@@ -1208,6 +1308,7 @@ JS2.Class.extend('Config', function(KLASS, OO){
 
 JS2.Class.extend('Commander', function(KLASS, OO){
   OO.addMember("BANNER","js2 <command> [options] <arguments>\n" +
+    "VERSION: " + js2.VERSION + "\n" +
     "Commands:\n" +
     "  * run <file>                -- Executes file\n" +
     "  * render <file>             -- Shows JS2 compiled output\n" +
@@ -1297,6 +1398,10 @@ JS2.Class.extend('BrowserDecorator', function(KLASS, OO){
   OO.addMember("klass",function (name, par, source) {
     return par+".extend('"+name+"',"+source+");";
   });
+
+  OO.addMember("createModule",function (name, source) {
+    return "JS2.Module.extend('"+name+"',"+source+");";
+  });
 });
 
 JS2.Class.extend('NodeDecorator', function(KLASS, OO){
@@ -1307,6 +1412,10 @@ JS2.Class.extend('NodeDecorator', function(KLASS, OO){
   OO.addMember("klass",function (name, par, source) {
     return "var "+name+"=exports['"+name+"']="+par+".extend("+source+");";
   });
+
+  OO.addMember("createModule",function (name, source) {
+    return "var "+name+"=exports['"+name+"']=JS2.Module.extend("+source+");";
+  });
 });
 
 JS2.Class.extend('RingoDecorator', function(KLASS, OO){
@@ -1317,6 +1426,10 @@ JS2.Class.extend('RingoDecorator', function(KLASS, OO){
   OO.addMember("klass",function (name, par, source) {
     return "var "+name+"=exports['"+name+"']="+par+".extend("+source+");";
   });
+
+  OO.addMember("createModule",function (name, source) {
+    return "var "+name+"=exports['"+name+"']=JS2.Module.extend("+source+");";
+  });
 });
 
 JS2.DECORATOR = JS2.DECORATOR || new JS2.BrowserDecorator();

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: js2
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.4
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +08:00
+date: 2011-03-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +25,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -36,11 +42,11 @@ extra_rdoc_files: []
 files: 
 - bin/js2
 - bin/js2-ruby
-- lib/js2.rb
-- lib/js2/context.rb
-- lib/js2/rack.rb
 - lib/js2/command.rb
+- lib/js2/context.rb
 - lib/js2/fs.rb
+- lib/js2/rack.rb
+- lib/js2.rb
 - lib/js2/js2.js
 - CHANGELOG
 has_rdoc: true
@@ -57,17 +63,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Javascript Syntactic Sugar