Commit 193a7d79 authored by Alvaro Herrera's avatar Alvaro Herrera

Remove dead code in bootstrap

The bootstrap scanner/parser contains code to parse floating point
values, but this is not exercised anywhere, so remove it.

Reviewed-by: Jim Nasby
Discussion: https://postgr.es/m/20170110051119.b5h7i3z5qagy35rb@alvherre.pgsql
parent 593c75d5
...@@ -105,11 +105,11 @@ static int num_columns_read = 0; ...@@ -105,11 +105,11 @@ static int num_columns_read = 0;
%type <list> boot_index_params %type <list> boot_index_params
%type <ielem> boot_index_param %type <ielem> boot_index_param
%type <str> boot_const boot_ident %type <str> boot_ident
%type <ival> optbootstrap optsharedrelation optwithoutoids boot_column_nullness %type <ival> optbootstrap optsharedrelation optwithoutoids boot_column_nullness
%type <oidval> oidspec optoideq optrowtypeoid %type <oidval> oidspec optoideq optrowtypeoid
%token <str> CONST_P ID %token <str> ID
%token OPEN XCLOSE XCREATE INSERT_TUPLE %token OPEN XCLOSE XCREATE INSERT_TUPLE
%token XDECLARE INDEX ON USING XBUILD INDICES UNIQUE XTOAST %token XDECLARE INDEX ON USING XBUILD INDICES UNIQUE XTOAST
%token COMMA EQUALS LPAREN RPAREN %token COMMA EQUALS LPAREN RPAREN
...@@ -464,16 +464,10 @@ boot_column_val_list: ...@@ -464,16 +464,10 @@ boot_column_val_list:
boot_column_val: boot_column_val:
boot_ident boot_ident
{ InsertOneValue($1, num_columns_read++); } { InsertOneValue($1, num_columns_read++); }
| boot_const
{ InsertOneValue($1, num_columns_read++); }
| NULLVAL | NULLVAL
{ InsertOneNull(num_columns_read++); } { InsertOneNull(num_columns_read++); }
; ;
boot_const :
CONST_P { $$ = yylval.str; }
;
boot_ident : boot_ident :
ID { $$ = yylval.str; } ID { $$ = yylval.str; }
; ;
......
...@@ -66,7 +66,6 @@ static int yyline = 1; /* line number for error reporting */ ...@@ -66,7 +66,6 @@ static int yyline = 1; /* line number for error reporting */
D [0-9] D [0-9]
oct \\{D}{D}{D} oct \\{D}{D}{D}
Exp [Ee][-+]?{D}+
id ([A-Za-z0-9_]|{oct}|\-)+ id ([A-Za-z0-9_]|{oct}|\-)+
sid \"([^\"])*\" sid \"([^\"])*\"
arrayid [A-Za-z0-9_]+\[{D}*\] arrayid [A-Za-z0-9_]+\[{D}*\]
...@@ -127,13 +126,6 @@ insert { return(INSERT_TUPLE); } ...@@ -127,13 +126,6 @@ insert { return(INSERT_TUPLE); }
return(ID); return(ID);
} }
(-)?{D}+"."{D}*({Exp})? |
(-)?{D}*"."{D}+({Exp})? |
(-)?{D}+{Exp} {
yylval.str = pstrdup(yytext);
return(CONST_P);
}
. { . {
elog(ERROR, "syntax error at line %d: unexpected character \"%s\"", yyline, yytext); elog(ERROR, "syntax error at line %d: unexpected character \"%s\"", yyline, yytext);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment