standard

dominhhai · Jun 19, 2015 · 4c56f8f · 4c56f8f
1 parent 3712db3
commit 4c56f8f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/app.js b/app.js
@@ -38,8 +38,7 @@ function calcPrefix (exp) {
           args.push(o)
           o = stack.pop()
         }
-        var rst = Math[token.substr(postfixer.MATH_EP.length)].apply(null, args)
-        stack.push(rst)
+        stack.push(Math[token.substr(postfixer.MATH_EP.length)].apply(null, args))
       } else {
         stack.push(token)
       }
@@ -75,8 +74,7 @@ function calcPostfix (exp) {
           o = stack.pop()
         }
         args.reverse()
-        var rst = Math[token.substr(0, token.length - postfixer.MATH_EP.length)].apply(null, args)
-        stack.push(rst)
+        stack.push(Math[token.substr(0, token.length - postfixer.MATH_EP.length)].apply(null, args))
       } else {
         stack.push(token)
       }

diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
   },
   "scripts": {
     "start": "node cli.js",
+    "stop": "tape test/*.js | faucet",
     "test": "standard && tape test/*.js | faucet"
   },
   "repository": {

diff --git a/test/2-postfixer.js b/test/2-postfixer.js
@@ -28,3 +28,23 @@ test('infix to postfix test', function (t) {
 
   t.end()
 })
+
+test('func: infix to postfix test', function (t) {
+  t.equal(postfixer('abs(1 - 2)'), '. 1 2 - abs.')
+  // t.equal(postfixer('1 + 2 * 3'), '1 2 3 * +')
+  // t.equal(postfixer('(1 + 2) * 3'), '1 2 + 3 *')
+  // t.equal(postfixer('(abs[1] + 2) * 3 + E'), 'abs[1] 2 + 3 * E +')
+  // t.equal(postfixer('(PI     + 2) * 3 + E'), 'PI 2 + 3 * E +')
+  // t.equal(postfixer('(PI     + 2/ 10) * 3 + (E-19 )'), 'PI 2 10 / + 3 * E 19 - +')
+  // t.equal(postfixer('(1 + 2 - 3*(PI + 10))'), '1 2 + 3 PI 10 + * -')
+  //
+  // t.equal(postfixer('1 + (-2)'), '1 -2 +')
+  // t.equal(postfixer('-1 + 2 + -3'), '-1 2 + -3 +')
+  // t.equal(postfixer('1 + - 2'), '1 -2 +')
+  // t.equal(postfixer('-1 + - 2'), '-1 -2 +')
+  // t.equal(postfixer('-1 - -3'), '-1 -3 -')
+  // t.equal(postfixer('|-1| - -3'), '|-1| -3 -')
+  // t.equal(postfixer('abs[-1] - -3'), 'abs[-1] -3 -')
+
+  t.end()
+})