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
70 lines
2.2 KiB
C
70 lines
2.2 KiB
C
/* contrib/cube/cubedata.h */
|
|
|
|
/*
|
|
* This limit is pretty arbitrary, but don't make it so large that you
|
|
* risk overflow in sizing calculations.
|
|
*/
|
|
#define CUBE_MAX_DIM (100)
|
|
|
|
typedef struct NDBOX
|
|
{
|
|
/* varlena header (do not touch directly!) */
|
|
int32 vl_len_;
|
|
|
|
/*----------
|
|
* Header contains info about NDBOX. For binary compatibility with old
|
|
* versions, it is defined as "unsigned int".
|
|
*
|
|
* Following information is stored:
|
|
*
|
|
* bits 0-7 : number of cube dimensions;
|
|
* bits 8-30 : unused, initialize to zero;
|
|
* bit 31 : point flag. If set, the upper right coordinates are not
|
|
* stored, and are implicitly the same as the lower left
|
|
* coordinates.
|
|
*----------
|
|
*/
|
|
unsigned int header;
|
|
|
|
/*
|
|
* The lower left coordinates for each dimension come first, followed by
|
|
* upper right coordinates unless the point flag is set.
|
|
*/
|
|
double x[FLEXIBLE_ARRAY_MEMBER];
|
|
} NDBOX;
|
|
|
|
/* NDBOX access macros */
|
|
#define POINT_BIT 0x80000000
|
|
#define DIM_MASK 0x7fffffff
|
|
|
|
#define IS_POINT(cube) ( ((cube)->header & POINT_BIT) != 0 )
|
|
#define SET_POINT_BIT(cube) ( (cube)->header |= POINT_BIT )
|
|
#define DIM(cube) ( (cube)->header & DIM_MASK )
|
|
#define SET_DIM(cube, _dim) ( (cube)->header = ((cube)->header & ~DIM_MASK) | (_dim) )
|
|
|
|
#define LL_COORD(cube, i) ( (cube)->x[i] )
|
|
#define UR_COORD(cube, i) ( IS_POINT(cube) ? (cube)->x[i] : (cube)->x[(i) + DIM(cube)] )
|
|
|
|
#define POINT_SIZE(_dim) (offsetof(NDBOX, x) + sizeof(double)*(_dim))
|
|
#define CUBE_SIZE(_dim) (offsetof(NDBOX, x) + sizeof(double)*(_dim)*2)
|
|
|
|
/* fmgr interface macros */
|
|
#define DatumGetNDBOX(x) ((NDBOX *) PG_DETOAST_DATUM(x))
|
|
#define PG_GETARG_NDBOX(x) DatumGetNDBOX(PG_GETARG_DATUM(x))
|
|
#define PG_RETURN_NDBOX(x) PG_RETURN_POINTER(x)
|
|
|
|
/* GiST operator strategy numbers */
|
|
#define CubeKNNDistanceCoord 15 /* ~> */
|
|
#define CubeKNNDistanceTaxicab 16 /* <#> */
|
|
#define CubeKNNDistanceEuclid 17 /* <-> */
|
|
#define CubeKNNDistanceChebyshev 18 /* <=> */
|
|
|
|
/* in cubescan.l */
|
|
extern int cube_yylex(void);
|
|
extern void cube_yyerror(NDBOX **result, const char *message) pg_attribute_noreturn();
|
|
extern void cube_scanner_init(const char *str);
|
|
extern void cube_scanner_finish(void);
|
|
|
|
/* in cubeparse.y */
|
|
extern int cube_yyparse(NDBOX **result);
|