js2 0.3.19 → 0.3.20

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.3.20
+  * SYNTAX: fixed keyword "module" to only be triggered in proper context.
+
 0.3.19
   * SYNTAX: added private closure block support "private { var foo = 'bar' }" within classes
 

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.19";
+  js2.VERSION = "0.3.20";
 
   JS2.ROOT = JS2;
 

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.19";
+  js2.VERSION = "0.3.20";
 
   JS2.ROOT = JS2;
   
@@ -242,6 +242,17 @@ function mainFunction (arg) {
         return  true;
       }
 
+      // module hack
+      if (m[0] == 'module') {
+        if (this.tokens.match(/^module\s+\w/)) {
+          this.tokens.push([ '{module}', this.IDS.MODULE ]);
+        } else {
+          this.tokens.push([ 'module', this.IDS.IDENT ]);
+        }
+        this.tokens.chomp(6);
+        return true;
+      }
+
       for (var i=0,tokenDef;tokenDef=this.TOKENS[i];i++) {
         if (m[0] == m[i+2]) {
           var klass = JS2.Lexer[tokenDef[0]];
@@ -601,7 +612,7 @@ function mainFunction (arg) {
     }
   };
 
-  var KEYWORDS = { 'var': null, 'class': null, 'function': null, 'in': null, 'with': null, 'curry': null, 'static': null, 'module':null, 'private':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;
 
@@ -758,7 +769,7 @@ function mainFunction (arg) {
   var Module = Klass.extend({
     name: 'Module',
     toString: function() {
-      var v    = this.validate(/(module)(\s+)/);
+      var v    = this.validate(/(\{module\})(\s+)/);
       var last = v.last;
       var m = last.match(/^([\w$]+(\.[\w$]+)*)/);
       if (m) {

metadata

@@ -2,7 +2,7 @@
 name: js2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.19
+  version: 0.3.20
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-02 00:00:00 +08:00
+date: 2011-07-14 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/command.rb
-- lib/js2/context.rb
 - lib/js2/fs.rb
 - lib/js2/rack.rb
-- lib/js2.rb
+- lib/js2/context.rb
 - lib/js2/browser.js
 - lib/js2/js2.js
 - CHANGELOG