SPARQL.js uses functionCall for functions.

Author: RubenVerborgh

lib/util/SparqlExpressionEvaluator.js

@@ -53,7 +53,8 @@ evaluators = {
   // Evaluates an operation
   operation: function (expression) {
     // Find the operator and check the number of arguments matches the expression
-    var operatorName = expression.operator, operator = operators[operatorName];
+    var operatorName = expression.operator || expression.function,
+        operator = operators[operatorName];
     if (!operator)
       throw new UnsupportedOperatorError(operatorName);
     if (operator.length !== expression.args.length)
@@ -111,6 +112,7 @@ evaluators = {
     })(operator, argumentExpressions);
   },
 };
+evaluators.functionCall = evaluators.operation;
 
 // Operators for each of the operator types
 operators = {
@@ -202,12 +204,12 @@ UnsupportedExpressionError = createErrorType('UnsupportedExpressionError', funct
 });
 
 UnsupportedOperatorError = createErrorType('UnsupportedExpressionError', function (operatorName) {
-  this.message = 'Unsupported operator: ' + operatorName.toUpperCase() + '.';
+  this.message = 'Unsupported operator: ' + operatorName + '.';
 });
 
 InvalidArgumentsNumberError = createErrorType('InvalidArgumentsNumberError',
 function (operatorName, actualNumber, expectedNumber) {
-  this.message = 'Invalid number of arguments for ' + operatorName.toUpperCase() + ': ' +
+  this.message = 'Invalid number of arguments for ' + operatorName + ': ' +
                  actualNumber + ' (expected: ' + expectedNumber + ').';
 });
 

test/util/SparqlExpressionEvaluator-test.js

@@ -411,9 +411,9 @@ describe('SparqlExpressionEvaluator', function () {
       });
     });
 
-    describe('of the xsd:integer operator', function () {
+    describe('of the xsd:integer function', function () {
       var evaluator = SparqlExpressionEvaluator({
-        type: 'operation',
+        type: 'functionCall',
         operator: 'http://www.w3.org/2001/XMLSchema#integer',
         args: ['"123.67"'],
       });
@@ -423,9 +423,9 @@ describe('SparqlExpressionEvaluator', function () {
       });
     });
 
-    describe('of the xsd:double operator', function () {
+    describe('of the xsd:double function', function () {
       var evaluator = SparqlExpressionEvaluator({
-        type: 'operation',
+        type: 'functionCall',
         operator: 'http://www.w3.org/2001/XMLSchema#double',
         args: ['"123"'],
       });
@@ -471,14 +471,14 @@ describe('SparqlExpressionEvaluator', function () {
     describe('of an unsupported operator', function () {
       it('should throw an error', function () {
         (function () { SparqlExpressionEvaluator({ type: 'operation', operator: 'invalid' }); })
-          .should.throw('Unsupported operator: INVALID.');
+          .should.throw('Unsupported operator: invalid.');
       });
     });
 
     describe('of an operator with an incorrect number of arguments', function () {
       it('should throw an error', function () {
         (function () { SparqlExpressionEvaluator({ type: 'operation', operator: 'regex', args: [1] }); })
-          .should.throw('Invalid number of arguments for REGEX: 1 (expected: 2).');
+          .should.throw('Invalid number of arguments for regex: 1 (expected: 2).');
       });
     });