bobe 0.0.38 → 0.0.40

package/dist/bobe.compiler.cjs.js

@@ -19,6 +19,7 @@ let TokenType = function (TokenType) {
   TokenType[TokenType["Boolean"] = 4096] = "Boolean";
   TokenType[TokenType["Null"] = 8192] = "Null";
   TokenType[TokenType["Undefined"] = 16384] = "Undefined";
+  TokenType[TokenType["Comment"] = 32768] = "Comment";
   return TokenType;
 }({});
 const BaseTokenType = TokenType.String | TokenType.Number | TokenType.Boolean | TokenType.Null | TokenType.Undefined;
@@ -65,8 +66,9 @@ let ParseErrorCode = function (ParseErrorCode) {
   ParseErrorCode[ParseErrorCode["MISSING_FOR_COLLECTION"] = 9012] = "MISSING_FOR_COLLECTION";
   ParseErrorCode[ParseErrorCode["MISSING_FOR_SEMICOLON"] = 9013] = "MISSING_FOR_SEMICOLON";
   ParseErrorCode[ParseErrorCode["MISSING_FOR_ITEM"] = 9014] = "MISSING_FOR_ITEM";
-  ParseErrorCode[ParseErrorCode["MISSING_PROP_ASSIGNMENT"] = 9015] = "MISSING_PROP_ASSIGNMENT";
-  ParseErrorCode[ParseErrorCode["PIPE_IN_WRONG_CONTEXT"] = 9016] = "PIPE_IN_WRONG_CONTEXT";
+  ParseErrorCode[ParseErrorCode["MISSING_COMMENT_SECOND_SLASH"] = 9015] = "MISSING_COMMENT_SECOND_SLASH";
+  ParseErrorCode[ParseErrorCode["MISSING_PROP_ASSIGNMENT"] = 9016] = "MISSING_PROP_ASSIGNMENT";
+  ParseErrorCode[ParseErrorCode["PIPE_IN_WRONG_CONTEXT"] = 9017] = "PIPE_IN_WRONG_CONTEXT";
   return ParseErrorCode;
 }({});
 class ParseSyntaxError extends SyntaxError {
@@ -294,6 +296,9 @@ class Tokenizer {
                 this.needLoc = true;
               }
               switch (char) {
+                case '/':
+                  this.comment();
+                  break;
                 case "'":
                 case '"':
                   this.str(char);
@@ -333,6 +338,22 @@ class Tokenizer {
       this.handledTokens.push(this.token);
     }
   }
+  getComment() {
+    let value = '/';
+    let nextC = this.code[this.i + 1];
+    if (nextC !== '/') {
+      throw new ParseSyntaxError(ParseErrorCode.MISSING_COMMENT_SECOND_SLASH, '注释开头必须是 //', this.emptyLoc());
+    }
+    while (this.code[this.i + 1] !== '\n') {
+      this.next();
+      value += this.code[this.i];
+    }
+    return value;
+  }
+  comment() {
+    this.getComment();
+    this.next();
+  }
   condExp() {
     {
       this.preCol = this.column;
@@ -351,8 +372,8 @@ class Tokenizer {
         this.next();
       }
       value += this.code[this.i];
-      const trimmed = value.trim();
-      this.setToken(TokenType.Identifier, trimmed ? value : true);
+      const trimmed = value.replace(/\/\/[\s\S]+/, '').trim();
+      this.setToken(TokenType.Identifier, trimmed ? trimmed : true);
       return this.token;
     } finally {
       this.next();
@@ -362,6 +383,9 @@ class Tokenizer {
       }
     }
   }
+  isEol(i) {
+    return this.code[i] === '\n' || this.code[i] === '/';
+  }
   jsExp() {
     {
       this.preCol = this.column;
@@ -400,6 +424,13 @@ class Tokenizer {
     }
     return this.code[i];
   }
+  peekCharIsEol() {
+    const char = this.peekChar();
+    return char === '\n' || char === '/';
+  }
+  charIsEol(char) {
+    return char === '\n' || char === '/';
+  }
   assignment() {
     this.setToken(TokenType.Assign, '=');
   }
@@ -519,6 +550,9 @@ class Tokenizer {
         case '\n':
           nextC = '\n';
           break;
+        case '/':
+          nextC = '/';
+          break;
         default:
           nextC = '';
           break;
@@ -527,6 +561,12 @@ class Tokenizer {
         isEmptyLine = true;
         break;
       }
+      if (nextC === '/') {
+        value += this.getComment();
+        this.next();
+        isEmptyLine = true;
+        break;
+      }
       if (!nextC) {
         break;
       }
@@ -556,6 +596,7 @@ class Tokenizer {
       isEmptyLine = _this$getDentValue2.isEmptyLine;
     if (isEmptyLine) {
       this.needIndent = true;
+      this.next();
       return;
     }
     this.needIndent = false;
@@ -631,7 +672,7 @@ class Tokenizer {
     let nextC;
     while (1) {
       nextC = this.code[this.i + 1];
-      if (typeof nextC !== 'string' || !bobeShared.matchIdStart2(nextC, 0)) {
+      if (typeof nextC !== 'string' || !bobeShared.matchId(nextC, 0)) {
         break;
       }
       value += nextC;
@@ -965,6 +1006,7 @@ var NodeType = function (NodeType) {
   NodeType["Element"] = "Element";
   NodeType["Text"] = "Text";
   NodeType["Interpolation"] = "Interpolation";
+  NodeType["Comment"] = "Comment";
   NodeType["Property"] = "Property";
   NodeType["PropertyKey"] = "PropertyKey";
   NodeType["StaticValue"] = "StaticValue";
@@ -1635,7 +1677,7 @@ class Interpreter {
       i: 0
     };
     if (keyExp) {
-      forNode.getKey = new Function('data', `let v;with(data){v=${keyExp}};return v;`);
+      forNode.getKey = new Function('data', `let v;with(data){v=${keyExp}\n};return v;`);
     }
     window['for1'] = forNode;
     const data = this.getData();