From 0af302af40669d9bc6de7a202e4723fee39d9376 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Wed, 11 Nov 2020 17:37:18 +0100
Subject: [PATCH] Fix some stray whitespace in parser files
---
src/backend/bootstrap/bootscanner.l | 2 +-
src/backend/parser/gram.y | 18 ++++++-------
src/backend/utils/adt/jsonpath_gram.y | 6 ++---
src/interfaces/ecpg/preproc/ecpg.trailer | 34 ++++++++++++------------
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index 6a0bed6c8d..62d67a695e 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -88,7 +88,7 @@ _null_ { return NULLVAL; }
[\n] { yyline++; }
[\r\t ] ;
-^\#[^\n]* ; /* drop everything after "#" for comments */
+^\#[^\n]* ; /* drop everything after "#" for comments */
declare { yylval.kw = "declare"; return XDECLARE; }
build { yylval.kw = "build"; return XBUILD; }
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 95e256883b..d0d8bde3f3 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -1483,7 +1483,7 @@ generic_set:
;
set_rest_more: /* Generic SET syntaxes: */
- generic_set {$$ = $1;}
+ generic_set {$$ = $1;}
| var_name FROM CURRENT_P
{
VariableSetStmt *n = makeNode(VariableSetStmt);
@@ -4996,8 +4996,8 @@ ImportForeignSchemaStmt:
;
import_qualification_type:
- LIMIT TO { $$ = FDW_IMPORT_SCHEMA_LIMIT_TO; }
- | EXCEPT { $$ = FDW_IMPORT_SCHEMA_EXCEPT; }
+ LIMIT TO { $$ = FDW_IMPORT_SCHEMA_LIMIT_TO; }
+ | EXCEPT { $$ = FDW_IMPORT_SCHEMA_EXCEPT; }
;
import_qualification:
@@ -10538,8 +10538,8 @@ vac_analyze_option_name:
vac_analyze_option_arg:
opt_boolean_or_string { $$ = (Node *) makeString($1); }
- | NumericOnly { $$ = (Node *) $1; }
- | /* EMPTY */ { $$ = NULL; }
+ | NumericOnly { $$ = (Node *) $1; }
+ | /* EMPTY */ { $$ = NULL; }
;
opt_analyze:
@@ -11773,10 +11773,10 @@ for_locking_item:
;
for_locking_strength:
- FOR UPDATE { $$ = LCS_FORUPDATE; }
- | FOR NO KEY UPDATE { $$ = LCS_FORNOKEYUPDATE; }
- | FOR SHARE { $$ = LCS_FORSHARE; }
- | FOR KEY SHARE { $$ = LCS_FORKEYSHARE; }
+ FOR UPDATE { $$ = LCS_FORUPDATE; }
+ | FOR NO KEY UPDATE { $$ = LCS_FORNOKEYUPDATE; }
+ | FOR SHARE { $$ = LCS_FORSHARE; }
+ | FOR KEY SHARE { $$ = LCS_FORKEYSHARE; }
;
locked_rels_list:
diff --git a/src/backend/utils/adt/jsonpath_gram.y b/src/backend/utils/adt/jsonpath_gram.y
index 53f422260c..01b8d451a7 100644
--- a/src/backend/utils/adt/jsonpath_gram.y
+++ b/src/backend/utils/adt/jsonpath_gram.y
@@ -153,7 +153,7 @@ scalar_value:
| FALSE_P { $$ = makeItemBool(false); }
| NUMERIC_P { $$ = makeItemNumeric(&$1); }
| INT_P { $$ = makeItemNumeric(&$1); }
- | VARIABLE_P { $$ = makeItemVariable(&$1); }
+ | VARIABLE_P { $$ = makeItemVariable(&$1); }
;
comp_op:
@@ -175,12 +175,12 @@ predicate:
| expr comp_op expr { $$ = makeItemBinary($2, $1, $3); }
| predicate AND_P predicate { $$ = makeItemBinary(jpiAnd, $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
{ $$ = makeItemUnary(jpiIsUnknown, $2); }
| expr STARTS_P WITH_P starts_with_initial
{ $$ = 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
{ $$ = makeItemLikeRegex($1, &$3, &$5); }
;
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
index 14ad27c359..0e4a041393 100644
--- a/src/interfaces/ecpg/preproc/ecpg.trailer
+++ b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -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);
}
- | 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)
mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE AS cannot specify INTO");
@@ -1821,27 +1821,27 @@ c_anything: ecpg_ident { $$ = $1; }
| ':' { $$ = mm_strdup(":"); }
;
-DeallocateStmt: DEALLOCATE prepared_name { $$ = $2; }
- | DEALLOCATE PREPARE prepared_name { $$ = $3; }
- | DEALLOCATE ALL { $$ = mm_strdup("all"); }
- | DEALLOCATE PREPARE ALL { $$ = mm_strdup("all"); }
- ;
+DeallocateStmt: DEALLOCATE prepared_name { $$ = $2; }
+ | DEALLOCATE PREPARE prepared_name { $$ = $3; }
+ | DEALLOCATE ALL { $$ = mm_strdup("all"); }
+ | DEALLOCATE PREPARE ALL { $$ = mm_strdup("all"); }
+ ;
-Iresult: Iconst { $$ = $1; }
- | '(' 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); }
- | ecpg_sconst { $$ = $1; }
- | ColId { $$ = $1; }
- | ColId '(' var_type ')' { if (pg_strcasecmp($1, "sizeof") != 0)
+Iresult: Iconst { $$ = $1; }
+ | '(' 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); }
+ | ecpg_sconst { $$ = $1; }
+ | ColId { $$ = $1; }
+ | ColId '(' var_type ')' { if (pg_strcasecmp($1, "sizeof") != 0)
mmerror(PARSE_ERROR, ET_ERROR, "operator not allowed in variable definition");
else
$$ = cat_str(4, $1, mm_strdup("("), $3.type_str, mm_strdup(")"));
}
- ;
+ ;
execute_rest: /* EMPTY */ { $$ = EMPTY; }
| ecpg_using opt_ecpg_into { $$ = EMPTY; }