js2 0.3.18 → 0.3.19

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.3.19
+  * SYNTAX: added private closure block support "private { var foo = 'bar' }" within classes
+
 0.3.18
   * COMMAND: updaters should be using targetDir instead of outDir
   * JSML: fixed empty space problem

data/lib/js2/browser.js

@@ -19,7 +19,7 @@ function mainFunction (arg) {
 
   var JS2 = root.JS2 = mainFunction;
   var js2 = root.js2 = JS2;
-  js2.VERSION = "0.3.18";
+  js2.VERSION = "0.3.19";
 
   JS2.ROOT = JS2;
 
@@ -269,6 +269,7 @@ JS2.Array.prototype.any = function() {
   return this.length > 0;
 };
 
+
   JS2.Class.extend('JSML', function(KLASS, OO){
   OO.addStaticMember("process",function (txt) {
     return new KLASS(txt);
@@ -469,6 +470,7 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
   });
 });
 
+
   JS2.TEMPLATES = { jsml: JS2.JSML };
 
 

data/lib/js2/js2.js

@@ -14,7 +14,7 @@ function mainFunction (arg) {
 
   var JS2 = root.JS2 = mainFunction;
   var js2 = root.js2 = JS2;
-  js2.VERSION = "0.3.18";
+  js2.VERSION = "0.3.19";
 
   JS2.ROOT = JS2;
   
@@ -601,7 +601,7 @@ function mainFunction (arg) {
     }
   };
 
-  var KEYWORDS = { 'var': null, 'class': null, 'function': null, 'in': null, 'with': null, 'curry': null, 'static': null, 'module':null };
+  var KEYWORDS = { 'var': null, 'class': null, 'function': null, 'in': null, 'with': null, 'curry': null, 'static': null, 'module':null, 'private':null };
   var IDS = JS2.Lexer.IDS;
   IDS['NODE'] = -1;
 
@@ -778,9 +778,26 @@ function mainFunction (arg) {
       if (this.tokens.isBalancedCurly(this) && token[0] == '}') {
         this.closed = true;
       }
-    } 
+    }
+  });
+
+  var Private = Content.extend({
+    name: 'Private',
+    handOff: function(token) {
+      if (this.started) this.closed = true;
+      switch (token[0]) {
+        case '{': this.started = true; return Block;
+      }
+    }, 
+
+    toString: function() {
+      var v  = this.validate(/(private)(\s+)/);
+      var last = v.last;
+      return "// private closure\n" + last.replace(/^\{/, '').replace(/\}$/, '');
+    }
   });
 
+
   var KlassBlock = Block.extend({
     name: 'KlassBlock',
     handOff: function(token) {
@@ -789,6 +806,7 @@ function mainFunction (arg) {
         case 'function': return Method;
         case 'static': return StaticMember;
         case 'include': return Include;
+        case 'private': return Private;
       }
     },
 
@@ -1124,6 +1142,7 @@ JS2.Array.prototype.any = function() {
   return this.length > 0;
 };
 
+
 JS2.Class.extend('FileSystem', function(KLASS, OO){
   OO.addMember("initialize",function (adapter) {
     this.adapter = adapter;
@@ -1233,6 +1252,7 @@ JS2.Class.extend('FileSystem', function(KLASS, OO){
   });
 });
 
+
 JS2.Class.extend('Updater', function(KLASS, OO){
   OO.addMember("initialize",function (fs, inDir, outDir, recursive) {
     this.recursive = recursive;
@@ -1278,6 +1298,7 @@ JS2.Class.extend('Updater', function(KLASS, OO){
   });
 });
 
+
 JS2.Class.extend('Config', function(KLASS, OO){
   OO.addMember("CLI_REGEX",/^-(r|i|f|n|v|m)(=(\w+))?$/);
   OO.addMember("optsLookup",{ 
@@ -1349,6 +1370,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" +
@@ -1435,6 +1457,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){
 });
 
 
+
 JS2.Class.extend('BrowserDecorator', function(KLASS, OO){
   OO.addMember("file",function (code) {
     return code;
@@ -1479,6 +1502,7 @@ JS2.Class.extend('RingoDecorator', function(KLASS, OO){
 
 JS2.DECORATOR = JS2.DECORATOR || new JS2.BrowserDecorator();
 
+
 JS2.Class.extend('JSML', function(KLASS, OO){
   OO.addStaticMember("process",function (txt) {
     return new KLASS(txt);
@@ -1678,6 +1702,7 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     return (out.length ? ' ' : '') + out.join(' ');
   });
 });
+
 JS2.TEMPLATES = { jsml: JS2.JSML };
 
 

metadata

@@ -2,7 +2,7 @@
 name: js2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.18
+  version: 0.3.19
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 +08:00
+date: 2011-07-02 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,11 +36,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/browser.js
 - lib/js2/js2.js
 - CHANGELOG
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Javascript Sugar