增加classbody内直接声明变量语法

army8735 · Dec 29, 2016 · a9225c8 · a9225c8
1 parent 705e0db
commit a9225c8
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homunculus",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "A lexer&parser by Javascript",
   "maintainers": [
     {

diff --git a/src/parser/es6/Parser.js b/src/parser/es6/Parser.js
@@ -1160,6 +1160,24 @@ var Parser = IParser.extend(function(lexer) {
     else if(this.look.type() == Token.ANNOT) {
       node.add(this.annot());
     }
+    else if(['[', '{'].indexOf(this.look.content()) != -1) {
+      node.add(this.lexbind());
+    }
+    else if(this.look.type() == Token.ID && ['get', 'set'].indexOf(this.look.content()) == -1) {
+      //LL2区分新增语法classbody内赋值
+      for(var i = this.index; i < this.length; i++) {
+        var next = this.tokens[i];
+        if(!S[next.type()]) {
+          if(next.content() == '(') {
+            node.add(this.method(noIn, noOf));
+          }
+          else {
+            node.add(this.lexbind());
+          }
+          return node;
+        }
+      }
+    }
     else {
       node.add(this.method(noIn, noOf));
     }

diff --git a/tests/es6parser.js b/tests/es6parser.js
@@ -1719,6 +1719,21 @@ describe('es6parser', function() {
       var node = parser.parse('class A{@bind test(){} @link(a,b) get v(){}}');
       expect(tree(node)).to.eql([JsNode.SCRIPT,[JsNode.SCRIPTBODY,[JsNode.CLASSDECL,["class",JsNode.BINDID,["A"],"{",JsNode.CLASSBODY,[JsNode.CLASSELEM,[JsNode.ANNOT,["@bind"]],JsNode.CLASSELEM,[JsNode.METHOD,[JsNode.PROPTNAME,[JsNode.LTRPROPT,["test"]],"(",JsNode.FMPARAMS,[],")","{",JsNode.FNBODY,[],"}"]],JsNode.CLASSELEM,[JsNode.ANNOT,["@link","(",JsNode.FMPARAMS,[JsNode.SINGLENAME,[JsNode.BINDID,["a"]],",",JsNode.SINGLENAME,[JsNode.BINDID,["b"]]],")"]],JsNode.CLASSELEM,[JsNode.METHOD,["get",JsNode.PROPTNAME,[JsNode.LTRPROPT,["v"]],"(",JsNode.FMPARAMS,[],")","{",JsNode.FNBODY,[],"}"]]],"}"]]]]);
     });
+    it('class lexbind', function() {
+      var parser = homunculus.getParser('es6');
+      var node = parser.parse('class A{b=1}');
+      expect(tree(node)).to.eql([JsNode.SCRIPT,[JsNode.SCRIPTBODY,[JsNode.CLASSDECL,["class",JsNode.BINDID,["A"],"{",JsNode.CLASSBODY,[JsNode.CLASSELEM,[JsNode.LEXBIND,[JsNode.BINDID,["b"],JsNode.INITLZ,["=",JsNode.PRMREXPR,["1"]]]]],"}"]]]]);
+    });
+    it('class lexbind 2', function() {
+      var parser = homunculus.getParser('es6');
+      var node = parser.parse('class A{[b]=[1]}');
+      expect(tree(node)).to.eql([JsNode.SCRIPT,[JsNode.SCRIPTBODY,[JsNode.CLASSDECL,["class",JsNode.BINDID,["A"],"{",JsNode.CLASSBODY,[JsNode.CLASSELEM,[JsNode.LEXBIND,[JsNode.ARRBINDPAT,["[",JsNode.SINGLENAME,[JsNode.BINDID,["b"]],"]"],JsNode.INITLZ,["=",JsNode.PRMREXPR,[JsNode.ARRLTR,["[",JsNode.PRMREXPR,["1"],"]"]]]]]],"}"]]]]);
+    });
+    it('class lexbind 3', function() {
+      var parser = homunculus.getParser('es6');
+      var node = parser.parse('class A{{b}={b:1}}');
+      expect(tree(node)).to.eql([JsNode.SCRIPT,[JsNode.SCRIPTBODY,[JsNode.CLASSDECL,["class",JsNode.BINDID,["A"],"{",JsNode.CLASSBODY,[JsNode.CLASSELEM,[JsNode.LEXBIND,[JsNode.OBJBINDPAT,["{",JsNode.BINDPROPT,[JsNode.SINGLENAME,[JsNode.BINDID,["b"]]],"}"],JsNode.INITLZ,["=",JsNode.PRMREXPR,[JsNode.OBJLTR,["{",JsNode.PROPTDEF,[JsNode.PROPTNAME,[JsNode.LTRPROPT,["b"]],":",JsNode.PRMREXPR,["1"]],"}"]]]]]],"}"]]]]);
+    });
   });
   describe('js lib exec test', function() {
     it('jquery 1.11.0', function() {

diff --git a/web/parser/es6/Parser.js b/web/parser/es6/Parser.js
@@ -1160,6 +1160,24 @@ var Parser = IParser.extend(function(lexer) {
     else if(this.look.type() == Token.ANNOT) {
       node.add(this.annot());
     }
+    else if(['[', '{'].indexOf(this.look.content()) != -1) {
+      node.add(this.lexbind());
+    }
+    else if(this.look.type() == Token.ID && ['get', 'set'].indexOf(this.look.content()) == -1) {
+      //LL2区分新增语法classbody内赋值
+      for(var i = this.index; i < this.length; i++) {
+        var next = this.tokens[i];
+        if(!S[next.type()]) {
+          if(next.content() == '(') {
+            node.add(this.method(noIn, noOf));
+          }
+          else {
+            node.add(this.lexbind());
+          }
+          return node;
+        }
+      }
+    }
     else {
       node.add(this.method(noIn, noOf));
     }