Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3d41da5

Browse files
author
Michael Meskes
committed
Made variable type double work again.
1 parent7e684fa commit3d41da5

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1418,6 +1418,10 @@ Wed May 14 13:05:49 CEST 2003
14181418
Fri May 16 11:45:50 CEST 2003
14191419

14201420
- Fixed include in pgtypeslib to not include c.h
1421+
1422+
Fri May 16 13:32:10 CEST 2003
1423+
1424+
- Made double variables work again.
14211425
- Set ecpg version to 2.12.0.
14221426
- Set ecpg library to 3.4.2.
14231427
- Set pgtypes library to 1.0.0

‎src/interfaces/ecpg/preproc/c_keywords.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ static ScanKeyword ScanKeywords[] = {
2525
{"bool",SQL_BOOL},
2626
{"char",CHAR_P},
2727
{"const",S_CONST},
28-
{"double",DOUBLE_P},
2928
{"enum",SQL_ENUM},
3029
{"extern",S_EXTERN},
3130
{"float",FLOAT_P},

‎src/interfaces/ecpg/preproc/preproc.y

Lines changed: 14 additions & 14 deletions
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.218 2003/05/1604:59:22 momjian Exp $*/
1+
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.219 2003/05/1611:30:09 meskes Exp $*/
22

33
/* Copyright comment*/
44
%{
@@ -4183,6 +4183,14 @@ ecpg_interval:opt_interval{ $$ = $1; }
41834183
;
41844184

41854185
single_vt_type:common_type
4186+
|DOUBLE_P
4187+
{
4188+
$$.type_enum = ECPGt_double;
4189+
$$.type_str = make_str("double");
4190+
$$.type_dimension = make_str("-1");
4191+
$$.type_index = make_str("-1");
4192+
$$.type_sizeof =NULL;
4193+
}
41864194
|ECPGColLabelCommonecpg_interval
41874195
{
41884196
if (strlen($2) !=0 && strcmp ($1,"datetime") !=0 && strcmp ($1,"interval") !=0)
@@ -4208,14 +4216,6 @@ single_vt_type: common_type
42084216
$$.type_index = make_str("-1");
42094217
$$.type_sizeof =NULL;
42104218
}
4211-
elseif (strcmp($1,"double") ==0)
4212-
{
4213-
$$.type_enum = ECPGt_double;
4214-
$$.type_str = make_str("double");
4215-
$$.type_dimension = make_str("-1");
4216-
$$.type_index = make_str("-1");
4217-
$$.type_sizeof =NULL;
4218-
}
42194219
elseif (strcmp($1,"numeric") ==0)
42204220
{
42214221
$$.type_enum = ECPGt_numeric;
@@ -4671,7 +4671,7 @@ variable: opt_pointer ECPGColLabelCommon opt_array_bounds opt_initializer
46714671
structECPGtype * type;
46724672
char *dimension =$3.index1;/* dimension of array*/
46734673
char *length =$3.index2;/* lenght of string*/
4674-
char dim[14L], ascii_len[12];
4674+
char dim[14L];
46754675

46764676
adjust_array(actual_type[struct_level].type_enum, &dimension, &length, actual_type[struct_level].type_dimension, actual_type[struct_level].type_index, strlen($1));
46774677

@@ -5289,11 +5289,11 @@ symbol: ColLabel{ $$ = $1; }
52895289

52905290
/* Column identifier --- names that can be column, table, etc names.
52915291
*/
5292-
ColId:ident{$$ =$1; }
5292+
ColId:ident{$$ =$1; }
52935293
|unreserved_keyword{$$ =$1; }
5294-
|col_name_keyword{$$ =$1; }
5295-
|ECPGKeywords{$$ =$1; }
5296-
|CHAR_P{$$ = make_str("char"); }
5294+
|col_name_keyword{$$ =$1; }
5295+
|ECPGKeywords{$$ =$1; }
5296+
|CHAR_P{$$ = make_str("char"); }
52975297
;
52985298

52995299
/* Type identifier --- names that can be type names.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp