[Commits] (twl) Upgrade query parser to alllow inevery

[commits at osafoundation.org]

Commit by: twl
Modified files:
internal/queryparser/Makefile 1.11 1.12
internal/queryparser/QueryParser.g 1.4 1.5

Log message:
Upgrade query parser to alllow inevery


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/queryparser/Makefile.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
http://cvs.osafoundation.org/index.cgi/internal/queryparser/QueryParser.g.diff?r1=text&tr1=1.4&r2=text&tr2=1.5

Index: internal/queryparser/QueryParser.g
diff -u internal/queryparser/QueryParser.g:1.4 internal/queryparser/QueryParser.g:1.5
--- internal/queryparser/QueryParser.g:1.4	Tue Aug 31 12:32:03 2004
+++ internal/queryparser/QueryParser.g	Thu Jan 27 14:50:12 2005
@@ -1,5 +1,5 @@
-__revision__  = "$Revision: 1.4 $"
-__date__      = "$Date: 2004/08/31 19:32:03 $"
+__revision__  = "$Revision: 1.5 $"
+__date__      = "$Date: 2005/01/27 22:50:12 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Founation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -56,13 +56,13 @@
     rule difference_stmt: 'difference' "\(" stmt {{ stmt1 = stmt }} ',' stmt {{ stmt2=stmt }}  "\)"
         {{ return [ 'difference', stmt1, stmt2] }}
 
-    rule for_stmt: 'for' ID 'in' 
+    rule for_stmt: 'for' ID ( 'in' {{ recursive = False }} | 'inevery'  {{ recursive = True }} )
                    ( name_expr 'where' and_or_expr 
-                     {{ return [ 'for', ID, name_expr, and_or_expr ] }} END 
+                     {{ return [ 'for', ID, name_expr, and_or_expr, recursive ] }} END 
                    | STRING 'where' and_or_expr 
-                     {{ return [ 'for', ID, STRING, and_or_expr ] }} END 
+                     {{ return [ 'for', ID, STRING, and_or_expr, recursive ] }} END 
                    | stmt 'where' and_or_expr )
-                     {{ return [ 'for', stmt, and_or_expr ] }} END
+                     {{ return [ 'for', stmt, and_or_expr, recursive ] }} END
 
     rule and_or_expr: rel_expr
          {{ result = rel_expr }}

Index: internal/queryparser/Makefile
diff -u internal/queryparser/Makefile:1.11 internal/queryparser/Makefile:1.12
--- internal/queryparser/Makefile:1.11	Mon Dec 13 13:52:24 2004
+++ internal/queryparser/Makefile	Thu Jan 27 14:50:12 2005
@@ -1,7 +1,7 @@
 
 include ../Makefile.inc
 
-RELVER=0.4-2
+RELVER=0.4-3
 QP=$(INTERNAL)/queryparser
 
 ifeq ($(OS),Cygwin)