mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some stray whitespace in parser files

Browse Source
This commit is contained in:
Peter Eisentraut 2020-11-11 17:37:18 +01:00
parent 4e3ffd5981
commit 0af302af40
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/bootstrap/bootscanner.l
View File

@ -88,7 +88,7 @@ _null_ { return NULLVAL; }
[\n] { yyline++; } [\n] { yyline++; }
[\r\t ] ; [\r\t ] ;
^\#[^\n]* ; /* drop everything after "#" for comments */ ^\#[^\n]* ; /* drop everything after "#" for comments */
declare { yylval.kw = "declare"; return XDECLARE; } declare { yylval.kw = "declare"; return XDECLARE; }
build { yylval.kw = "build"; return XBUILD; } build { yylval.kw = "build"; return XBUILD; }

18
src/backend/parser/gram.y
View File

@ -1483,7 +1483,7 @@ generic_set:
; ;
set_rest_more: /* Generic SET syntaxes: */ set_rest_more: /* Generic SET syntaxes: */
generic_set {$$ = $1;} generic_set {$$ = $1;}
| var_name FROM CURRENT_P | var_name FROM CURRENT_P
{ {
VariableSetStmt *n = makeNode(VariableSetStmt); VariableSetStmt *n = makeNode(VariableSetStmt);
@ -4996,8 +4996,8 @@ ImportForeignSchemaStmt:
; ;
import_qualification_type: import_qualification_type:
LIMIT TO { $$ = FDW_IMPORT_SCHEMA_LIMIT_TO; } LIMIT TO { $$ = FDW_IMPORT_SCHEMA_LIMIT_TO; }
| EXCEPT { $$ = FDW_IMPORT_SCHEMA_EXCEPT; } | EXCEPT { $$ = FDW_IMPORT_SCHEMA_EXCEPT; }
; ;
import_qualification: import_qualification:
@ -10538,8 +10538,8 @@ vac_analyze_option_name:
vac_analyze_option_arg: vac_analyze_option_arg:
opt_boolean_or_string { $$ = (Node *) makeString($1); } opt_boolean_or_string { $$ = (Node *) makeString($1); }
| NumericOnly { $$ = (Node *) $1; } | NumericOnly { $$ = (Node *) $1; }
| /* EMPTY */ { $$ = NULL; } | /* EMPTY */ { $$ = NULL; }
; ;
opt_analyze: opt_analyze:
@ -11773,10 +11773,10 @@ for_locking_item:
; ;
for_locking_strength: for_locking_strength:
FOR UPDATE { $$ = LCS_FORUPDATE; } FOR UPDATE { $$ = LCS_FORUPDATE; }
| FOR NO KEY UPDATE { $$ = LCS_FORNOKEYUPDATE; } | FOR NO KEY UPDATE { $$ = LCS_FORNOKEYUPDATE; }
| FOR SHARE { $$ = LCS_FORSHARE; } | FOR SHARE { $$ = LCS_FORSHARE; }
| FOR KEY SHARE { $$ = LCS_FORKEYSHARE; } | FOR KEY SHARE { $$ = LCS_FORKEYSHARE; }
; ;
locked_rels_list: locked_rels_list:

6
src/backend/utils/adt/jsonpath_gram.y
View File

@ -153,7 +153,7 @@ scalar_value:
| FALSE_P { $$ = makeItemBool(false); } | FALSE_P { $$ = makeItemBool(false); }
| NUMERIC_P { $$ = makeItemNumeric(&$1); } | NUMERIC_P { $$ = makeItemNumeric(&$1); }
| INT_P { $$ = makeItemNumeric(&$1); } | INT_P { $$ = makeItemNumeric(&$1); }
| VARIABLE_P { $$ = makeItemVariable(&$1); } | VARIABLE_P { $$ = makeItemVariable(&$1); }
; ;
comp_op: comp_op:
@ -175,12 +175,12 @@ predicate:
| expr comp_op expr { $$ = makeItemBinary($2, $1, $3); } | expr comp_op expr { $$ = makeItemBinary($2, $1, $3); }
| predicate AND_P predicate { $$ = makeItemBinary(jpiAnd, $1, $3); } | predicate AND_P predicate { $$ = makeItemBinary(jpiAnd, $1, $3); }
| predicate OR_P predicate { $$ = makeItemBinary(jpiOr, $1, $3); } | predicate OR_P predicate { $$ = makeItemBinary(jpiOr, $1, $3); }
| NOT_P delimited_predicate { $$ = makeItemUnary(jpiNot, $2); } | NOT_P delimited_predicate { $$ = makeItemUnary(jpiNot, $2); }
| '(' predicate ')' IS_P UNKNOWN_P | '(' predicate ')' IS_P UNKNOWN_P
{ $$ = makeItemUnary(jpiIsUnknown, $2); } { $$ = makeItemUnary(jpiIsUnknown, $2); }
| expr STARTS_P WITH_P starts_with_initial | expr STARTS_P WITH_P starts_with_initial
{ $$ = makeItemBinary(jpiStartsWith, $1, $4); } { $$ = makeItemBinary(jpiStartsWith, $1, $4); }
| expr LIKE_REGEX_P STRING_P { $$ = makeItemLikeRegex($1, &$3, NULL); } | expr LIKE_REGEX_P STRING_P { $$ = makeItemLikeRegex($1, &$3, NULL); }
| expr LIKE_REGEX_P STRING_P FLAG_P STRING_P | expr LIKE_REGEX_P STRING_P FLAG_P STRING_P
{ $$ = makeItemLikeRegex($1, &$3, &$5); } { $$ = makeItemLikeRegex($1, &$3, &$5); }
; ;

34
src/interfaces/ecpg/preproc/ecpg.trailer
View File

@ -36,7 +36,7 @@ CreateAsStmt: CREATE OptTemp TABLE create_as_target AS {FoundInto = 0;} SelectSt
$$ = cat_str(7, mm_strdup("create"), $2, mm_strdup("table"), $4, mm_strdup("as"), $7, $8); $$ = cat_str(7, mm_strdup("create"), $2, mm_strdup("table"), $4, mm_strdup("as"), $7, $8);
} }
| CREATE OptTemp TABLE IF_P NOT EXISTS create_as_target AS {FoundInto = 0;} SelectStmt opt_with_data | CREATE OptTemp TABLE IF_P NOT EXISTS create_as_target AS {FoundInto = 0;} SelectStmt opt_with_data
{ {
if (FoundInto == 1) if (FoundInto == 1)
mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE AS cannot specify INTO"); mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE AS cannot specify INTO");
@ -1821,27 +1821,27 @@ c_anything: ecpg_ident { $$ = $1; }
| ':' { $$ = mm_strdup(":"); } | ':' { $$ = mm_strdup(":"); }
; ;
DeallocateStmt: DEALLOCATE prepared_name { $$ = $2; } DeallocateStmt: DEALLOCATE prepared_name { $$ = $2; }
| DEALLOCATE PREPARE prepared_name { $$ = $3; } | DEALLOCATE PREPARE prepared_name { $$ = $3; }
| DEALLOCATE ALL { $$ = mm_strdup("all"); } | DEALLOCATE ALL { $$ = mm_strdup("all"); }
| DEALLOCATE PREPARE ALL { $$ = mm_strdup("all"); } | DEALLOCATE PREPARE ALL { $$ = mm_strdup("all"); }
; ;
Iresult: Iconst { $$ = $1; } Iresult: Iconst { $$ = $1; }
| '(' Iresult ')' { $$ = cat_str(3, mm_strdup("("), $2, mm_strdup(")")); } | '(' Iresult ')' { $$ = cat_str(3, mm_strdup("("), $2, mm_strdup(")")); }
| Iresult '+' Iresult { $$ = cat_str(3, $1, mm_strdup("+"), $3); } | Iresult '+' Iresult { $$ = cat_str(3, $1, mm_strdup("+"), $3); }
| Iresult '-' Iresult { $$ = cat_str(3, $1, mm_strdup("-"), $3); } | Iresult '-' Iresult { $$ = cat_str(3, $1, mm_strdup("-"), $3); }
| Iresult '*' Iresult { $$ = cat_str(3, $1, mm_strdup("*"), $3); } | Iresult '*' Iresult { $$ = cat_str(3, $1, mm_strdup("*"), $3); }
| Iresult '/' Iresult { $$ = cat_str(3, $1, mm_strdup("/"), $3); } | Iresult '/' Iresult { $$ = cat_str(3, $1, mm_strdup("/"), $3); }
| Iresult '%' Iresult { $$ = cat_str(3, $1, mm_strdup("%"), $3); } | Iresult '%' Iresult { $$ = cat_str(3, $1, mm_strdup("%"), $3); }
| ecpg_sconst { $$ = $1; } | ecpg_sconst { $$ = $1; }
| ColId { $$ = $1; } | ColId { $$ = $1; }
| ColId '(' var_type ')' { if (pg_strcasecmp($1, "sizeof") != 0) | ColId '(' var_type ')' { if (pg_strcasecmp($1, "sizeof") != 0)
mmerror(PARSE_ERROR, ET_ERROR, "operator not allowed in variable definition"); mmerror(PARSE_ERROR, ET_ERROR, "operator not allowed in variable definition");
else else
$$ = cat_str(4, $1, mm_strdup("("), $3.type_str, mm_strdup(")")); $$ = cat_str(4, $1, mm_strdup("("), $3.type_str, mm_strdup(")"));
} }
; ;
execute_rest: /* EMPTY */ { $$ = EMPTY; } execute_rest: /* EMPTY */ { $$ = EMPTY; }
| ecpg_using opt_ecpg_into { $$ = EMPTY; } | ecpg_using opt_ecpg_into { $$ = EMPTY; }