mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-07 03:37:33 +08:00
c7b8998ebb
Change pg_bsd_indent to follow upstream rules for placement of comments to the right of code, and remove pgindent hack that caused comments following #endif to not obey the general rule. Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using the published version of pg_bsd_indent, but a hacked-up version that tried to minimize the amount of movement of comments to the right of code. The situation of interest is where such a comment has to be moved to the right of its default placement at column 33 because there's code there. BSD indent has always moved right in units of tab stops in such cases --- but in the previous incarnation, indent was working in 8-space tab stops, while now it knows we use 4-space tabs. So the net result is that in about half the cases, such comments are placed one tab stop left of before. This is better all around: it leaves more room on the line for comment text, and it means that in such cases the comment uniformly starts at the next 4-space tab stop after the code, rather than sometimes one and sometimes two tabs after. Also, ensure that comments following #endif are indented the same as comments following other preprocessor commands such as #else. That inconsistency turns out to have been self-inflicted damage from a poorly-thought-through post-indent "fixup" in pgindent. This patch is much less interesting than the first round of indent changes, but also bulkier, so I thought it best to separate the effects. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
76 lines
2.2 KiB
C
76 lines
2.2 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* gramparse.h
|
|
* Shared definitions for the "raw" parser (flex and bison phases only)
|
|
*
|
|
* NOTE: this file is only meant to be included in the core parsing files,
|
|
* ie, parser.c, gram.y, scan.l, and src/common/keywords.c.
|
|
* Definitions that are needed outside the core parser should be in parser.h.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/parser/gramparse.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
|
|
#ifndef GRAMPARSE_H
|
|
#define GRAMPARSE_H
|
|
|
|
#include "nodes/parsenodes.h"
|
|
#include "parser/scanner.h"
|
|
|
|
/*
|
|
* NB: include gram.h only AFTER including scanner.h, because scanner.h
|
|
* is what #defines YYLTYPE.
|
|
*/
|
|
#include "parser/gram.h"
|
|
|
|
/*
|
|
* The YY_EXTRA data that a flex scanner allows us to pass around. Private
|
|
* state needed for raw parsing/lexing goes here.
|
|
*/
|
|
typedef struct base_yy_extra_type
|
|
{
|
|
/*
|
|
* Fields used by the core scanner.
|
|
*/
|
|
core_yy_extra_type core_yy_extra;
|
|
|
|
/*
|
|
* State variables for base_yylex().
|
|
*/
|
|
bool have_lookahead; /* is lookahead info valid? */
|
|
int lookahead_token; /* one-token lookahead */
|
|
core_YYSTYPE lookahead_yylval; /* yylval for lookahead token */
|
|
YYLTYPE lookahead_yylloc; /* yylloc for lookahead token */
|
|
char *lookahead_end; /* end of current token */
|
|
char lookahead_hold_char; /* to be put back at *lookahead_end */
|
|
|
|
/*
|
|
* State variables that belong to the grammar.
|
|
*/
|
|
List *parsetree; /* final parse result is delivered here */
|
|
} base_yy_extra_type;
|
|
|
|
/*
|
|
* In principle we should use yyget_extra() to fetch the yyextra field
|
|
* from a yyscanner struct. However, flex always puts that field first,
|
|
* and this is sufficiently performance-critical to make it seem worth
|
|
* cheating a bit to use an inline macro.
|
|
*/
|
|
#define pg_yyget_extra(yyscanner) (*((base_yy_extra_type **) (yyscanner)))
|
|
|
|
|
|
/* from parser.c */
|
|
extern int base_yylex(YYSTYPE *lvalp, YYLTYPE *llocp,
|
|
core_yyscan_t yyscanner);
|
|
|
|
/* from gram.y */
|
|
extern void parser_init(base_yy_extra_type *yyext);
|
|
extern int base_yyparse(core_yyscan_t yyscanner);
|
|
|
|
#endif /* GRAMPARSE_H */
|