Merge branch 'dev' into canary

Author: Francesca-Bit

lib/woql.js

@@ -440,14 +440,6 @@ WOQL.trim = function(inputStr, resultVarName) {
     return new WOQLQuery().trim(inputStr, resultVarName)
 }
 
-/**
- * Evaluates the passed arithmetic expression and generates or matches the result value
- * @param {object| WOQLQuery | string} arithExp - query or JSON-LD representing the query
- * @param {string} resultVarName - output variable
- * @returns {WOQLQuery} WOQLQuery
- */
-WOQL.eval = WOQL.evaluate
-
 /**
  *
  * Evaluates the passed arithmetic expression and generates or matches the result value
@@ -461,6 +453,15 @@ WOQL.evaluate = function(arithExp, resultVarName) {
     return new WOQLQuery().eval(arithExp, resultVarName)
 }
 
+/**
+ * Evaluates the passed arithmetic expression and generates or matches the result value
+ * @param {object| WOQLQuery | string} arithExp - query or JSON-LD representing the query
+ * @param {string} resultVarName - output variable
+ * @returns {WOQLQuery} WOQLQuery
+ */
+
+WOQL.eval = WOQL.evaluate
+
 /**
  *
  * Adds the numbers together