add support for complex multiplicative expressions

fluree · May 31, 2024 · 7977d64 · 7977d64
1 parent e4f7c9c
commit 7977d64
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/src/clj/fluree/db/query/sparql/translator.cljc b/src/clj/fluree/db/query/sparql/translator.cljc
@@ -120,8 +120,22 @@
                     {:status 400 :error :db/invalid-query}))))
 
 (defmethod parse-term :NumericLiteral
-  [[_ num-str]]
-  (read-string num-str))
+  ;; NumericLiteral   ::=   NumericLiteralUnsigned WS | NumericLiteralPositive WS | NumericLiteralNegative WS
+  ;; <NumericLiteralUnsigned>   ::=   INTEGER | DECIMAL | DOUBLE
+  ;; <NumericLiteralPositive>   ::=   INTEGER_POSITIVE | DECIMAL_POSITIVE | DOUBLE_POSITIVE
+  ;; <NumericLiteralNegative>   ::=   INTEGER_NEGATIVE | DECIMAL_NEGATIVE | DOUBLE_NEGATIVE
+  ;; <INTEGER_POSITIVE>   ::=   '+' INTEGER
+  ;; <DECIMAL_POSITIVE>   ::=   '+' DECIMAL
+  ;; <DOUBLE_POSITIVE>    ::=   '+' DOUBLE
+  ;; <INTEGER_NEGATIVE>   ::=   '-' INTEGER
+  ;; <DECIMAL_NEGATIVE>   ::=   '-' DECIMAL
+  ;; <DOUBLE_NEGATIVE>    ::=   '-' DOUBLE
+  ;; <INTEGER>    ::=   #"[0-9]+"
+  ;; <DECIMAL>    ::=  #"[0-9]*\.[0-9]*"
+  ;; <DOUBLE>   ::=   #"[0-9]+\.[0-9]*|(\.[0-9]+)|([0-9]+)" EXPONENT
+  ;; EXPONENT   ::=   #"[eE][+-]?[0-9]+"
+  [[_ sign num-str]]
+  (read-string (str sign num-str)))
 
 (defmethod parse-term :MultiplicativeExpression
   ;; MultiplicativeExpression ::= UnaryExpression ( '*' UnaryExpression | '/' UnaryExpression )*
@@ -130,8 +144,16 @@
   ;; | '-' PrimaryExpression
   ;; | PrimaryExpression
   ;; <PrimaryExpression> ::= BrackettedExpression | BuiltInCall | iriOrFunction | RDFLiteral | NumericLiteral | BooleanLiteral | Var
-  [[_ & expression]]
-  (str/join " " (mapv parse-term expression)))
+  [[_ & [expr0 & [op1 expr1 & exprs]]]]
+  (if op1
+    ;; we need to recursively compose expressions
+    (loop [[op expr & r] exprs
+           result  (str "(" op1 " " (parse-term expr0) " " (parse-term expr1) ")")]
+      (if (and op expr)
+        (recur r (str "(" op " " result " " (parse-term expr) ")"))
+        result))
+    ;; A single UnaryExpression doesn't need to be composed with anything else
+    (parse-term expr0)))
 
 (defmethod parse-term :NumericExpression
   ;; NumericExpression ::= WS AdditiveExpression WS

diff --git a/test/fluree/db/query/sparql_test.cljc b/test/fluree/db/query/sparql_test.cljc
@@ -242,14 +242,18 @@
       (is (= [[:bind "?handle" "dsanchez"]
               {"@id" "?person", "person:handle" "?handle"}]
              where)))
-    (let [query "SELECT ?person ?prefix ?foofix
+    (let [query "SELECT ?person ?prefix ?foofix ?num1
                  WHERE {BIND (SUBSTR(?handle, 4) AS ?prefix)
                         BIND (REPLACE(?prefix, \"abc\", \"FOO\") AS ?foofix)
-                        ?person person:handle ?handle.}"
+                        BIND (?age*4*3/-2*(-4/2) AS ?num1)
+                        ?person person:handle ?handle.
+                        ?person person:age ?age}"
           {:keys [where]} (sparql/->fql query)]
       (is (= [[:bind "?prefix" "(subStr ?handle 4)"]
               [:bind "?foofix" "(replace ?prefix \"abc\" \"FOO\")"]
-              {"@id" "?person", "person:handle" "?handle"}]
+              [:bind "?num1" "(* (/ (* (* ?age 4) 3) -2) (/ -4 2))"]
+              {"@id" "?person", "person:handle" "?handle"}
+              {"@id" "?person", "person:age" "?age"}]
              where)))))
 
 ;;TODO: not yet supported