Changes between Version 8 and Version 9 of Taskforces/FCS/FCS-QL

Timestamp:

11/02/15 15:28:00 (9 years ago)

Author:

Leif-Jöran

Comment:

Integrating 2v2 and 3v2 and 11v2 and 12v2 from Peter B's suggestion to remove structural ambiguity

Taskforces/FCS/FCS-QL

@@ -14 +14 @@
                             | main-query quantifier         /* quatification */          
 
+ [2.11] main-query           ::= simple-query
+                            | simple-query "|" main-query     /* or */
+                            | simple-query main-query         /* sequence */
+                            | simple-query quantifier         /* quatification */
+        
  [3] simple-query         ::= implicit-query
-                            | segment-query      
+                            | segment-query     
+ 
+ [3.11] simple-query         ::= '(' main_query ')'
+                            | implicit-query
+                            | segment-query     
  
  [4] implicit-query       ::= flagged-regexp     
@@ -42 +51 @@
                             | "!" expression                /* not */    
 
+[11.11] expression           ::= basic-expression
+                            | expression "|" expression     /* or */
+                            | expression "&" expression     /* and */
+                                
+
 [12] basic-expression     ::= attribute operator flagged-regexp          
+
+[12.11] basic-expression     ::= '(' expression ')'         /* grouping */
+                            | "!" expression                /* not */
+                            | attribute operator flagged-regexp 
 
 [13] operator             ::= "="                           /* equals */