[r2005-03-14 20:05:53 by beppe] Added back boolean connective "or" as equivalente to "||" Not

restricted to select only.

Original author: beppe
Date: 2005-03-14 20:05:53+00:00

parser/parser.ml

@@ -216,7 +216,7 @@ EXTEND
 	| "if" | "then"	| "else"
 	| "transform" | "fun" | "in"
 	| "let" | "type" | "debug" | "include"
-        | "and" | "validate" | "schema" | "namespace" | "ref" | "alias"
+        | "and" | "or" | "validate" | "schema" | "namespace" | "ref" | "alias"
 	| "not" | "as" | "where" | "select" | "from"
 	]
 	-> a
@@ -273,7 +273,7 @@ EXTEND
 
     | 
     [ e1 = expr; op = ["+" | "-" | "@" ]; e2 = expr -> apply_op2 loc op e1 e2
-    | e1 = expr; "||"; e2 = expr -> exp loc (logical_or e1 e2)
+    | e1 = expr; ["||" | "or"]; e2 = expr -> exp loc (logical_or e1 e2)
     | e = expr; "\\"; l = [IDENT | keyword ] -> 
 	exp loc (RemoveField (e, label l)) 
     ]