selector can accept python None, and can accept boolean values

Author: AugustijnVrolijk

bidsbuilder/interpreter/selectors.py

@@ -114,6 +114,7 @@ class SelectorParser():
                 ('ADD_OP',   r'[+\-]'),                             # Additive operators
                 ('MULT_OP',  r'[*/]'),                              # Multiplicative operators
                 ('LOGIC_OP', r'&&|\|\|'),                           # logic Operators
+                ('BOOL',     r'false|true'),                               # Bool values
                 ('ID',       r'[A-Za-z_]\w*'),                      # Identifiers
                 ('LPAREN',   r'\('),                                # Left paren
                 ('RPAREN',   r'\)'),                                # Right paren
@@ -404,12 +405,12 @@ def primary(self):
 
         if cur.kind == "NUMBER":
             val = self.match("NUMBER")
-            return int(val)
+            return selectorFunc(val=int(val))
 
         elif cur.kind == "STRING":
             val = self.match("STRING")
             #need to trim outer " " or ' '
-            return val[1:-1]
+            return selectorFunc(val=val[1:-1])
 
         elif cur.kind == "LPAREN":
             self.match("LPAREN")
@@ -432,6 +433,13 @@ def primary(self):
                                 requires_input=False,
                                 is_callable=True)
 
+        elif cur.kind == "BOOL":
+            self.match("BOOL")
+            if cur.val == "true":
+                return selectorFunc(val=True)
+            elif cur.val == "false":
+                return selectorFunc(val=False)
+            
         elif cur.kind == "ID":
             self.match("ID")
             if cur.val in self.FIELDS_MAP.keys():
@@ -457,9 +465,10 @@ def primary(self):
                                     requires_input=False,
                                     is_callable=True)
 
-            elif cur.val == "null":
-                return None
+            elif cur.val == "null":           
+                return selectorFunc(val=None)
             else:
+                raise ValueError(f"unrecognised identifier for {cur.val}")
                 return cur.val
 
         else:

testing/testSchema.py

@@ -1,25 +1,34 @@
 from bidsbuilder.util.schema import parse_load_schema
-from bidsbuilder.interpreter.selectors import selectorHook
+from bidsbuilder.interpreter.selectors import selectorHook, SelectorParser
+
 schema = parse_load_schema(debug=True)
 
 tests = schema.meta.expression_tests
-
+passed = 0
+failed = 0
+exception = 0
 #print(tests)
 for i, pair in enumerate(tests):
     expression = pair["expression"]
     result = pair["result"]
-    print(type(result))
-    print(f"pair: {pair}")
-    #print(f"expresson: {expression}")
-    #print(f"result: {result}")
+    print(f"pair {i}: {pair}")
 
-    test = selectorHook.from_raw(expression)
-    #tRes = selectorHook.from_raw(result)
-    print(f"\n{test}")
+    func = SelectorParser.from_raw(expression).parse()
+    func.evaluate_static_nodes()
+    t_result = SelectorParser.from_raw(result).parse()
+    t_result.evaluate_static_nodes()
     try:
-        res = test()
-        print(res)
+        if func() == t_result():
+            print("test pass")
+            passed += 1
+        else:
+            print("test failed")
+            print(func)
+            failed += 1
     except Exception as e:
-        print(e)
-    breakpoint()
+        print("test exception")
+        exception += 1
 
+print(f"passed: {passed}")
+print(f"failed: {failed}")
+print(f"errors: {exception}")