EL Grammar improvements

Author: wolandscat

reader_common/src/main/antlr/ElParser.g4

@@ -181,70 +181,46 @@ elSimpleTerminal:
     ;
 
 //
-// TODO: Can't syntactically distinguish between a local or other variable id
-// and a property or constant reference.
+// TODO: Can't syntactically distinguish between a local variable
+//       and a property or constant reference.
 //
 elValueGenerator:
-      elBareRef
+      SYM_SELF
+    | elBareRef
     | elScopedFeatureRef
-    | typeRef
     ;
 
 //
 // An unscoped reference of some kind
+// Will map to EL_WRITABLE_VARIABLE or EL_PROPERTY_REF (unscoped)
 //
 elBareRef:
-      elBoundVariableId
-    | elStaticRef
-    | elLocalRef
+      elInstantiableRef
     | elFunctionCall
-    ;
-
-//
-// Static and constant feature refs, distinguished by the use of
-// initial capital in the id.
-// Will map to EL_READABLE_VARIABLE or EL_STATIC_REF (unscoped)
-//
-elStaticRef:
-      SYM_SELF
     | elConstantId
     ;
 
 //
-// Local writable reference, distinguished by use of initial lowercase id
-// Will map to EL_WRITABLE_VARIABLE or EL_PROPERTY_REF (unscoped)
+// Instantiable feature refs; may be the target of an assignment
 //
-elLocalRef:
+elInstantiableRef:
       SYM_RESULT
+    | elBoundVariableId
     | elLocalVariableId
     ;
 
+
 //
-// scoped feature references.
+// Scoped feature references. Has to have at least one scoping element, either a
+// class name in {} or else a baseRef name; then any number of bareRefs.
 // Will map to any EL_FEATURE_REF (scoped)
 //
-elScopedFeatureRef: elScoper elFeatureRef ;
+elScopedFeatureRef: elScoper elBareRef ;
 
-elScoper: ( typeRef '.' )? ( elBareRef '.' )* ;
-
-typeRef: '{' typeId '}' ;
+elScoper: ( '{' typeId '}' | elBareRef ) '.'  ( elBareRef '.' )* ;
 
 typeId: UC_ID ( '<' typeId ( ',' typeId )* '>' )? ;
 
-elFeatureRef:
-      elFunctionCall
-    | elInstantiableRef
-    ;
-
-//
-// Instantiable feature refs
-//
-elInstantiableRef:
-      elBoundVariableId
-    | elLocalVariableId
-    | elConstantId
-    ;
-
 //
 // A variable bound to a data source, lexical form '$xxxx'
 // TODO: analyse how a boundVariableId can be created as a built-in feature

…/test/resources/bel/fail/date_minimal.el …/test/resources/bel/pass/date_minimal.elreader_common/src/test/resources/bel/fail/date_minimal.el renamed to reader_common/src/test/resources/bel/pass/date_minimal.el reader_common/src/test/resources/bel/fail/date_minimal.el renamed to reader_common/src/test/resources/bel/pass/date_minimal.el

@@ -1,3 +1,3 @@
 path_systolic: exists /data[id2]/events[id3]/data[id4]/items[id5]/value/magnitude implies exists /data[id2]/events[id3]/data[id4]/items[id6]/value/magnitude
-must_exist: every $event in /data[id2]/events[id3] (exists $event/data[id4]/items[id5]/value/magnitude implies exists $event/data[id4]/items[id6]/value/magnitude)
-must_set_value: every $event in /data[id2]/events[id3] ($event/data[id4]/items[id5]/value/magnitude > 3 implies $event/data[id4]/items[id6]/value/magnitude = 6)
+must_exist: for_all $event in /data[id2]/events[id3] (exists $event/data[id4]/items[id5]/value/magnitude implies exists $event/data[id4]/items[id6]/value/magnitude)
+must_set_value: for_all $event in /data[id2]/events[id3] ($event/data[id4]/items[id5]/value/magnitude > 3 implies $event/data[id4]/items[id6]/value/magnitude = 6)