database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Fix contrib/cube and contrib/seg to build with bison 3.0.

Browse Source 
These modules used the YYPARSE_PARAM macro, which has been deprecated
by the bison folk since 1.875, and which they finally removed in 3.0.
Adjust the code to use the replacement facility, %parse-param, which
is a much better solution anyway since it allows specification of the
type of the extra parser parameter.  We can thus get rid of a lot of
unsightly casting.

Back-patch to all active branches, since somebody might try to build
a back branch with up-to-date tools.
This commit is contained in:
Tom Lane
2013-07-29 10:42:44 -04:00
parent 8714465f0f
commit 9822dc38e1
6 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/seg/seg.c
View File

@ -23,8 +23,8 @@
PG_MODULE_MAGIC;
extern int seg_yyparse();
extern void seg_yyerror(const char *message);
extern int seg_yyparse(SEG *result);
extern void seg_yyerror(SEG *result, const char *message);
extern void seg_scanner_init(const char *str);
extern void seg_scanner_finish(void);
@ -126,7 +126,7 @@ seg_in(PG_FUNCTION_ARGS)
seg_scanner_init(str);
if (seg_yyparse(result) != 0)
seg_yyerror("bogus input");
seg_yyerror(result, "bogus input");
seg_scanner_finish();

69
contrib/seg/segparse.y
View File

@ -1,5 +1,5 @@
%{
#define YYPARSE_PARAM result /* need this to pass a pointer (void *) to yyparse */
/* contrib/seg/segparse.y */
#include "postgres.h"
@ -24,8 +24,8 @@ extern int seg_yylex(void);
extern int significant_digits(char *str); /* defined in seg.c */
void seg_yyerror(const char *message);
int seg_yyparse(void *result);
extern int seg_yyparse(SEG *result);
extern void seg_yyerror(SEG *result, const char *message);
static float seg_atof(char *value);
@ -40,6 +40,7 @@ static char strbuf[25] = {
%}
/* BISON Declarations */
%parse-param {SEG *result}
%expect 0
%name-prefix="seg_yy"
@ -65,59 +66,59 @@ static char strbuf[25] = {
range: boundary PLUMIN deviation
{
((SEG *)result)->lower = $1.val - $3.val;
((SEG *)result)->upper = $1.val + $3.val;
sprintf(strbuf, "%g", ((SEG *)result)->lower);
((SEG *)result)->l_sigd = Max(Min(6, significant_digits(strbuf)), Max($1.sigd, $3.sigd));
sprintf(strbuf, "%g", ((SEG *)result)->upper);
((SEG *)result)->u_sigd = Max(Min(6, significant_digits(strbuf)), Max($1.sigd, $3.sigd));
((SEG *)result)->l_ext = '\0';
((SEG *)result)->u_ext = '\0';
result->lower = $1.val - $3.val;
result->upper = $1.val + $3.val;
sprintf(strbuf, "%g", result->lower);
result->l_sigd = Max(Min(6, significant_digits(strbuf)), Max($1.sigd, $3.sigd));
sprintf(strbuf, "%g", result->upper);
result->u_sigd = Max(Min(6, significant_digits(strbuf)), Max($1.sigd, $3.sigd));
result->l_ext = '\0';
result->u_ext = '\0';
}
| boundary RANGE boundary
{
((SEG *)result)->lower = $1.val;
((SEG *)result)->upper = $3.val;
if ( ((SEG *)result)->lower > ((SEG *)result)->upper ) {
result->lower = $1.val;
result->upper = $3.val;
if ( result->lower > result->upper ) {
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("swapped boundaries: %g is greater than %g",
((SEG *)result)->lower, ((SEG *)result)->upper)));
result->lower, result->upper)));
YYERROR;
}
((SEG *)result)->l_sigd = $1.sigd;
((SEG *)result)->u_sigd = $3.sigd;
((SEG *)result)->l_ext = ( $1.ext ? $1.ext : '\0' );
((SEG *)result)->u_ext = ( $3.ext ? $3.ext : '\0' );
result->l_sigd = $1.sigd;
result->u_sigd = $3.sigd;
result->l_ext = ( $1.ext ? $1.ext : '\0' );
result->u_ext = ( $3.ext ? $3.ext : '\0' );
}
| boundary RANGE
{
((SEG *)result)->lower = $1.val;
((SEG *)result)->upper = HUGE_VAL;
((SEG *)result)->l_sigd = $1.sigd;
((SEG *)result)->u_sigd = 0;
((SEG *)result)->l_ext = ( $1.ext ? $1.ext : '\0' );
((SEG *)result)->u_ext = '-';
result->lower = $1.val;
result->upper = HUGE_VAL;
result->l_sigd = $1.sigd;
result->u_sigd = 0;
result->l_ext = ( $1.ext ? $1.ext : '\0' );
result->u_ext = '-';
}
| RANGE boundary
{
((SEG *)result)->lower = -HUGE_VAL;
((SEG *)result)->upper = $2.val;
((SEG *)result)->l_sigd = 0;
((SEG *)result)->u_sigd = $2.sigd;
((SEG *)result)->l_ext = '-';
((SEG *)result)->u_ext = ( $2.ext ? $2.ext : '\0' );
result->lower = -HUGE_VAL;
result->upper = $2.val;
result->l_sigd = 0;
result->u_sigd = $2.sigd;
result->l_ext = '-';
result->u_ext = ( $2.ext ? $2.ext : '\0' );
}
| boundary
{
((SEG *)result)->lower = ((SEG *)result)->upper = $1.val;
((SEG *)result)->l_sigd = ((SEG *)result)->u_sigd = $1.sigd;
((SEG *)result)->l_ext = ((SEG *)result)->u_ext = ( $1.ext ? $1.ext : '\0' );
result->lower = result->upper = $1.val;
result->l_sigd = result->u_sigd = $1.sigd;
result->l_ext = result->u_ext = ( $1.ext ? $1.ext : '\0' );
}
;

2
contrib/seg/segscan.l
View File

@ -54,7 +54,7 @@ float ({integer}|{real})([eE]{integer})?
%%
void
yyerror(const char *message)
yyerror(SEG *result, const char *message)
{
if (*yytext == YY_END_OF_BUFFER_CHAR)
{