fix: export as的id可以是关键字

army8735 · Aug 3, 2020 · 3903f1d · 3903f1d
1 parent e653bb0
commit 3903f1d
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 7 deletions.
diff --git a/homunculus.js b/homunculus.js
diff --git a/homunculus.js.map b/homunculus.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homunculus",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "A lexer&parser by Javascript",
   "maintainers": [
     {

diff --git a/src/lexer/rule/EcmascriptRule.js b/src/lexer/rule/EcmascriptRule.js
diff --git a/src/parser/es6/Parser.js b/src/parser/es6/Parser.js
@@ -249,9 +249,20 @@ var Parser = IParser.extend(function(lexer) {
     var node = new Node(Node.EXPORTSPEC);
     node.add(this.idref());
     if(this.look && this.look.content() == 'as') {
+      //as后一般是id，也可以是关键字，LL2来特殊处理
+      var type = Token.ID;
+      for(var i = this.index; i < this.length; i++) {
+        var next = this.tokens[i];
+        if(!S[next.type()]) {
+          if(next.type() == Token.KEYWORD) {
+            type = Token.KEYWORD;
+          }
+          break;
+        }
+      }
       node.add(
         this.match('as'),
-        this.match(Token.ID)
+        this.match(type)
       );
     }
     return node;

diff --git a/web/lexer/rule/EcmascriptRule.js b/web/lexer/rule/EcmascriptRule.js
diff --git a/web/parser/es6/Parser.js b/web/parser/es6/Parser.js
@@ -249,9 +249,20 @@ var Parser = IParser.extend(function(lexer) {
     var node = new Node(Node.EXPORTSPEC);
     node.add(this.idref());
     if(this.look && this.look.content() == 'as') {
+      //as后一般是id，也可以是关键字，LL2来特殊处理
+      var type = Token.ID;
+      for(var i = this.index; i < this.length; i++) {
+        var next = this.tokens[i];
+        if(!S[next.type()]) {
+          if(next.type() == Token.KEYWORD) {
+            type = Token.KEYWORD;
+          }
+          break;
+        }
+      }
       node.add(
         this.match('as'),
-        this.match(Token.ID)
+        this.match(type)
       );
     }
     return node;