[Firebird-checkins] CVS: interbase/dsql parse.c,1.26,1.27 parse.y,1.25,1.26

[Claudio V. C. <ro...@us...>]

Build Number:809

Update of /cvsroot/firebird/interbase/dsql
In directory usw-pr-cvs1:/tmp/cvs-serv25098

Modified Files:
	parse.c parse.y 
Log Message:
Fix an oversight with the IBO hack
=> should work with multiple column names.


Index: parse.c
===================================================================
RCS file: /cvsroot/firebird/interbase/dsql/parse.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -U3 -r1.26 -r1.27
--- parse.c	22 Mar 2002 08:22:52 -0000	1.26
+++ parse.c	27 Mar 2002 07:44:49 -0000	1.27
@@ -613,1997 +613,2026 @@
     0,  686,    0,    0,    0,    0,    0,    0,    0,    0,
   707,  711,  712,  713,  714,  715,  716,  717,  718,  719,
   720,  808,  809,  810,  800,    0,    0,    0,  693,   26,
-    0,    0,   42,   70,    0,    0,   24,    0,    0,    0,
-  699,    0,    0,  662,    0,    0,    0,    0,    0,    0,
+    0,    0,   42,   70,    0,    0,   24,    0,  699,    0,
+    0,  662,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  884,  294,    0,    0,
-    0,    0,    0,    0,    0,  622,    0,    0,  625,    0,
-    0,    0,    0,  877,  593,  520,    0,  831,  519,    0,
[...3953 lines suppressed...]
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  472,  473,
-  474,  475,  476,  477,  478,  479,  480,  481,  482,  483,
-  484,  485,  486,  487,  488,  489,  490,  491,
+   -1,  462,   -1,  482,  483,   -1,   -1,   -1,   -1,   -1,
+  447,  472,  473,  474,  475,  476,  477,  478,  479,  480,
+  481,  482,  483,  484,  485,  486,  487,  488,  489,  490,
+  491,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  482,  483,
 };
 #define YYFINAL 18
 #ifndef YYDEBUG
@@ -3352,7 +3381,7 @@
 "ins_column_parens_opt :",
 "ins_column_parens : '(' ins_column_list ')'",
 "ins_column_list : update_column_name",
-"ins_column_list : column_list ',' update_column_name",
+"ins_column_list : ins_column_list ',' update_column_name",
 "column_name : simple_column_name",
 "column_name : symbol_table_alias_name '.' symbol_column_name",
 "column_name : symbol_table_alias_name '.' '*'",

Index: parse.y
===================================================================
RCS file: /cvsroot/firebird/interbase/dsql/parse.y,v
retrieving revision 1.25
retrieving revision 1.26
diff -U3 -r1.25 -r1.26
--- parse.y	22 Mar 2002 08:22:52 -0000	1.25
+++ parse.y	27 Mar 2002 07:44:50 -0000	1.26
@@ -2843,7 +2843,7 @@
 		;
 
 ins_column_list	: update_column_name
-		| column_list ',' update_column_name
+		| ins_column_list ',' update_column_name
 			{ $$ = make_node (nod_list, 2, $1, $3); }
 		;
 /* end IBO hack */