js2 0.3.2 → 0.3.3

data/CHANGELOG

@@ -0,0 +1,3 @@
+0.3.3
+- using closure for classes instead of hashes
+- adding static methods

data/lib/js2/js2.js

@@ -123,14 +123,18 @@ function mainFunction (arg) {
     var oo   = klass.oo;
     proto.oo = oo;
 
-    for (var name in klassDef) {
-      oo.addMember(name, klassDef[name]);
-    }
-
     for (var name in this) {
       oo.addStaticMember(name, this[name]);
     }
 
+    if (typeof klassDef == 'function') {
+      klassDef(klass, oo);
+    } else {
+      for (var name in klassDef) {
+        oo.addMember(name, klassDef[name]);
+      }
+    }
+
     return klass;
   };
 
@@ -155,6 +159,7 @@ function mainFunction (arg) {
     [ 'SPACE', "\\s+" ],
     [ 'REGEX', "\\/" ],
     [ 'CLASS', "class" ],
+    [ 'STATIC', "static" ],
     [ 'SHORT_FUNCT', "#\\{|#\\(" ],
     [ 'FOREACH', "foreach" ],
     [ 'CURRY', "curry" ],
@@ -534,7 +539,7 @@ function mainFunction (arg) {
     }
   };
 
-  var KEYWORDS = { 'var': null, 'class': null, 'function': null, 'in': null, 'with': null, 'curry': null};
+  var KEYWORDS = { 'var': null, 'class': null, 'function': null, 'in': null, 'with': null, 'curry': null, 'static': null };
   var IDS = JS2.Lexer.IDS;
   IDS['NODE'] = -1;
 
@@ -702,6 +707,7 @@ function mainFunction (arg) {
       switch (token[0]) {
         case 'var': return Member;
         case 'function': return Method;
+        case 'static': return StaticMember;
       }
     },
 
@@ -713,8 +719,27 @@ function mainFunction (arg) {
 
     toString: function() {
       var str = this.$super();
-      return str.replace(/,(\s+\})$/, "$1");
-    } 
+      return str.replace(/^{/, 'function(KLASS, OO){').replace(/}$/, "}");
+    }
+  });
+
+  var StaticMember = Content.extend({
+    name: 'StaticMember',
+    handOff: function(token) {
+      if (this.started) this.closed = true;
+
+      switch (token[0]) {
+        case 'var': this.started = true; return Member;
+        case 'function': this.started = true; return Method;
+      }
+    },
+
+    toString: function() {
+      var member = this.handOffs[0];
+      if (!member) return '';
+      var ret = member.toString();
+      return ret.replace(/addMember/, 'addStaticMember');
+    }
   });
 
   var Method = Content.extend({
@@ -731,7 +756,7 @@ function mainFunction (arg) {
 
     toString: function () {
       var v  = this.validate(/^(function)(\s+)(I)(\s*)(Braces)(\s*)(Block)/);
-      return v[3] + ':' + "function" + v[2] + v[5] + ' ' + v[7] + ',';
+      return 'OO.addMember("' + v[3] + '",' + "function" + v[2] + v[5] + ' ' + v[7] + ');';
     }
   });
 
@@ -746,12 +771,10 @@ function mainFunction (arg) {
       var last = v.last.replace(/;$/, '');
       if (last.length == 0) last = 'null';
 
-      return '"' + v[3] + '":' + last + ',';
+      return 'OO.addMember("' + v[3] + '",' + last + ');';
     }
   });
 
-
-
   var Braces = Content.extend({
     name: 'Braces',
     handleToken: function(token) {
@@ -950,7 +973,6 @@ JS2.Array.prototype.any = function() {
   return this.length > 0;
 };
 
-
 JS2.Class.extend('FileSystem', {
   initialize:function (adapter) {
     this.adapter = adapter;
@@ -1060,7 +1082,6 @@ JS2.Class.extend('FileSystem', {
   }
 });
 
-
 JS2.Class.extend('Updater', {
   initialize:function (fs, inDir, outDir, recursive) {
     this.recursive = recursive;
@@ -1105,7 +1126,6 @@ JS2.Class.extend('Updater', {
   }
 });
 
-
 JS2.Class.extend('Config', {
   "CLI_REGEX":/^-(r|i|f)(=(\w+))$/,
   "optsLookup":{ 
@@ -1168,7 +1188,6 @@ JS2.Class.extend('Config', {
 
 });
 
-
 JS2.Class.extend('Commander', {
   "BANNER":"js2 <command> [options] <arguments>\n" +
     "Commands:\n" +
@@ -1251,7 +1270,6 @@ JS2.Class.extend('Commander', {
 });
 
 
-
 JS2.Class.extend('BrowserDecorator', {
   file:function (code) {
     return code;
@@ -1285,7 +1303,6 @@ JS2.Class.extend('RingoDecorator', {
 JS2.DECORATOR = JS2.DECORATOR || new JS2.BrowserDecorator();
 
 
-
   JS2.fs = new JS2.FileSystem(JS2_RUBY_FILE_ADAPTER);
   js2.DECORATOR = new JS2.BrowserDecorator();
   js2.ROOT = root;

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: js2
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.2
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 +08:00
+date: 2011-03-09 00:00:00 -08: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,12 +42,13 @@ 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
 homepage: http://jeffsu.github.com/js2
 licenses: []
@@ -56,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