*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.93 2006/06/16 23:29:26 tgl Exp $
+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.94 2006/08/14 00:46:53 tgl Exp $
*
*-------------------------------------------------------------------------
*/
int *endtoken);
static PLpgSQL_expr *read_sql_stmt(const char *sqlstart);
static PLpgSQL_type *read_datatype(int tok);
-static PLpgSQL_stmt *make_select_stmt(void);
-static PLpgSQL_stmt *make_fetch_stmt(void);
+static PLpgSQL_stmt *make_select_stmt(int lineno);
+static PLpgSQL_stmt *make_fetch_stmt(int lineno, int curvar);
+static PLpgSQL_stmt *make_return_stmt(int lineno);
+static PLpgSQL_stmt *make_return_next_stmt(int lineno);
static void check_assignable(PLpgSQL_datum *datum);
static PLpgSQL_row *read_into_scalar_list(const char *initial_name,
PLpgSQL_datum *initial_datum);
%type <loop_body> loop_body
%type <stmt> proc_stmt pl_block
%type <stmt> stmt_assign stmt_if stmt_loop stmt_while stmt_exit
-%type <stmt> stmt_return stmt_return_next stmt_raise stmt_execsql
+%type <stmt> stmt_return stmt_raise stmt_execsql
%type <stmt> stmt_for stmt_select stmt_perform
%type <stmt> stmt_dynexecute stmt_getdiag
%type <stmt> stmt_open stmt_fetch stmt_close stmt_null
%token K_RENAME
%token K_RESULT_OID
%token K_RETURN
-%token K_RETURN_NEXT
%token K_REVERSE
%token K_SELECT
%token K_STRICT
{ $$ = $1; }
| stmt_return
{ $$ = $1; }
- | stmt_return_next
- { $$ = $1; }
| stmt_raise
{ $$ = $1; }
| stmt_execsql
stmt_select : K_SELECT lno
{
- $$ = make_select_stmt();
- $$->lineno = $2;
+ $$ = make_select_stmt($2);
}
;
stmt_return : K_RETURN lno
{
- PLpgSQL_stmt_return *new;
-
- new = palloc0(sizeof(PLpgSQL_stmt_return));
- new->cmd_type = PLPGSQL_STMT_RETURN;
- new->lineno = $2;
- new->expr = NULL;
- new->retvarno = -1;
+ int tok;
- if (plpgsql_curr_compile->fn_retset)
- {
- if (yylex() != ';')
- yyerror("RETURN cannot have a parameter in function returning set; use RETURN NEXT");
- }
- else if (plpgsql_curr_compile->out_param_varno >= 0)
- {
- if (yylex() != ';')
- yyerror("RETURN cannot have a parameter in function with OUT parameters");
- new->retvarno = plpgsql_curr_compile->out_param_varno;
- }
- else if (plpgsql_curr_compile->fn_rettype == VOIDOID)
+ tok = yylex();
+ if (tok == K_NEXT)
{
- if (yylex() != ';')
- yyerror("RETURN cannot have a parameter in function returning void");
- }
- else if (plpgsql_curr_compile->fn_retistuple)
- {
- switch (yylex())
- {
- case K_NULL:
- /* we allow this to support RETURN NULL in triggers */
- break;
-
- case T_ROW:
- new->retvarno = yylval.row->rowno;
- break;
-
- case T_RECORD:
- new->retvarno = yylval.rec->recno;
- break;
-
- default:
- yyerror("RETURN must specify a record or row variable in function returning tuple");
- break;
- }
- if (yylex() != ';')
- yyerror("RETURN must specify a record or row variable in function returning tuple");
+ $$ = make_return_next_stmt($2);
}
else
{
- /*
- * Note that a well-formed expression is
- * _required_ here; anything else is a
- * compile-time error.
- */
- new->expr = plpgsql_read_expression(';', ";");
+ plpgsql_push_back_token(tok);
+ $$ = make_return_stmt($2);
}
-
- $$ = (PLpgSQL_stmt *)new;
- }
- ;
-
-stmt_return_next: K_RETURN_NEXT lno
- {
- PLpgSQL_stmt_return_next *new;
-
- if (!plpgsql_curr_compile->fn_retset)
- yyerror("cannot use RETURN NEXT in a non-SETOF function");
-
- new = palloc0(sizeof(PLpgSQL_stmt_return_next));
- new->cmd_type = PLPGSQL_STMT_RETURN_NEXT;
- new->lineno = $2;
- new->expr = NULL;
- new->retvarno = -1;
-
- if (plpgsql_curr_compile->out_param_varno >= 0)
- {
- if (yylex() != ';')
- yyerror("RETURN NEXT cannot have a parameter in function with OUT parameters");
- new->retvarno = plpgsql_curr_compile->out_param_varno;
- }
- else if (plpgsql_curr_compile->fn_retistuple)
- {
- switch (yylex())
- {
- case T_ROW:
- new->retvarno = yylval.row->rowno;
- break;
-
- case T_RECORD:
- new->retvarno = yylval.rec->recno;
- break;
-
- default:
- yyerror("RETURN NEXT must specify a record or row variable in function returning tuple");
- break;
- }
- if (yylex() != ';')
- yyerror("RETURN NEXT must specify a record or row variable in function returning tuple");
- }
- else
- new->expr = plpgsql_read_expression(';', ";");
-
- $$ = (PLpgSQL_stmt *)new;
}
;
stmt_fetch : K_FETCH lno cursor_variable K_INTO
{
- PLpgSQL_stmt_fetch *new;
-
- new = (PLpgSQL_stmt_fetch *)make_fetch_stmt();
- new->curvar = $3;
-
- $$ = (PLpgSQL_stmt *)new;
- $$->lineno = $2;
+ $$ = make_fetch_stmt($2, $3);
}
;
}
static PLpgSQL_stmt *
-make_select_stmt(void)
+make_select_stmt(int lineno)
{
PLpgSQL_dstring ds;
int nparams = 0;
select = palloc0(sizeof(PLpgSQL_stmt_select));
select->cmd_type = PLPGSQL_STMT_SELECT;
+ select->lineno = lineno;
select->rec = rec;
select->row = row;
select->query = expr;
execsql = palloc(sizeof(PLpgSQL_stmt_execsql));
execsql->cmd_type = PLPGSQL_STMT_EXECSQL;
+ execsql->lineno = lineno;
execsql->sqlstmt = expr;
return (PLpgSQL_stmt *)execsql;
static PLpgSQL_stmt *
-make_fetch_stmt(void)
+make_fetch_stmt(int lineno, int curvar)
{
int tok;
PLpgSQL_row *row = NULL;
if (tok != ';')
yyerror("syntax error");
- fetch = palloc0(sizeof(PLpgSQL_stmt_select));
+ fetch = palloc0(sizeof(PLpgSQL_stmt_fetch));
fetch->cmd_type = PLPGSQL_STMT_FETCH;
- fetch->rec = rec;
- fetch->row = row;
+ fetch->lineno = lineno;
+ fetch->rec = rec;
+ fetch->row = row;
+ fetch->curvar = curvar;
+
+ return (PLpgSQL_stmt *) fetch;
+}
+
+
+static PLpgSQL_stmt *
+make_return_stmt(int lineno)
+{
+ PLpgSQL_stmt_return *new;
+
+ new = palloc0(sizeof(PLpgSQL_stmt_return));
+ new->cmd_type = PLPGSQL_STMT_RETURN;
+ new->lineno = lineno;
+ new->expr = NULL;
+ new->retvarno = -1;
+
+ if (plpgsql_curr_compile->fn_retset)
+ {
+ if (yylex() != ';')
+ yyerror("RETURN cannot have a parameter in function returning set; use RETURN NEXT");
+ }
+ else if (plpgsql_curr_compile->out_param_varno >= 0)
+ {
+ if (yylex() != ';')
+ yyerror("RETURN cannot have a parameter in function with OUT parameters");
+ new->retvarno = plpgsql_curr_compile->out_param_varno;
+ }
+ else if (plpgsql_curr_compile->fn_rettype == VOIDOID)
+ {
+ if (yylex() != ';')
+ yyerror("RETURN cannot have a parameter in function returning void");
+ }
+ else if (plpgsql_curr_compile->fn_retistuple)
+ {
+ switch (yylex())
+ {
+ case K_NULL:
+ /* we allow this to support RETURN NULL in triggers */
+ break;
+
+ case T_ROW:
+ new->retvarno = yylval.row->rowno;
+ break;
+
+ case T_RECORD:
+ new->retvarno = yylval.rec->recno;
+ break;
+
+ default:
+ yyerror("RETURN must specify a record or row variable in function returning tuple");
+ break;
+ }
+ if (yylex() != ';')
+ yyerror("RETURN must specify a record or row variable in function returning tuple");
+ }
+ else
+ {
+ /*
+ * Note that a well-formed expression is
+ * _required_ here; anything else is a
+ * compile-time error.
+ */
+ new->expr = plpgsql_read_expression(';', ";");
+ }
+
+ return (PLpgSQL_stmt *) new;
+}
+
+
+static PLpgSQL_stmt *
+make_return_next_stmt(int lineno)
+{
+ PLpgSQL_stmt_return_next *new;
+
+ if (!plpgsql_curr_compile->fn_retset)
+ yyerror("cannot use RETURN NEXT in a non-SETOF function");
+
+ new = palloc0(sizeof(PLpgSQL_stmt_return_next));
+ new->cmd_type = PLPGSQL_STMT_RETURN_NEXT;
+ new->lineno = lineno;
+ new->expr = NULL;
+ new->retvarno = -1;
+
+ if (plpgsql_curr_compile->out_param_varno >= 0)
+ {
+ if (yylex() != ';')
+ yyerror("RETURN NEXT cannot have a parameter in function with OUT parameters");
+ new->retvarno = plpgsql_curr_compile->out_param_varno;
+ }
+ else if (plpgsql_curr_compile->fn_retistuple)
+ {
+ switch (yylex())
+ {
+ case T_ROW:
+ new->retvarno = yylval.row->rowno;
+ break;
+
+ case T_RECORD:
+ new->retvarno = yylval.rec->recno;
+ break;
+
+ default:
+ yyerror("RETURN NEXT must specify a record or row variable in function returning tuple");
+ break;
+ }
+ if (yylex() != ';')
+ yyerror("RETURN NEXT must specify a record or row variable in function returning tuple");
+ }
+ else
+ new->expr = plpgsql_read_expression(';', ";");
- return (PLpgSQL_stmt *)fetch;
+ return (PLpgSQL_stmt *) new;
}
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.52 2006/06/16 23:29:27 tgl Exp $
+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/scan.l,v 1.53 2006/08/14 00:46:53 tgl Exp $
*
*-------------------------------------------------------------------------
*/
static bool scanner_typereported;
static int pushback_token;
static bool have_pushback_token;
-static int lookahead_token;
-static bool have_lookahead_token;
static const char *cur_line_start;
static int cur_line_num;
static char *dolqstart; /* current $foo$ quote start string */
/*
* This is the yylex routine called from outside. It exists to provide
- * a pushback facility, as well as to allow us to parse syntax that
- * requires more than one token of lookahead.
+ * a one-token pushback facility. Beware of trying to make it do more:
+ * for the most part, plpgsql's gram.y assumes that yytext is in step
+ * with the "current token".
*/
int
plpgsql_yylex(void)
{
- int cur_token;
-
if (have_pushback_token)
{
have_pushback_token = false;
- cur_token = pushback_token;
- }
- else if (have_lookahead_token)
- {
- have_lookahead_token = false;
- cur_token = lookahead_token;
- }
- else
- cur_token = yylex();
-
- /* Do we need to look ahead for a possible multiword token? */
- switch (cur_token)
- {
- /* RETURN NEXT must be reduced to a single token */
- case K_RETURN:
- if (!have_lookahead_token)
- {
- lookahead_token = yylex();
- have_lookahead_token = true;
- }
- if (lookahead_token == K_NEXT)
- {
- have_lookahead_token = false;
- cur_token = K_RETURN_NEXT;
- }
- break;
-
- default:
- break;
+ return pushback_token;
}
-
- return cur_token;
+ return yylex();
}
/*
* Push back a single token to be re-read by next plpgsql_yylex() call.
+ *
+ * NOTE: this does not cause yytext to "back up".
*/
void
plpgsql_push_back_token(int token)
scanner_typereported = false;
have_pushback_token = false;
- have_lookahead_token = false;
cur_line_start = scanbuf;
cur_line_num = 1;
projects / postgresql / commitdiff