Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 6778445

Browse files
author
Michael Meskes
committed
Fixed incorrect output for some structs.
1 parent 5493ecc commit 6778445

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/interfaces/ecpg/ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1441,6 +1441,10 @@ Fri May 23 11:46:15 CEST 2003
14411441

14421442
- Synced parser and keyword table.
14431443
- ecpg now accepts array elements as input variables.
1444+
1445+
Tue May 27 13:29:28 CEST 2003
1446+
1447+
- Fixed incorrect output for some structs.
14441448
- Set ecpg version to 2.12.0.
14451449
- Set ecpg library to 3.4.2.
14461450
- Set pgtypes library to 1.0.0

src/interfaces/ecpg/preproc/preproc.y

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.222 2003/05/23 15:19:34 meskes Exp $ */
1+
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.223 2003/05/27 11:31:52 meskes Exp $ */
22

33
/* Copyright comment */
44
%{
@@ -3783,8 +3783,6 @@ update_target_list: update_target_list ',' update_target_el
37833783
}
37843784
| update_target_el
37853785
{ $$ = $1; }
3786-
| '*'
3787-
{ $$ = make_str("*"); }
37883786
;
37893787

37903788
inf_col_list: ColId opt_indirection
@@ -4833,7 +4831,11 @@ s_struct_union_symbol: SQL_STRUCT symbol
48334831
}
48344832
;
48354833

4836-
s_struct_union: SQL_STRUCT { $$ = make_str("struct"); }
4834+
s_struct_union: SQL_STRUCT
4835+
{
4836+
ECPGstruct_sizeof = make_str(""); /* This must not be NULL to distinguish from simple types. */
4837+
$$ = make_str("struct");
4838+
}
48374839
| UNION { $$ = make_str("union"); }
48384840
;
48394841

0 commit comments

Comments
 (0)