Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8fb4e00

Browse files
Harmonize more lexer function parameter names.
Make sure that function declarations use names that exactly match the corresponding names from function definitions for several "lexer adjacent" backend functions. These were missed by commit aab0644. Author: Peter Geoghegan <pg@bowt.ie> Discussion: https://postgr.es/m/CAH2-WznJt9CMM9KJTMjJh_zbL5hD9oX44qdJ4aqZtjFi-zA3Tg@mail.gmail.com
1 parent 3535ebc commit 8fb4e00

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

src/backend/utils/adt/jsonpath_scan.l

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static char *scanbuf;
3737
static int scanbuflen;
3838

3939
static void addstring(bool init, char *s, int l);
40-
static void addchar(bool init, char s);
40+
static void addchar(bool init, char c);
4141
static enum yytokentype checkKeyword(void);
4242
static void parseUnicode(char *s, int l);
4343
static void parseHexChar(char *s);

src/bin/pgbench/pgbench.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ struct PgBenchExprList
141141
extern PgBenchExpr *expr_parse_result;
142142

143143
extern int expr_yyparse(yyscan_t yyscanner);
144-
extern int expr_yylex(union YYSTYPE *lvalp, yyscan_t yyscanner);
145-
extern void expr_yyerror(yyscan_t yyscanner, const char *str) pg_attribute_noreturn();
146-
extern void expr_yyerror_more(yyscan_t yyscanner, const char *str,
144+
extern int expr_yylex(union YYSTYPE *yylval_param, yyscan_t yyscanner);
145+
extern void expr_yyerror(yyscan_t yyscanner, const char *message) pg_attribute_noreturn();
146+
extern void expr_yyerror_more(yyscan_t yyscanner, const char *message,
147147
const char *more) pg_attribute_noreturn();
148148
extern bool expr_lex_one_word(PsqlScanState state, PQExpBuffer word_buf,
149149
int *offset);

src/include/bootstrap/bootstrap.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ extern void boot_get_type_io_data(Oid typid,
5757
extern int boot_yyparse(void);
5858

5959
extern int boot_yylex(void);
60-
extern void boot_yyerror(const char *str) pg_attribute_noreturn();
60+
extern void boot_yyerror(const char *message) pg_attribute_noreturn();
6161

6262
#endif /* BOOTSTRAP_H */

src/include/parser/scanner.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ extern core_yyscan_t scanner_init(const char *str,
138138
const ScanKeywordList *keywordlist,
139139
const uint16 *keyword_tokens);
140140
extern void scanner_finish(core_yyscan_t yyscanner);
141-
extern int core_yylex(core_YYSTYPE *lvalp, YYLTYPE *llocp,
141+
extern int core_yylex(core_YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
142142
core_yyscan_t yyscanner);
143143
extern int scanner_errposition(int location, core_yyscan_t yyscanner);
144144
extern void setup_scanner_errposition_callback(ScannerCallbackState *scbstate,

src/include/replication/walsender_private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ extern void WalSndSetState(WalSndState state);
118118
*/
119119
extern int replication_yyparse(void);
120120
extern int replication_yylex(void);
121-
extern void replication_yyerror(const char *str) pg_attribute_noreturn();
121+
extern void replication_yyerror(const char *message) pg_attribute_noreturn();
122122
extern void replication_scanner_init(const char *str);
123123
extern void replication_scanner_finish(void);
124124
extern bool replication_scanner_is_replication_command(void);

src/test/isolation/isolationtester.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,6 @@ extern TestSpec parseresult;
8888
extern int spec_yyparse(void);
8989

9090
extern int spec_yylex(void);
91-
extern void spec_yyerror(const char *str);
91+
extern void spec_yyerror(const char *message);
9292

9393
#endif /* ISOLATIONTESTER_H */

0 commit comments

Comments
 (0)