|
4 | 4 | * procedural language |
5 | 5 | * |
6 | 6 | * IDENTIFICATION |
7 | | - * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.37 2002/09/01 16:28:06 tgl Exp $ |
| 7 | + * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.38 2002/09/22 21:56:47 tgl Exp $ |
8 | 8 | * |
9 | 9 | * This software is copyrighted by Jan Wieck - Hamburg. |
10 | 10 | * |
@@ -98,40 +98,40 @@ staticvoid check_assignable(PLpgSQL_datum *datum); |
98 | 98 | %type<declhdr>decl_sect |
99 | 99 | %type<varname>decl_varname |
100 | 100 | %type<str>decl_renname |
101 | | -%type<ival>decl_const,decl_notnull |
102 | | -%type<expr>decl_defval,decl_cursor_query |
| 101 | +%type<ival>decl_constdecl_notnull |
| 102 | +%type<expr>decl_defvaldecl_cursor_query |
103 | 103 | %type<dtype>decl_datatype |
104 | | -%type<row>decl_rowtype,decl_cursor_args,decl_cursor_arglist |
| 104 | +%type<row>decl_rowtypedecl_cursor_argsdecl_cursor_arglist |
105 | 105 | %type<nsitem>decl_aliasitem |
106 | | -%type<str>decl_stmts,decl_stmt |
| 106 | +%type<str>decl_stmtsdecl_stmt |
107 | 107 |
|
108 | | -%type<expr>expr_until_semi,expr_until_then,expr_until_loop |
| 108 | +%type<expr>expr_until_semiexpr_until_thenexpr_until_loop |
109 | 109 | %type<expr>opt_exitcond |
110 | 110 |
|
111 | | -%type<ival>assign_var,cursor_variable |
112 | | -%type<var>fori_var,cursor_varptr,decl_cursor_arg |
| 111 | +%type<ival>assign_varcursor_variable |
| 112 | +%type<var>fori_varcursor_varptrdecl_cursor_arg |
113 | 113 | %type<varname>fori_varname |
114 | 114 | %type<forilow>fori_lower |
115 | 115 | %type<rec>fors_target |
116 | 116 |
|
117 | | -%type<str>opt_lblname,opt_label |
| 117 | +%type<str>opt_lblnameopt_label |
118 | 118 | %type<str>opt_exitlabel |
119 | 119 | %type<str>execsql_start |
120 | 120 |
|
121 | | -%type<stmts>proc_sect,proc_stmts,stmt_else,loop_body |
122 | | -%type<stmt>proc_stmt,pl_block |
123 | | -%type<stmt>stmt_assign,stmt_if,stmt_loop,stmt_while,stmt_exit |
124 | | -%type<stmt>stmt_return,stmt_return_next,stmt_raise,stmt_execsql |
125 | | -%type<stmt>stmt_fori,stmt_fors,stmt_select,stmt_perform |
126 | | -%type<stmt>stmt_dynexecute,stmt_dynfors,stmt_getdiag |
127 | | -%type<stmt>stmt_open,stmt_fetch,stmt_close |
| 121 | +%type<stmts>proc_sectproc_stmtsstmt_elseloop_body |
| 122 | +%type<stmt>proc_stmtpl_block |
| 123 | +%type<stmt>stmt_assignstmt_ifstmt_loopstmt_whilestmt_exit |
| 124 | +%type<stmt>stmt_returnstmt_return_nextstmt_raisestmt_execsql |
| 125 | +%type<stmt>stmt_foristmt_forsstmt_selectstmt_perform |
| 126 | +%type<stmt>stmt_dynexecutestmt_dynforsstmt_getdiag |
| 127 | +%type<stmt>stmt_openstmt_fetchstmt_close |
128 | 128 |
|
129 | 129 | %type<intlist>raise_params |
130 | | -%type<ival>raise_level,raise_param |
| 130 | +%type<ival>raise_levelraise_param |
131 | 131 | %type<str>raise_msg |
132 | 132 |
|
133 | 133 | %type<dtlist>getdiag_list |
134 | | -%type<ival>getdiag_item,getdiag_target |
| 134 | +%type<ival>getdiag_itemgetdiag_target |
135 | 135 |
|
136 | 136 | %type<ival>lno |
137 | 137 |
|
|