*** empty log message ***

Michael Meskes · Michael Meskes · commit b2a2be4c5ac9 · 1999-08-02T04:59:18.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -617,3 +617,8 @@ Mon Jul 19 07:53:20 CEST 1999
 	- Fixed quoting bug in ecpglib.c
 	- Set ecpg version to 2.6.1
 	- Set library version to 3.0.1
+
+Sun Aug  1 13:31:19 CEST 1999
+
+	- Synced preproc.y with gram.y.
+	- Set ecpg version to 2.6.2
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
@@ -3,7 +3,7 @@ include $(SRCDIR)/Makefile.global
 
 MAJOR_VERSION=2
 MINOR_VERSION=6
-PATCHLEVEL=1
+PATCHLEVEL=2
 
 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
 	-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -777,10 +777,10 @@ adjust_array(enum ECPGttype type_enum, int *dimension, int *length, int type_dim
 %type  <str>    update_target_el opt_id relation_name database_name
 %type  <str>    access_method attr_name class index_name name func_name
 %type  <str>    file_name AexprConst ParamNo TypeId
-%type  <str>	in_expr_nodes not_in_expr_nodes a_expr b_expr
+%type  <str>	in_expr_nodes a_expr b_expr
 %type  <str> 	opt_indirection expr_list extract_list extract_arg
 %type  <str>	position_list substr_list substr_from
-%type  <str>	trim_list in_expr substr_for not_in_expr attr attrs
+%type  <str>	trim_list in_expr substr_for attr attrs
 %type  <str>	Typename SimpleTypename Generic Numeric generic opt_float opt_numeric
 %type  <str> 	opt_decimal Character character opt_varying opt_charset
 %type  <str>	opt_collate Datetime datetime opt_timezone opt_interval
@@ -3687,7 +3687,7 @@ a_expr:  attr
 				{
 					$$ = make4_str($1, make1_str(" in ("), $4, make1_str(")")); 
 				}
-		| a_expr NOT IN '(' not_in_expr ')'
+		| a_expr NOT IN '(' in_expr ')'
 				{
 					$$ = make4_str($1, make1_str(" not in ("), $5, make1_str(")")); 
 				}
@@ -4020,23 +4020,9 @@ in_expr:  SubSelect
 				{	$$ = $1; }
 		;
 
-in_expr_nodes:  AexprConst
+in_expr_nodes:  a_expr
 				{	$$ = $1; }
-		| in_expr_nodes ',' AexprConst
-				{	$$ = cat3_str($1, make1_str(","), $3);}
-		;
-
-not_in_expr:  SubSelect
-				{
-					$$ = $1; 
-				}
-		| not_in_expr_nodes
-				{	$$ = $1; }
-		;
-
-not_in_expr_nodes:  AexprConst
-				{	$$ = $1; }
-		| not_in_expr_nodes ',' AexprConst
+		| in_expr_nodes ',' a_expr
 				{	$$ = cat3_str($1, make1_str(","), $3);}
 		;
 
@@ -5647,7 +5633,7 @@ ecpg_expr:  attr
 				{
 					$$ = make4_str($1, make1_str(" in ("), $4, make1_str(")")); 
 				}
-		| a_expr NOT IN '(' not_in_expr ')'
+		| a_expr NOT IN '(' in_expr ')'
 				{
 					$$ = make4_str($1, make1_str(" not in ("), $5, make1_str(")")); 
 				}

Original file line number	Diff line number	Diff line change
`@@ -777,10 +777,10 @@ adjust_array(enum ECPGttype type_enum, int dimension, int length, int type_dim`
`777`	`777`	`%type <str> update_target_el opt_id relation_name database_name`
`778`	`778`	`%type <str> access_method attr_name class index_name name func_name`
`779`	`779`	`%type <str> file_name AexprConst ParamNo TypeId`
`780`		`-%type <str> in_expr_nodes not_in_expr_nodes a_expr b_expr`
	`780`	`+%type <str> in_expr_nodes a_expr b_expr`
`781`	`781`	`%type <str> opt_indirection expr_list extract_list extract_arg`
`782`	`782`	`%type <str> position_list substr_list substr_from`
`783`		`-%type <str> trim_list in_expr substr_for not_in_expr attr attrs`
	`783`	`+%type <str> trim_list in_expr substr_for attr attrs`
`784`	`784`	`%type <str> Typename SimpleTypename Generic Numeric generic opt_float opt_numeric`
`785`	`785`	`%type <str> opt_decimal Character character opt_varying opt_charset`
`786`	`786`	`%type <str> opt_collate Datetime datetime opt_timezone opt_interval`
`@@ -3687,7 +3687,7 @@ a_expr: attr`
`3687`	`3687`	`{`
`3688`	`3688`	`$$ = make4_str($1, make1_str(" in ("), $4, make1_str(")"));`
`3689`	`3689`	`}`
`3690`		`- \| a_expr NOT IN '(' not_in_expr ')'`
	`3690`	`+ \| a_expr NOT IN '(' in_expr ')'`
`3691`	`3691`	`{`
`3692`	`3692`	`$$ = make4_str($1, make1_str(" not in ("), $5, make1_str(")"));`
`3693`	`3693`	`}`
`@@ -4020,23 +4020,9 @@ in_expr: SubSelect`
`4020`	`4020`	`{ $$ = $1; }`
`4021`	`4021`	`;`
`4022`	`4022`
`4023`		`-in_expr_nodes: AexprConst`
	`4023`	`+in_expr_nodes: a_expr`
`4024`	`4024`	`{ $$ = $1; }`
`4025`		`- \| in_expr_nodes ',' AexprConst`
`4026`		`- { $$ = cat3_str($1, make1_str(","), $3);}`
`4027`		`- ;`
`4028`		`-`
`4029`		`-not_in_expr: SubSelect`
`4030`		`- {`
`4031`		`- $$ = $1;`
`4032`		`- }`
`4033`		`- \| not_in_expr_nodes`
`4034`		`- { $$ = $1; }`
`4035`		`- ;`
`4036`		`-`
`4037`		`-not_in_expr_nodes: AexprConst`
`4038`		`- { $$ = $1; }`
`4039`		`- \| not_in_expr_nodes ',' AexprConst`
	`4025`	`+ \| in_expr_nodes ',' a_expr`
`4040`	`4026`	`{ $$ = cat3_str($1, make1_str(","), $3);}`
`4041`	`4027`	`;`
`4042`	`4028`
`@@ -5647,7 +5633,7 @@ ecpg_expr: attr`
`5647`	`5633`	`{`
`5648`	`5634`	`$$ = make4_str($1, make1_str(" in ("), $4, make1_str(")"));`
`5649`	`5635`	`}`
`5650`		`- \| a_expr NOT IN '(' not_in_expr ')'`
	`5636`	`+ \| a_expr NOT IN '(' in_expr ')'`
`5651`	`5637`	`{`
`5652`	`5638`	`$$ = make4_str($1, make1_str(" not in ("), $5, make1_str(")"));`
`5653`	`5639`	`}`