1
- /* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.274 2004/02/16 07:41:54 meskes Exp $*/
1
+ /* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.275 2004/02/18 08:42:02 meskes Exp $*/
2
2
3
3
/* Copyright comment*/
4
4
%{
@@ -551,7 +551,7 @@ add_additional_variables(char *name, bool insert)
551
551
552
552
%type <dtype_enum> descriptor_item desc_header_item
553
553
554
- %type <type> var_type single_vt_type
554
+ %type <type> var_type
555
555
556
556
%type <action> action
557
557
@@ -4416,7 +4416,7 @@ single_vt_declaration: type_declaration{ $$ = $1; }
4416
4416
;
4417
4417
4418
4418
single_var_declaration :storage_declaration
4419
- single_vt_type
4419
+ var_type
4420
4420
{
4421
4421
actual_type[struct_level].type_enum =$2 .type_enum;
4422
4422
actual_type[struct_level].type_dimension =$2 .type_dimension;
@@ -4427,7 +4427,7 @@ single_var_declaration: storage_declaration
4427
4427
{
4428
4428
$$ = cat_str(5 , actual_startline[struct_level],$1 ,$2 .type_str,$4 , make_str(" ;\n " ));
4429
4429
}
4430
- | single_vt_type
4430
+ | var_type
4431
4431
{
4432
4432
actual_type[struct_level].type_enum =$1 .type_enum;
4433
4433
actual_type[struct_level].type_dimension =$1 .type_dimension;
@@ -4460,17 +4460,6 @@ ecpg_interval:opt_interval{ $$ = $1; }
4460
4460
| MONTH_P TO MONTH_P {$$ = make_str(" month to month" ); }
4461
4461
;
4462
4462
4463
- single_vt_type :var_type
4464
- | DOUBLE_P
4465
- {
4466
- $$ .type_enum = ECPGt_double;
4467
- $$ .type_str = make_str(" double" );
4468
- $$ .type_dimension = make_str(" -1" );
4469
- $$ .type_index = make_str(" -1" );
4470
- $$ .type_sizeof =NULL ;
4471
- }
4472
- ;
4473
-
4474
4463
/*
4475
4464
* variable declaration inside exec sql declare block
4476
4465
*/
@@ -4960,6 +4949,7 @@ signed_type: SQL_SHORT{ $$ = ECPGt_short; }
4960
4949
}
4961
4950
| SQL_BOOL {$$ = ECPGt_bool; }
4962
4951
| CHAR_P {$$ = ECPGt_char; }
4952
+ | DOUBLE_P {$$ = ECPGt_double; }
4963
4953
;
4964
4954
4965
4955
opt_signed :SQL_SIGNED