homunculus - npm Package Compare versions

Comparing version 0.0.5 to 0.0.6

package.json

 {
   "name": "homunculus",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "A lexer&parser by Javascript",
@@ -5,0 +5,0 @@ "maintainers": [

src/lexer/Lexer.js

@@ -5,217 +5,222 @@ var Class = require('../util/Class');
 var Lexer = Class(function(rule) {
-    this.rule = rule; //当前语法规则
-    this.init();
-  }).methods({
-    parse: function(code, start) {
-      this.code = code || '';
-      if(!character.isUndefined(start)) {
-        this.totalLine = start;
+  this.rule = rule; //当前语法规则
+  this.init();
+}).methods({
+  parse: function(code, start) {
+    this.code = code || '';
+    if(!character.isUndefined(start)) {
+      this.totalLine = start;
+    }
+    var temp = [];
+    this.scan(temp);
+    return temp;
+  },
+  parseOn: function() {
+    var temp = [];
+    this.scan(temp);
+    return temp;
+  },
+  tokens: function() {
+    return this.tokenList;
+  },
+  scan: function(temp) {
+    var perlReg = this.rule.perlReg();
+    var length = this.code.length;
+    var count = 0;
+    outer:
+    while(this.index < length) {
+      if(this.cacheLine > 0 && count >= this.cacheLine) {
+        break;
       }
-      var temp = [];
-      this.scan(temp);
-      return temp;
-    },
-    tokens: function() {
-      return this.tokenList;
-    },
-    scan: function(temp) {
-      var perlReg = this.rule.perlReg();
-      var length = this.code.length;
-      var count = 0;
-      outer:
-      while(this.index < length) {
-        if(this.cacheLine > 0 && count >= this.cacheLine) {
-          break;
-        }
-        this.readch();
-        //perl风格正则
-        if(perlReg && this.isReg == Lexer.IS_REG && this.peek == character.SLASH && !{ '/': true, '*': true }[this.code.charAt(this.index)]) {
-          this.dealReg(temp, length);
-          this.isReg = Lexer.NOT_REG;
-        }
-        //依次遍历匹配规则，命中则继续
-        else {
-          for(var i = 0, matches = this.rule.matches(), len = matches.length; i < len; i++) {
-            var match = matches[i];
-            if(match.match(this.peek, this.code, this.index)) {
-              var token = new Token(match.tokenType(), match.content(), match.val()),
-                error = match.error(),
-                matchLen = match.content().length;
-              if(token.type() == Token.ID && this.rule.keyWords().hasOwnProperty(token.content())) {
-                token.type(Token.KEYWORD);
+      this.readch();
+      //perl风格正则
+      if(perlReg && this.isReg == Lexer.IS_REG && this.peek == character.SLASH && !{ '/': true, '*': true }[this.code.charAt(this.index)]) {
+        this.dealReg(temp, length);
+        this.isReg = Lexer.NOT_REG;
+      }
+      //依次遍历匹配规则，命中则继续
+      else {
+        for(var i = 0, matches = this.rule.matches(), len = matches.length; i < len; i++) {
+          var match = matches[i];
+          if(match.match(this.peek, this.code, this.index)) {
+            var token = new Token(match.tokenType(), match.content(), match.val()),
+              error = match.error(),
+              matchLen = match.content().length;
+            if(token.type() == Token.ID && this.rule.keyWords().hasOwnProperty(token.content())) {
+              token.type(Token.KEYWORD);
+            }
+            temp.push(token);
+            this.tokenList.push(token);
+            this.index += matchLen - 1;
+            var n = character.count(token.val(), character.LINE);
+            count += n;
+            this.totalLine += n;
+            if(n) {
+              var i = match.content().indexOf(character.LINE),
+                j = match.content().lastIndexOf(character.LINE);
+              this.colMax = Math.max(this.colMax, this.colNum + i);
+              this.colNum = match.content().length - j;
+            }
+            else {
+              this.colNum += matchLen;
+            }
+            this.colMax = Math.max(this.colMax, this.colNum);
+            if(error) {
+              this.error(error, this.code.slice(this.index - matchLen, this.index));
+            }
+            //支持perl正则需判断关键字、圆括号对除号语义的影响
+            if(perlReg && match.perlReg() != Lexer.IGNORE) {
+              if(match.perlReg() == Lexer.SPECIAL) {
+                this.isReg = match.special();
               }
-              temp.push(token);
-              this.tokenList.push(token);
-              this.index += matchLen - 1;
-              var n = character.count(token.val(), character.LINE);
-              count += n;
-              this.totalLine += n;
-              if(n) {
-                var i = match.content().indexOf(character.LINE),
-                  j = match.content().lastIndexOf(character.LINE);
-                this.colMax = Math.max(this.colMax, this.colNum + i);
-                this.colNum = match.content().length - j;
-              }
               else {
-                this.colNum += matchLen;
+                this.isReg = match.perlReg();
               }
-              this.colMax = Math.max(this.colMax, this.colNum);
-              if(error) {
-                this.error(error, this.code.slice(this.index - matchLen, this.index));
+              if(this.peek == character.LEFT_PARENTHESE) {
+                this.parentheseStack.push(this.parentheseState);
+                this.parentheseState = false;
               }
-              //支持perl正则需判断关键字、圆括号对除号语义的影响
-              if(perlReg && match.perlReg() != Lexer.IGNORE) {
-                if(match.perlReg() == Lexer.SPECIAL) {
-                  this.isReg = match.special();
-                }
-                else {
-                  this.isReg = match.perlReg();
-                }
-                if(this.peek == character.LEFT_PARENTHESE) {
-                  this.parentheseStack.push(this.parentheseState);
-                  this.parentheseState = false;
-                }
-                else if(this.peek == character.RIGHT_PARENTHESE) {
-                  this.isReg = this.parentheseStack.pop() ? Lexer.IS_REG : Lexer.NOT_REG;
-                }
-                else {
-                  this.parentheseState = match.parenthese();
-                }
+              else if(this.peek == character.RIGHT_PARENTHESE) {
+                this.isReg = this.parentheseStack.pop() ? Lexer.IS_REG : Lexer.NOT_REG;
               }
-              continue outer;
+              else {
+                this.parentheseState = match.parenthese();
+              }
             }
+            continue outer;
           }
-          //如果有未匹配的，说明规则不完整，加入other类型并抛出警告
-          this.error('unknow token');
         }
+        //如果有未匹配的，说明规则不完整，加入other类型并抛出警告
+        this.error('unknow token');
       }
-      return this;
-    },
-    readch: function() {
-      this.peek = this.code.charAt(this.index++);
-    },
-    dealReg: function(temp, length) {
-      var lastIndex = this.index - 1;
-      var res = false;
-      outer:
-      do {
-        this.readch();
-        if(this.peek == character.LINE) {
-          break;
-        }
-        else if(this.peek == character.BACK_SLASH) {
-          this.index++;
-        }
-        else if(this.peek == character.LEFT_BRACKET) {
-          do {
-            this.readch();
-            if(this.peek == character.LINE) {
+    }
+    return this;
+  },
+  readch: function() {
+    this.peek = this.code.charAt(this.index++);
+  },
+  dealReg: function(temp, length) {
+    var lastIndex = this.index - 1;
+    var res = false;
+    outer:
+    do {
+      this.readch();
+      if(this.peek == character.LINE) {
+        break;
+      }
+      else if(this.peek == character.BACK_SLASH) {
+        this.index++;
+      }
+      else if(this.peek == character.LEFT_BRACKET) {
+        do {
+          this.readch();
+          if(this.peek == character.LINE) {
+            break outer;
+          }
+          else if(this.peek == character.BACK_SLASH) {
+            this.index++;
+          }
+          else if(this.peek == character.RIGHT_BRACKET) {
+            continue outer;
+          }
+        } while(this.index < length);
+      }
+      else if(this.peek == character.SLASH) {
+        res = true;
+        var hash = {};
+        var flag = {
+          'g': true,
+          'i': true,
+          'm': true,
+          'y': true
+        };
+        //正则的flag中有gimy4种，大小写敏感且不能重复
+        do {
+          this.readch();
+          if(character.isLetter(this.peek)) {
+            if(hash.hasOwnProperty(this.peek) || !flag.hasOwnProperty(this.peek)) {
+              this.error('SyntaxError: invalid regular expression flag ' + this.peek, this.code.slice(lastIndex, this.index));
               break outer;
             }
-            else if(this.peek == character.BACK_SLASH) {
-              this.index++;
-            }
-            else if(this.peek == character.RIGHT_BRACKET) {
-              continue outer;
-            }
-          } while(this.index < length);
-        }
-        else if(this.peek == character.SLASH) {
-          res = true;
-          var hash = {};
-          var flag = {
-            'g': true,
-            'i': true,
-            'm': true,
-            'y': true
-          };
-          //正则的flag中有gimy4种，大小写敏感且不能重复
-          do {
-            this.readch();
-            if(character.isLetter(this.peek)) {
-              if(hash.hasOwnProperty(this.peek) || !flag.hasOwnProperty(this.peek)) {
-                this.error('SyntaxError: invalid regular expression flag ' + this.peek, this.code.slice(lastIndex, this.index));
-                break outer;
-              }
-              hash[this.peek] = true;
-            }
-            else {
-              break outer;
-            }
-          } while(this.index <= length);
-        }
-      } while(this.index < length);
-      if(!res) {
-        this.error('SyntaxError: unterminated regular expression literal', this.code.slice(lastIndex, this.index - 1));
+            hash[this.peek] = true;
+          }
+          else {
+            break outer;
+          }
+        } while(this.index <= length);
       }
-      var token = new Token(Token.REG, this.code.slice(lastIndex, --this.index));
-      temp.push(token);
-      this.tokenList.push(token);
-      this.colNum += this.index - lastIndex;
-      this.colMax = Math.max(this.colMax, this.colNum);
-      return this;
-    },
-    cache: function(i) {
-      if(!character.isUndefined(i) && i !== null) {
-        this.cacheLine = i;
+    } while(this.index < length);
+    if(!res) {
+      this.error('SyntaxError: unterminated regular expression literal', this.code.slice(lastIndex, this.index - 1));
+    }
+    var token = new Token(Token.REG, this.code.slice(lastIndex, --this.index));
+    temp.push(token);
+    this.tokenList.push(token);
+    this.colNum += this.index - lastIndex;
+    this.colMax = Math.max(this.colMax, this.colNum);
+    return this;
+  },
+  cache: function(i) {
+    if(!character.isUndefined(i) && i !== null) {
+      this.cacheLine = i;
+    }
+    return this.cacheLine;
+  },
+  finish: function() {
+    return this.index >= this.code.length;
+  },
+  line: function() {
+    return this.totalLine;
+  },
+  col: function() {
+    return this.colMax;
+  },
+  error: function(s, str) {
+    if(character.isUndefined(str)) {
+      str = this.code.substr(this.index - 1, 20);
+    }
+    if(Lexer.mode() === Lexer.STRICT) {
+      throw new Error(s + ', line ' + this.line() + ' col ' + this.colNum + '\n' + str);
+    }
+    else if(Lexer.mode() === Lexer.LOOSE && window.console) {
+      if(console.warn) {
+        console.warn(s + ', line ' + this.line() + ' col ' + this.colNum + '\n' + str);
       }
-      return this.cacheLine;
-    },
-    finish: function() {
-      return this.index >= this.code.length;
-    },
-    line: function() {
-      return this.totalLine;
-    },
-    col: function() {
-      return this.colMax;
-    },
-    error: function(s, str) {
-      if(character.isUndefined(str)) {
-        str = this.code.substr(this.index - 1, 20);
+      else if(console.error) {
+        console.error(s + ', line ' + this.line() + ' col ' + this.colNum + '\n' + str);
       }
-      if(Lexer.mode() === Lexer.STRICT) {
-        throw new Error(s + ', line ' + this.line() + ' col ' + this.colNum + '\n' + str);
+      else if(console.log) {
+        console.log(s + ', line ' + this.line() + ' col ' + this.colNum + '\n' + str);
       }
-      else if(Lexer.mode() === Lexer.LOOSE && window.console) {
-        if(console.warn) {
-          console.warn(s + ', line ' + this.line() + ' col ' + this.colNum + '\n' + str);
-        }
-        else if(console.error) {
-          console.error(s + ', line ' + this.line() + ' col ' + this.colNum + '\n' + str);
-        }
-        else if(console.log) {
-          console.log(s + ', line ' + this.line() + ' col ' + this.colNum + '\n' + str);
-        }
-      }
-      return this;
-    },
-    init: function() {
-      this.code = ''; //要解析的代码
-      this.peek = ''; //向前看字符
-      this.index = 0; //向前看字符字符索引
-      this.isReg = Lexer.IS_REG; //当前/是否是perl风格正则表达式
-      this.tokenList = []; //结果的token列表
-      this.parentheseState = false; //(开始时标记之前终结符是否为if/for/while等关键字
-      this.parentheseStack = []; //圆括号深度记录当前是否为if/for/while等语句内部
-      this.cacheLine = 0; //行缓存值
-      this.totalLine = 1; //总行数
-      this.colNum = 0; //列
-      this.colMax = 0; //最大列数
     }
-  }).statics({
-    IGNORE: 0,
-    IS_REG: 1,
-    NOT_REG: 2,
-    SPECIAL: 3,
-    STRICT: 0,
-    LOOSE: 1,
-    mode: function(i) {
-      if(!character.isUndefined(i)) {
-        cmode = i;
-      }
-      return cmode;
+    return this;
+  },
+  init: function() {
+    this.code = ''; //要解析的代码
+    this.peek = ''; //向前看字符
+    this.index = 0; //向前看字符字符索引
+    this.isReg = Lexer.IS_REG; //当前/是否是perl风格正则表达式
+    this.tokenList = []; //结果的token列表
+    this.parentheseState = false; //(开始时标记之前终结符是否为if/for/while等关键字
+    this.parentheseStack = []; //圆括号深度记录当前是否为if/for/while等语句内部
+    this.cacheLine = 0; //行缓存值
+    this.totalLine = 1; //总行数
+    this.colNum = 0; //列
+    this.colMax = 0; //最大列数
+  }
+}).statics({
+  IGNORE: 0,
+  IS_REG: 1,
+  NOT_REG: 2,
+  SPECIAL: 3,
+  STRICT: 0,
+  LOOSE: 1,
+  mode: function(i) {
+    if(!character.isUndefined(i)) {
+      cmode = i;
     }
-  }),
-  cmode = Lexer.STRICT;
+    return cmode;
+  }
+});
+var cmode = Lexer.STRICT;
 module.exports = Lexer;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Lines of code

25359

increased by0.02%

Number of medium supply chain risk alerts

4

decreased by-20%

Worsened metrics

Total package byte prevSize

940983

decreased by-0.04%

No dependency changes