mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-07 06:49:27 +02: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 e3860ffa4d 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
62 lines
1.8 KiB
C
62 lines
1.8 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* value.h
|
|
* interface for Value nodes
|
|
*
|
|
*
|
|
* Copyright (c) 2003-2017, PostgreSQL Global Development Group
|
|
*
|
|
* src/include/nodes/value.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
|
|
#ifndef VALUE_H
|
|
#define VALUE_H
|
|
|
|
#include "nodes/nodes.h"
|
|
|
|
/*----------------------
|
|
* Value node
|
|
*
|
|
* The same Value struct is used for five node types: T_Integer,
|
|
* T_Float, T_String, T_BitString, T_Null.
|
|
*
|
|
* Integral values are actually represented by a machine integer,
|
|
* but both floats and strings are represented as strings.
|
|
* Using T_Float as the node type simply indicates that
|
|
* the contents of the string look like a valid numeric literal.
|
|
*
|
|
* (Before Postgres 7.0, we used a double to represent T_Float,
|
|
* but that creates loss-of-precision problems when the value is
|
|
* ultimately destined to be converted to NUMERIC. Since Value nodes
|
|
* are only used in the parsing process, not for runtime data, it's
|
|
* better to use the more general representation.)
|
|
*
|
|
* Note that an integer-looking string will get lexed as T_Float if
|
|
* the value is too large to fit in a 'long'.
|
|
*
|
|
* Nulls, of course, don't need the value part at all.
|
|
*----------------------
|
|
*/
|
|
typedef struct Value
|
|
{
|
|
NodeTag type; /* tag appropriately (eg. T_String) */
|
|
union ValUnion
|
|
{
|
|
long ival; /* machine integer */
|
|
char *str; /* string */
|
|
} val;
|
|
} Value;
|
|
|
|
#define intVal(v) (((Value *)(v))->val.ival)
|
|
#define floatVal(v) atof(((Value *)(v))->val.str)
|
|
#define strVal(v) (((Value *)(v))->val.str)
|
|
|
|
extern Value *makeInteger(long i);
|
|
extern Value *makeFloat(char *numericStr);
|
|
extern Value *makeString(char *str);
|
|
extern Value *makeBitString(char *str);
|
|
|
|
#endif /* VALUE_H */
|