mr-parser 0.2.0 → 0.2.2

package/lib/Lexer.js

@@ -62,13 +62,6 @@ var DELIMITERS = {
   '>>': true
 }
 
-// var NAMED_DELIMETERS = {
-//   'mod': true,
-//   'and': true,
-//   'or': true,
-//   'xor': true
-// }
-
 // helpers
 
 function isDigit (c) {

package/lib/Parser.js

@@ -52,7 +52,7 @@ var BlockNode = require('./node/BlockNode')
  *                  | multiplicative (`+` | `-`) additive
  *
  * multiplicative   : unary
- *                  | unary (`*` | `/` | `%`) multiplicative
+ *                  | unary (`*` | `/` | `%`) unary
  *                  | unary symbol
  *
  * unary            : pow
@@ -248,10 +248,9 @@ Parser.prototype.shift = function () {
 
 Parser.prototype.additive = function () {
   var left = this.multiplicative()
-  if (this.peek('+', '-')) {
+  while (this.peek('+', '-')) {
     var op = this.consume()
-    var right = this.additive()
-    return new OperatorNode(op.value, [left, right])
+    left = new OperatorNode(op.value, [left, this.multiplicative()])
   }
   return left
 }
@@ -259,10 +258,9 @@ Parser.prototype.additive = function () {
 Parser.prototype.multiplicative = function () {
   var op, right
   var left = this.unary()
-  if (this.peek('*', '/', '%')) {
+  while (this.peek('*', '/', '%')) {
     op = this.consume()
-    right = this.multiplicative()
-    return new OperatorNode(op.value, [left, right])
+    left = new OperatorNode(op.value, [left, this.unary()])
   }
 
   // implicit multiplication

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "mr-parser",
-  "version": "0.2.0",
-  "description": "parse mathematical expressions into an ast",
-  "bugs": "https://github.com/maurizzzio/mr-parser/issues",
+  "version": "0.2.2",
+  "description": "parses mathematical expressions and outputs an AST that represents the expression",
+  "bugs": "https://github.com/mauriciopoppe/mr-parser/issues",
   "license": "MIT",
   "main": "index.js",
-  "author": "Mauricio Poppe <mauricio.poppe@gmail.com>",
+  "author": "Mauricio Poppe (https://mauriciopoppe.com)",
   "files": [
     "index.js",
     "lib",
@@ -13,7 +13,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/maurizzzio/mr-parser"
+    "url": "https://github.com/mauriciopoppe/mr-parser"
   },
   "keywords": [
     "mr-parser",
@@ -36,7 +36,7 @@
     "istanbul": "istanbul cover test/index.js",
     "lint": "standard",
     "doctoc": "doctoc .",
-    "test": "node test/index.js | tap-dot",
+    "test": "node test/index.js | tap-spec",
     "test:watch": "gaze 'npm test' 'test/**/*.js' 'lib/**/*.js' 'index.js'",
     "start": "npm run test:watch"
   }