js2 0.3.8 → 0.3.9

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.3.9
+  * fixed regex/divide issue
+
 0.3.8
   * fied "render"
   * fixed comment block bug

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.8";
+  js2.VERSION = "0.3.9";
 
   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.8";
+  js2.VERSION = "0.3.9";
 
   JS2.ROOT = JS2;
   
@@ -236,15 +236,23 @@ function mainFunction (arg) {
       var m = this.tokens.match(PRIMARY_REGEX)
       if (!m) return false;
 
+      if (m[0] == '/' && this.tokens.divideCompatible()) {
+        this.tokens.push([ '/', IDS.OPERATOR ]); // operator
+        this.tokens.chomp(1);
+        return  true;
+      }
+
       for (var i=0,tokenDef;tokenDef=this.TOKENS[i];i++) {
         if (m[0] == m[i+2]) {
           var klass = JS2.Lexer[tokenDef[0]];
+
           if (klass) {
             var lexer = new klass(this.tokens);
             if (lexer.consume()) {
               return true;
             }
           } else {
+            var type = tokenDef[0];
             this.tokens.push([ m[0], i ]);
             this.tokens.chomp(m[0]);
             return true;
@@ -464,6 +472,20 @@ function mainFunction (arg) {
       this.before = [];
     },
 
+    divideCompatible: function() {
+      var last = this.lastNonSpace();
+      return (last[0].match(/(\}|\))/) || last[1] == IDS.IDENT);
+    },
+
+    lastNonSpace: function() {
+      var idx   = this.tokens.length - 1;
+      var token = this.tokens[idx];
+      while (token && token[1] == IDS.SPACE) {
+        token = this.tokens[--idx];
+      }
+      return token;
+    },
+
     toArray: function() {
       return this.tokens;
     },
@@ -880,9 +902,9 @@ function mainFunction (arg) {
       return "(var " + iteratorName + "=0," +
               collectionName + "=" + collection + "," +
               l + "=" + collectionName + ".length," +
-              holder + ";" +
-              holder + '=' + collectionName + '[' + iteratorName + ']||' +
-              iteratorName + '<' + l + ';' +
+              holder + ";(" +
+              holder + '=' + collectionName + '[' + iteratorName + '])||(' +
+              iteratorName + '<' + l + ');' +
               iteratorName + '++)';
     }
   });
@@ -1451,6 +1473,61 @@ 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);
+  });
+
+  OO.addMember("initialize",function (txt) {
+    var lines = txt.split(/\n/);
+    this.root    = new JS2.JSMLElement('');
+    this.current = this.root;
+    this.stack   = [ this.root ];
+
+    for(var _i4=0,_c4=lines,_l4=_c4.length,l;l=_c4[_i4]||_i4<_l4;_i4++){
+      if (l.match(/^\s*$/)) continue;
+      this.processLine(l);
+    }
+  });
+
+  OO.addMember("processLine",function (line) {
+    console.log(line);
+    var ele  = new JS2.JSMLElement(line);
+    var scope = this.getScope();
+
+    if (ele.scope == scope) {
+      console.log('same');
+      this.stack.pop();
+      this.getLast().push(ele);
+    } else if (ele.scope == scope+1) {
+      console.log('greater');
+      this.getLast().push(ele); 
+      this.stack.push(ele);
+    } else if (ele.scope < scope) {
+      console.log('less');
+      var diff = ele.scope - scope;
+      while(diff-- != 0) {
+        this.stack.pop();
+      }
+      this.getLast().push(ele);
+    }
+  });
+
+
+  OO.addMember("getScope",function () {
+    return this.stack.length;
+  });
+
+  OO.addMember("getLast",function () {
+    return this.stack[this.stack.length-1];
+  });
+
+});
+
+JS2.Class.extend('JSMLElement', function(KLASS, OO){
+});
+
+
 
   JS2.fs = new JS2.FileSystem(JS2_RUBY_FILE_ADAPTER);
   js2.DECORATOR = new JS2.BrowserDecorator();

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: js2
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 8
-  version: 0.3.8
+  prerelease: 
+  version: 0.3.9
 platform: ruby
 authors: 
 - Jeff Su
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 -07:00
+date: 2011-03-30 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -42,11 +36,11 @@ extra_rdoc_files: []
 files: 
 - bin/js2
 - bin/js2-ruby
-- lib/js2/command.rb
+- lib/js2.rb
 - lib/js2/context.rb
-- lib/js2/fs.rb
 - lib/js2/rack.rb
-- lib/js2.rb
+- lib/js2/command.rb
+- lib/js2/fs.rb
 - lib/js2/browser.js
 - lib/js2/js2.js
 - CHANGELOG
@@ -64,21 +58,17 @@ 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.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Javascript Syntactic Sugar