Manually defined signed_int class in filtertranformer and grammar for…

… length queries
Materials-Consortia · Mar 9, 2020 · b83c45c · b83c45c
1 parent ae7ccf1
commit b83c45c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/optimade/filtertransformers/mongo.py b/optimade/filtertransformers/mongo.py
@@ -190,6 +190,10 @@ def string(self, string):
         # string: ESCAPED_STRING
         return string.strip('"')
 
+    def signed_int(self, arg):
+        # signed_int : SIGNED_INT
+        return int(arg[0])
+
     def number(self, arg):
         # number: SIGNED_INT | SIGNED_FLOAT
         token = arg[0]

diff --git a/optimade/grammar/v0.10.1.lark b/optimade/grammar/v0.10.1.lark
@@ -49,7 +49,7 @@ set_op_rhs: HAS ( [ OPERATOR ] value
                  | ONLY value_list )
 
 // Note: support for [ OPERATOR ] is OPTIONAL
-length_op_rhs: LENGTH [ OPERATOR ] SIGNED_INT
+length_op_rhs: LENGTH [ OPERATOR ] signed_int
 
 set_zip_op_rhs: property_zip_addon HAS ( value_zip | ONLY value_zip_list | ALL value_zip_list | ANY value_zip_list )
 property_zip_addon: ":" property (":" property)*
@@ -63,6 +63,9 @@ string: ESCAPED_STRING
 // Number token syntax
 number: SIGNED_INT | SIGNED_FLOAT
 
+// Custom signed int
+signed_int: SIGNED_INT
+
 // Tokens
 
 // Boolean relations