Merge pull request #27 from OpenNMS/jira/NMS-14779

NMS-14779 Fix POW issue

Author: dherdt

dist/backshift.js

@@ -585,6 +585,16 @@ Backshift.Utilities.RpnToJexlConverter = Backshift.Class.create({
       };
     };
 
+    var funcOpReverse = function (op, numArgs) {
+      return function (stack) {
+        var i, ret = ")";
+        for (i=0; i < numArgs; i++) {
+          ret = ',' + stack.pop() + ret;
+        }
+        return op + '(' + ret.substring(1, ret.length);
+      };
+    };
+
     var ifOp = function (stack) {
       var c = stack.pop();
       var b = stack.pop();
@@ -680,6 +690,7 @@ Backshift.Utilities.RpnToJexlConverter = Backshift.Class.create({
     this.operators['ISINF'] = infOp;
     this.operators['LIMIT'] = limitOp;
     this.operators['ADDNAN'] = addNanOp;
+    this.operators['POW'] = funcOpReverse('math:pow', 2);
     this.operators['SIN'] = funcOp('math:sin', 1);
     this.operators['COS'] = funcOp('math:cos', 1);
     this.operators['LOG'] = funcOp('math:log', 1);

dist/backshift.min.js

@@ -399,6 +399,16 @@ Backshift.Utilities.RpnToJexlConverter = Backshift.Class.create({
       };
     };
 
+    var funcOpReverse = function (op, numArgs) {
+      return function (stack) {
+        var i, ret = ")";
+        for (i=0; i < numArgs; i++) {
+          ret = ',' + stack.pop() + ret;
+        }
+        return op + '(' + ret.substring(1, ret.length);
+      };
+    };
+
     var ifOp = function (stack) {
       var c = stack.pop();
       var b = stack.pop();
@@ -494,6 +504,7 @@ Backshift.Utilities.RpnToJexlConverter = Backshift.Class.create({
     this.operators['ISINF'] = infOp;
     this.operators['LIMIT'] = limitOp;
     this.operators['ADDNAN'] = addNanOp;
+    this.operators['POW'] = funcOpReverse('math:pow', 2);
     this.operators['SIN'] = funcOp('math:sin', 1);
     this.operators['COS'] = funcOp('math:cos', 1);
     this.operators['LOG'] = funcOp('math:log', 1);

dist/backshift.onms.js

@@ -1,6 +1,6 @@
 {
   "name": "backshift",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/OpenNMS/backshift.git"

dist/backshift.onms.min.js

@@ -32,6 +32,16 @@ Backshift.Utilities.RpnToJexlConverter = Backshift.Class.create({
       };
     };
 
+    var funcOpReverse = function (op, numArgs) {
+      return function (stack) {
+        var i, ret = ")";
+        for (i=0; i < numArgs; i++) {
+          ret = ',' + stack.pop() + ret;
+        }
+        return op + '(' + ret.substring(1, ret.length);
+      };
+    };
+
     var ifOp = function (stack) {
       var c = stack.pop();
       var b = stack.pop();
@@ -127,6 +137,7 @@ Backshift.Utilities.RpnToJexlConverter = Backshift.Class.create({
     this.operators['ISINF'] = infOp;
     this.operators['LIMIT'] = limitOp;
     this.operators['ADDNAN'] = addNanOp;
+    this.operators['POW'] = funcOpReverse('math:pow', 2);
     this.operators['SIN'] = funcOp('math:sin', 1);
     this.operators['COS'] = funcOp('math:cos', 1);
     this.operators['LOG'] = funcOp('math:log', 1);

package.json

@@ -51,6 +51,7 @@ describe('Backshift.Utilities.RpnToJexlConverter', function () {
       checkRpnConversion("X,LOG", "math:log(X)");
       checkRpnConversion("X,EXP", "math:exp(X)");
       checkRpnConversion("X,SQRT", "math:sqrt(X)");
+      checkRpnConversion("X,Y,POW", "math:pow(X,Y)");
       checkRpnConversion("X,ATAN", "math:atan(X)");
       checkRpnConversion("Y,X,ATAN2", "math:atan2(Y,X)");
       checkRpnConversion("Y,X,ATAN2,RAD2DEG", "math:toDegrees(math:atan2(Y,X))");