glayzzle#50 - cleanup src/*

Author: ichiriac

.eslintrc.js

@@ -9,7 +9,8 @@ module.exports = {
   env: {
     browser: true,
     node: true,
-    mocha: true
+    mocha: true,
+    es6: true
   },
   rules: {
     "prettier/prettier": "error"

package.json

@@ -4,7 +4,7 @@
   "description": "Parse PHP code and returns its AST",
   "main": "src/index.js",
   "scripts": {
-    "lint": "eslint src/**/*.js",
+    "lint": "eslint src/*.js src/**/*.js",
     "test": "npm run lint && node node_modules/mocha/bin/mocha test --stack-size=5000",
     "cover": "node --stack-size=5000 node_modules/istanbul/lib/cli.js cover node_modules/mocha/bin/_mocha"
   },
@@ -27,13 +27,6 @@
   ],
   "author": "Ioan CHIRIAC",
   "license": "BSD-3-Clause",
-  "xo": {
-    "space": 2,
-    "envs": [
-      "node",
-      "mocha"
-    ]
-  },
   "devDependencies": {
     "coveralls": "^2.11.15",
     "eslint": "^4.14.0",

src/ast.js

@@ -126,7 +126,7 @@ AST.prototype.position = function(parser) {
 
 // operators in ascending order of precedence
 AST.precedence = {};
-var binOperatorsPrecedence = [
+[
   ["or"],
   ["xor"],
   ["and"],
@@ -158,13 +158,13 @@ var binOperatorsPrecedence = [
  * Check and fix precence, by default using right
  */
 AST.prototype.resolvePrecedence = function(result) {
-  var buffer;
+  let buffer, lLevel, rLevel;
   // handling precendence
   if (result.kind === "bin") {
     if (result.right) {
       if (result.right.kind === "bin") {
-        var lLevel = AST.precedence[result.type];
-        var rLevel = AST.precedence[result.right.type];
+        lLevel = AST.precedence[result.type];
+        rLevel = AST.precedence[result.right.type];
         if (lLevel && rLevel && rLevel <= lLevel) {
           // https://github.com/glayzzle/php-parser/issues/79
           // shift precedence
@@ -174,8 +174,8 @@ AST.prototype.resolvePrecedence = function(result) {
           result = buffer;
         }
       } else if (result.right.kind === "retif") {
-        var lLevel = AST.precedence[result.type];
-        var rLevel = AST.precedence["?"];
+        lLevel = AST.precedence[result.type];
+        rLevel = AST.precedence["?"];
         if (lLevel && rLevel && rLevel <= lLevel) {
           buffer = result.right;
           result.right = result.right.test;
@@ -211,8 +211,8 @@ AST.prototype.resolvePrecedence = function(result) {
   } else if (result.kind === "assign") {
     // https://github.com/glayzzle/php-parser/issues/81
     if (result.right && result.right.kind === "bin") {
-      var lLevel = AST.precedence["="];
-      var rLevel = AST.precedence[result.right.type];
+      lLevel = AST.precedence["="];
+      rLevel = AST.precedence[result.right.type];
       // only shifts with and, xor, or
       if (lLevel && rLevel && rLevel < lLevel) {
         buffer = result.right;

src/index.js

@@ -101,7 +101,7 @@ var getStringBuffer = function(buffer) {
  * @param {Object} options
  * @return {Engine}
  * @private
-*/
+ */
 engine.create = function(options) {
   return new engine(options);
 };

src/lexer.js

@@ -156,7 +156,7 @@ lexer.prototype.setInput = function(input) {
 /**
  * consumes and returns one char from the input
  */
-lexer.prototype.input = function(size) {
+lexer.prototype.input = function() {
   var ch = this._input[this.offset];
   if (!ch) return "";
   this.yytext += ch;
@@ -430,7 +430,8 @@ lexer.prototype.next = function() {
         this.yytext +
         '"'
     );
-    console.log(e.stack);
+    // eslint-disable-next-line no-console
+    console.error(e.stack);
   }
   return token;
 };

src/parser.js

@@ -300,8 +300,10 @@ parser.prototype.raiseError = function(message, msgExpect, expect, token) {
  * handling errors
  */
 parser.prototype.error = function(expect) {
-  var msg = "Parse Error : syntax error";
-  token = this.getTokenName(this.token);
+  let msg = "Parse Error : syntax error";
+  let token = this.getTokenName(this.token);
+  let msgExpect = "";
+
   if (this.token !== this.EOF) {
     if (isNumber(this.token)) {
       var symbol = this.text();
@@ -312,14 +314,12 @@ parser.prototype.error = function(expect) {
     }
     msg += ", unexpected " + token;
   }
-  var msgExpect = "";
   if (expect && !Array.isArray(expect)) {
     if (isNumber(expect) || expect.length === 1) {
       msgExpect = ", expecting " + this.getTokenName(expect);
     }
     msg += msgExpect;
   }
-  this.token !== this.EOF;
   return this.raiseError(msg, msgExpect, expect, token);
 };
 
@@ -372,7 +372,7 @@ parser.prototype.showlog = function() {
       break;
     }
   }
-
+  // eslint-disable-next-line no-console
   console.log(
     "Line " +
       this.lexer.yylloc.first_line +

src/parser/array.js

@@ -3,8 +3,8 @@
  * @authors https://github.com/glayzzle/php-parser/graphs/contributors
  * @url http://glayzzle.com
  */
-var ArrayExpr = "array";
-var ArrayEntry = "entry";
+const ArrayExpr = "array";
+const ArrayEntry = "entry";
 
 module.exports = {
   /**