pg_query 4.2.1 → 6.1.0

data/ext/pg_query/src_pl_plpgsql_src_pl_gram.c

@@ -222,36 +222,37 @@
      K_PG_EXCEPTION_CONTEXT = 354,
      K_PG_EXCEPTION_DETAIL = 355,
      K_PG_EXCEPTION_HINT = 356,
-     K_PRINT_STRICT_PARAMS = 357,
-     K_PRIOR = 358,
-     K_QUERY = 359,
-     K_RAISE = 360,
-     K_RELATIVE = 361,
-     K_RETURN = 362,
-     K_RETURNED_SQLSTATE = 363,
-     K_REVERSE = 364,
-     K_ROLLBACK = 365,
-     K_ROW_COUNT = 366,
-     K_ROWTYPE = 367,
-     K_SCHEMA = 368,
-     K_SCHEMA_NAME = 369,
-     K_SCROLL = 370,
-     K_SLICE = 371,
-     K_SQLSTATE = 372,
-     K_STACKED = 373,
-     K_STRICT = 374,
-     K_TABLE = 375,
-     K_TABLE_NAME = 376,
-     K_THEN = 377,
-     K_TO = 378,
-     K_TYPE = 379,
-     K_USE_COLUMN = 380,
-     K_USE_VARIABLE = 381,
-     K_USING = 382,
-     K_VARIABLE_CONFLICT = 383,
-     K_WARNING = 384,
-     K_WHEN = 385,
-     K_WHILE = 386
+     K_PG_ROUTINE_OID = 357,
+     K_PRINT_STRICT_PARAMS = 358,
+     K_PRIOR = 359,
+     K_QUERY = 360,
+     K_RAISE = 361,
+     K_RELATIVE = 362,
+     K_RETURN = 363,
+     K_RETURNED_SQLSTATE = 364,
+     K_REVERSE = 365,
+     K_ROLLBACK = 366,
+     K_ROW_COUNT = 367,
+     K_ROWTYPE = 368,
+     K_SCHEMA = 369,
+     K_SCHEMA_NAME = 370,
+     K_SCROLL = 371,
+     K_SLICE = 372,
+     K_SQLSTATE = 373,
+     K_STACKED = 374,
+     K_STRICT = 375,
+     K_TABLE = 376,
+     K_TABLE_NAME = 377,
+     K_THEN = 378,
+     K_TO = 379,
+     K_TYPE = 380,
+     K_USE_COLUMN = 381,
+     K_USE_VARIABLE = 382,
+     K_USING = 383,
+     K_VARIABLE_CONFLICT = 384,
+     K_WARNING = 385,
+     K_WHEN = 386,
+     K_WHILE = 387
    };
 #endif
 /* Tokens.  */
@@ -354,36 +355,37 @@
 #define K_PG_EXCEPTION_CONTEXT 354
 #define K_PG_EXCEPTION_DETAIL 355
 #define K_PG_EXCEPTION_HINT 356
-#define K_PRINT_STRICT_PARAMS 357
-#define K_PRIOR 358
-#define K_QUERY 359
-#define K_RAISE 360
-#define K_RELATIVE 361
-#define K_RETURN 362
-#define K_RETURNED_SQLSTATE 363
-#define K_REVERSE 364
-#define K_ROLLBACK 365
-#define K_ROW_COUNT 366
-#define K_ROWTYPE 367
-#define K_SCHEMA 368
-#define K_SCHEMA_NAME 369
-#define K_SCROLL 370
-#define K_SLICE 371
-#define K_SQLSTATE 372
-#define K_STACKED 373
-#define K_STRICT 374
-#define K_TABLE 375
-#define K_TABLE_NAME 376
-#define K_THEN 377
-#define K_TO 378
-#define K_TYPE 379
-#define K_USE_COLUMN 380
-#define K_USE_VARIABLE 381
-#define K_USING 382
-#define K_VARIABLE_CONFLICT 383
-#define K_WARNING 384
-#define K_WHEN 385
-#define K_WHILE 386
+#define K_PG_ROUTINE_OID 357
+#define K_PRINT_STRICT_PARAMS 358
+#define K_PRIOR 359
+#define K_QUERY 360
+#define K_RAISE 361
+#define K_RELATIVE 362
+#define K_RETURN 363
+#define K_RETURNED_SQLSTATE 364
+#define K_REVERSE 365
+#define K_ROLLBACK 366
+#define K_ROW_COUNT 367
+#define K_ROWTYPE 368
+#define K_SCHEMA 369
+#define K_SCHEMA_NAME 370
+#define K_SCROLL 371
+#define K_SLICE 372
+#define K_SQLSTATE 373
+#define K_STACKED 374
+#define K_STRICT 375
+#define K_TABLE 376
+#define K_TABLE_NAME 377
+#define K_THEN 378
+#define K_TO 379
+#define K_TYPE 380
+#define K_USE_COLUMN 381
+#define K_USE_VARIABLE 382
+#define K_USING 383
+#define K_VARIABLE_CONFLICT 384
+#define K_WARNING 385
+#define K_WHEN 386
+#define K_WHILE 387
 
 
 
@@ -395,7 +397,7 @@
  *
  * pl_gram.y			- Parser for the PL/pgSQL procedural language
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -431,10 +433,7 @@
 /*
  * Bison doesn't allocate anything that needs to live across parser calls,
  * so we can easily have it use palloc instead of malloc.  This prevents
- * memory leaks if we error out during parsing.  Note this only works with
- * bison >= 2.0.  However, in bison 1.875 the default is to use alloca()
- * if possible, so there's not really much problem anyhow, at least if
- * you're building with gcc.
+ * memory leaks if we error out during parsing.
  */
 #define YYMALLOC palloc
 #define YYFREE   pfree
@@ -461,7 +460,6 @@ static	PLpgSQL_expr	*read_sql_construct(int until,
 											RawParseMode parsemode,
 											bool isexpression,
 											bool valid_sql,
-											bool trim,
 											int *startloc,
 											int *endtoken);
 static	PLpgSQL_expr	*read_sql_expression(int until,
@@ -471,7 +469,8 @@ static	PLpgSQL_expr	*read_sql_expression2(int until, int until2,
 											  int *endtoken);
 static	PLpgSQL_expr	*read_sql_stmt(void);
 static	PLpgSQL_type	*read_datatype(int tok);
-static	PLpgSQL_stmt	*make_execsql_stmt(int firsttoken, int location);
+static	PLpgSQL_stmt	*make_execsql_stmt(int firsttoken, int location,
+										   PLword *word);
 static	PLpgSQL_stmt_fetch *read_fetch_direction(void);
 static	void			 complete_direction(PLpgSQL_stmt_fetch *fetch,
 											bool *check_FROM);
@@ -524,7 +523,7 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 120 "pl_gram.y"
+#line 117 "pl_gram.y"
 {
 	core_YYSTYPE core_yystype;
 	/* these fields must match core_YYSTYPE: */
@@ -576,7 +575,7 @@ typedef union YYSTYPE
 	PLpgSQL_case_when *casewhen;
 }
 /* Line 193 of yacc.c.  */
-#line 531 "pl_gram.c"
+#line 530 "pl_gram.c"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -601,7 +600,7 @@ typedef struct YYLTYPE
 
 
 /* Line 216 of yacc.c.  */
-#line 556 "pl_gram.c"
+#line 555 "pl_gram.c"
 
 #ifdef short
 # undef short
@@ -818,20 +817,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1382
+#define YYLAST   1335
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  138
+#define YYNTOKENS  139
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  87
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  252
+#define YYNRULES  253
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  333
+#define YYNSTATES  334
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   386
+#define YYMAXUTOK   387
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -842,10 +841,10 @@ static const yytype_uint8 yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,   132,     2,     2,     2,     2,
-     134,   135,     2,     2,   136,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,   133,
-       2,   137,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,   133,     2,     2,     2,     2,
+     135,   136,     2,     2,   137,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,   134,
+       2,   138,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -877,7 +876,7 @@ static const yytype_uint8 yytranslate[] =
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131
+     125,   126,   127,   128,   129,   130,   131,   132
 };
 
 #if YYDEBUG
@@ -910,57 +909,57 @@ static const yytype_uint16 yyprhs[] =
      544,   546,   548,   550,   552,   554,   556,   558,   560,   562,
      564,   566,   568,   570,   572,   574,   576,   578,   580,   582,
      584,   586,   588,   590,   592,   594,   596,   598,   600,   602,
-     604,   606,   608
+     604,   606,   608,   610
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     139,     0,    -1,   140,   144,   143,    -1,    -1,   140,   141,
-      -1,   132,    94,    57,    -1,   132,   102,   142,    -1,   132,
-     128,    62,    -1,   132,   128,   126,    -1,   132,   128,   125,
-      -1,    22,    -1,   224,    -1,    -1,   133,    -1,   145,    34,
-     166,   210,    60,   221,    -1,   219,    -1,   219,   146,    -1,
-     219,   146,   147,    -1,    52,    -1,   147,   148,    -1,   148,
-      -1,   149,    -1,    52,    -1,    25,   223,    26,    -1,   158,
-     159,   160,   161,   162,   163,    -1,   158,    28,    68,   157,
-     133,    -1,    -1,   158,   151,    49,   150,   153,   156,   152,
-      -1,    -1,    89,   115,    -1,   115,    -1,    -1,    -1,   134,
-     154,   135,    -1,   155,    -1,   154,   136,   155,    -1,   158,
-     160,    -1,    80,    -1,    68,    -1,    22,    -1,   224,    -1,
-      23,    -1,    22,    -1,   224,    -1,    -1,    44,    -1,    -1,
-      -1,    40,    22,    -1,    40,   224,    -1,    40,    23,    -1,
-      -1,    90,    92,    -1,   133,    -1,   164,    -1,   165,    -1,
-      53,    -1,   137,    -1,    15,    -1,    -1,   166,   167,    -1,
-     144,   133,    -1,   170,    -1,   177,    -1,   180,    -1,   185,
-      -1,   186,    -1,   187,    -1,   190,    -1,   192,    -1,   194,
-      -1,   195,    -1,   196,    -1,   198,    -1,   199,    -1,   168,
-      -1,   169,    -1,   171,    -1,   200,    -1,   201,    -1,   202,
-      -1,   204,    -1,   205,    -1,   206,    -1,   207,    -1,    96,
-      -1,    36,    -1,    56,    -1,    24,    -1,    72,   172,    55,
-     173,   133,    -1,    -1,    48,    -1,   118,    -1,   173,   136,
-     174,    -1,   174,    -1,   176,   165,   175,    -1,    -1,    24,
-      -1,    22,    -1,    23,    -1,    74,   217,   166,   178,   179,
-      60,    74,   133,    -1,    -1,   178,    59,   217,   166,    -1,
-      -1,    58,   166,    -1,    37,   181,   182,   184,    60,    37,
-     133,    -1,    -1,   182,   183,    -1,   183,    -1,   130,   217,
-     166,    -1,    -1,    58,   166,    -1,   220,    83,   197,    -1,
-     220,   131,   218,   197,    -1,   220,    68,   188,   197,    -1,
-     189,    76,    -1,    24,    -1,    22,    -1,    23,    -1,   220,
-      69,   189,   191,    76,    31,   218,   197,    -1,    -1,   116,
-      11,    -1,   193,   221,   222,    -1,    65,    -1,    47,    -1,
-     107,    -1,   105,    -1,    32,    -1,   166,    60,    83,   221,
-     133,    -1,    75,    -1,    78,    -1,    84,    -1,    22,    -1,
-      23,    -1,    64,    -1,    93,   209,    -1,    66,   203,   209,
-      79,    -1,    87,   203,   209,   133,    -1,    -1,    39,   209,
-     133,    -1,    92,   133,    -1,    43,   208,   133,    -1,   110,
-     208,   133,    -1,    30,    38,    -1,    30,    89,    38,    -1,
+     140,     0,    -1,   141,   145,   144,    -1,    -1,   141,   142,
+      -1,   133,    94,    57,    -1,   133,   103,   143,    -1,   133,
+     129,    62,    -1,   133,   129,   127,    -1,   133,   129,   126,
+      -1,    22,    -1,   225,    -1,    -1,   134,    -1,   146,    34,
+     167,   211,    60,   222,    -1,   220,    -1,   220,   147,    -1,
+     220,   147,   148,    -1,    52,    -1,   148,   149,    -1,   149,
+      -1,   150,    -1,    52,    -1,    25,   224,    26,    -1,   159,
+     160,   161,   162,   163,   164,    -1,   159,    28,    68,   158,
+     134,    -1,    -1,   159,   152,    49,   151,   154,   157,   153,
+      -1,    -1,    89,   116,    -1,   116,    -1,    -1,    -1,   135,
+     155,   136,    -1,   156,    -1,   155,   137,   156,    -1,   159,
+     161,    -1,    80,    -1,    68,    -1,    22,    -1,   225,    -1,
+      23,    -1,    22,    -1,   225,    -1,    -1,    44,    -1,    -1,
+      -1,    40,    22,    -1,    40,   225,    -1,    40,    23,    -1,
+      -1,    90,    92,    -1,   134,    -1,   165,    -1,   166,    -1,
+      53,    -1,   138,    -1,    15,    -1,    -1,   167,   168,    -1,
+     145,   134,    -1,   171,    -1,   178,    -1,   181,    -1,   186,
+      -1,   187,    -1,   188,    -1,   191,    -1,   193,    -1,   195,
+      -1,   196,    -1,   197,    -1,   199,    -1,   200,    -1,   169,
+      -1,   170,    -1,   172,    -1,   201,    -1,   202,    -1,   203,
+      -1,   205,    -1,   206,    -1,   207,    -1,   208,    -1,    96,
+      -1,    36,    -1,    56,    -1,    24,    -1,    72,   173,    55,
+     174,   134,    -1,    -1,    48,    -1,   119,    -1,   174,   137,
+     175,    -1,   175,    -1,   177,   166,   176,    -1,    -1,    24,
+      -1,    22,    -1,    23,    -1,    74,   218,   167,   179,   180,
+      60,    74,   134,    -1,    -1,   179,    59,   218,   167,    -1,
+      -1,    58,   167,    -1,    37,   182,   183,   185,    60,    37,
+     134,    -1,    -1,   183,   184,    -1,   184,    -1,   131,   218,
+     167,    -1,    -1,    58,   167,    -1,   221,    83,   198,    -1,
+     221,   132,   219,   198,    -1,   221,    68,   189,   198,    -1,
+     190,    76,    -1,    24,    -1,    22,    -1,    23,    -1,   221,
+      69,   190,   192,    76,    31,   219,   198,    -1,    -1,   117,
+      11,    -1,   194,   222,   223,    -1,    65,    -1,    47,    -1,
+     108,    -1,   106,    -1,    32,    -1,   167,    60,    83,   222,
+     134,    -1,    75,    -1,    78,    -1,    84,    -1,    22,    -1,
+      23,    -1,    64,    -1,    93,   210,    -1,    66,   204,   210,
+      79,    -1,    87,   204,   210,   134,    -1,    -1,    39,   210,
+     134,    -1,    92,   134,    -1,    43,   209,   134,    -1,   111,
+     209,   134,    -1,    30,    38,    -1,    30,    89,    38,    -1,
       -1,    24,    -1,    22,    -1,    23,    -1,    -1,    -1,    63,
-     211,   212,    -1,   212,   213,    -1,   213,    -1,   130,   214,
-     122,   166,    -1,   214,    95,   215,    -1,   215,    -1,   223,
-      -1,    -1,    -1,    -1,    -1,    25,   223,    26,    -1,    -1,
-      25,   223,    26,    -1,    -1,   223,    -1,   133,    -1,   130,
-     216,    -1,    22,    -1,   224,    -1,    24,    -1,    27,    -1,
+     212,   213,    -1,   213,   214,    -1,   214,    -1,   131,   215,
+     123,   167,    -1,   215,    95,   216,    -1,   216,    -1,   224,
+      -1,    -1,    -1,    -1,    -1,    25,   224,    26,    -1,    -1,
+      25,   224,    26,    -1,    -1,   224,    -1,   134,    -1,   131,
+     217,    -1,    22,    -1,   225,    -1,    24,    -1,    27,    -1,
       28,    -1,    30,    -1,    31,    -1,    32,    -1,    33,    -1,
       36,    -1,    38,    -1,    39,    -1,    40,    -1,    41,    -1,
       42,    -1,    43,    -1,    44,    -1,    45,    -1,    46,    -1,
@@ -975,39 +974,40 @@ static const yytype_int16 yyrhs[] =
      101,    -1,   102,    -1,   103,    -1,   104,    -1,   105,    -1,
      106,    -1,   107,    -1,   108,    -1,   109,    -1,   110,    -1,
      111,    -1,   112,    -1,   113,    -1,   114,    -1,   115,    -1,
-     116,    -1,   117,    -1,   118,    -1,   120,    -1,   121,    -1,
-     124,    -1,   125,    -1,   126,    -1,   128,    -1,   129,    -1
+     116,    -1,   117,    -1,   118,    -1,   119,    -1,   121,    -1,
+     122,    -1,   125,    -1,   126,    -1,   127,    -1,   129,    -1,
+     130,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   362,   362,   368,   369,   372,   376,   385,   389,   393,
-     399,   403,   408,   409,   412,   435,   443,   450,   459,   471,
-     472,   475,   476,   480,   493,   531,   537,   536,   590,   593,
-     597,   604,   610,   613,   644,   648,   654,   662,   663,   665,
-     680,   695,   723,   751,   782,   783,   788,   799,   800,   805,
-     810,   817,   818,   822,   824,   830,   831,   839,   840,   844,
-     845,   855,   857,   859,   861,   863,   865,   867,   869,   871,
-     873,   875,   877,   879,   881,   883,   885,   887,   889,   891,
-     893,   895,   897,   899,   901,   905,   941,   959,   980,  1019,
-    1082,  1085,  1089,  1095,  1099,  1105,  1118,  1162,  1180,  1185,
-    1192,  1210,  1213,  1227,  1230,  1236,  1243,  1257,  1261,  1267,
-    1279,  1282,  1297,  1315,  1334,  1368,  1627,  1653,  1667,  1674,
-    1713,  1716,  1722,  1775,  1779,  1785,  1811,  1956,  1980,  1998,
-    2002,  2006,  2010,  2021,  2034,  2098,  2176,  2206,  2219,  2224,
-    2238,  2245,  2259,  2274,  2275,  2276,  2280,  2302,  2307,  2315,
-    2317,  2316,  2358,  2362,  2368,  2381,  2390,  2396,  2433,  2437,
-    2441,  2445,  2449,  2457,  2461,  2469,  2472,  2479,  2481,  2488,
-    2492,  2496,  2505,  2506,  2507,  2508,  2509,  2510,  2511,  2512,
-    2513,  2514,  2515,  2516,  2517,  2518,  2519,  2520,  2521,  2522,
-    2523,  2524,  2525,  2526,  2527,  2528,  2529,  2530,  2531,  2532,
-    2533,  2534,  2535,  2536,  2537,  2538,  2539,  2540,  2541,  2542,
-    2543,  2544,  2545,  2546,  2547,  2548,  2549,  2550,  2551,  2552,
-    2553,  2554,  2555,  2556,  2557,  2558,  2559,  2560,  2561,  2562,
-    2563,  2564,  2565,  2566,  2567,  2568,  2569,  2570,  2571,  2572,
-    2573,  2574,  2575,  2576,  2577,  2578,  2579,  2580,  2581,  2582,
-    2583,  2584,  2585
+       0,   360,   360,   366,   367,   370,   374,   383,   387,   391,
+     397,   401,   406,   407,   410,   433,   441,   448,   457,   469,
+     470,   473,   474,   478,   491,   529,   535,   534,   561,   564,
+     568,   575,   581,   584,   615,   619,   625,   633,   634,   636,
+     651,   666,   694,   722,   753,   754,   759,   771,   772,   777,
+     782,   789,   790,   794,   796,   802,   803,   811,   812,   816,
+     817,   827,   829,   831,   833,   835,   837,   839,   841,   843,
+     845,   847,   849,   851,   853,   855,   857,   859,   861,   863,
+     865,   867,   869,   871,   873,   877,   913,   931,   952,   991,
+    1055,  1058,  1062,  1068,  1072,  1078,  1091,  1138,  1156,  1161,
+    1168,  1186,  1189,  1203,  1206,  1212,  1219,  1233,  1237,  1243,
+    1255,  1258,  1273,  1291,  1310,  1344,  1602,  1628,  1642,  1649,
+    1688,  1691,  1697,  1750,  1754,  1760,  1786,  1931,  1955,  1973,
+    1977,  1981,  1985,  1996,  2009,  2073,  2151,  2181,  2194,  2199,
+    2213,  2220,  2234,  2249,  2250,  2251,  2255,  2277,  2282,  2290,
+    2292,  2291,  2333,  2337,  2343,  2356,  2365,  2371,  2408,  2412,
+    2416,  2420,  2424,  2432,  2436,  2444,  2447,  2454,  2456,  2463,
+    2467,  2471,  2480,  2481,  2482,  2483,  2484,  2485,  2486,  2487,
+    2488,  2489,  2490,  2491,  2492,  2493,  2494,  2495,  2496,  2497,
+    2498,  2499,  2500,  2501,  2502,  2503,  2504,  2505,  2506,  2507,
+    2508,  2509,  2510,  2511,  2512,  2513,  2514,  2515,  2516,  2517,
+    2518,  2519,  2520,  2521,  2522,  2523,  2524,  2525,  2526,  2527,
+    2528,  2529,  2530,  2531,  2532,  2533,  2534,  2535,  2536,  2537,
+    2538,  2539,  2540,  2541,  2542,  2543,  2544,  2545,  2546,  2547,
+    2548,  2549,  2550,  2551,  2552,  2553,  2554,  2555,  2556,  2557,
+    2558,  2559,  2560,  2561
 };
 #endif
 
@@ -1034,10 +1034,10 @@ static const char *const yytname[] =
   "K_NEXT", "K_NO", "K_NOT", "K_NOTICE", "K_NULL", "K_OPEN", "K_OPTION",
   "K_OR", "K_PERFORM", "K_PG_CONTEXT", "K_PG_DATATYPE_NAME",
   "K_PG_EXCEPTION_CONTEXT", "K_PG_EXCEPTION_DETAIL", "K_PG_EXCEPTION_HINT",
-  "K_PRINT_STRICT_PARAMS", "K_PRIOR", "K_QUERY", "K_RAISE", "K_RELATIVE",
-  "K_RETURN", "K_RETURNED_SQLSTATE", "K_REVERSE", "K_ROLLBACK",
-  "K_ROW_COUNT", "K_ROWTYPE", "K_SCHEMA", "K_SCHEMA_NAME", "K_SCROLL",
-  "K_SLICE", "K_SQLSTATE", "K_STACKED", "K_STRICT", "K_TABLE",
+  "K_PG_ROUTINE_OID", "K_PRINT_STRICT_PARAMS", "K_PRIOR", "K_QUERY",
+  "K_RAISE", "K_RELATIVE", "K_RETURN", "K_RETURNED_SQLSTATE", "K_REVERSE",
+  "K_ROLLBACK", "K_ROW_COUNT", "K_ROWTYPE", "K_SCHEMA", "K_SCHEMA_NAME",
+  "K_SCROLL", "K_SLICE", "K_SQLSTATE", "K_STACKED", "K_STRICT", "K_TABLE",
   "K_TABLE_NAME", "K_THEN", "K_TO", "K_TYPE", "K_USE_COLUMN",
   "K_USE_VARIABLE", "K_USING", "K_VARIABLE_CONFLICT", "K_WARNING",
   "K_WHEN", "K_WHILE", "'#'", "';'", "'('", "')'", "','", "'='", "$accept",
@@ -1084,39 +1084,39 @@ static const yytype_uint16 yytoknum[] =
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,    35,    59,    40,    41,    44,    61
+     385,   386,   387,    35,    59,    40,    41,    44,    61
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,   138,   139,   140,   140,   141,   141,   141,   141,   141,
-     142,   142,   143,   143,   144,   145,   145,   145,   146,   147,
-     147,   148,   148,   148,   149,   149,   150,   149,   151,   151,
-     151,   152,   153,   153,   154,   154,   155,   156,   156,   157,
-     157,   157,   158,   158,   159,   159,   160,   161,   161,   161,
-     161,   162,   162,   163,   163,   164,   164,   165,   165,   166,
-     166,   167,   167,   167,   167,   167,   167,   167,   167,   167,
-     167,   167,   167,   167,   167,   167,   167,   167,   167,   167,
-     167,   167,   167,   167,   167,   168,   169,   169,   170,   171,
-     172,   172,   172,   173,   173,   174,   175,   176,   176,   176,
-     177,   178,   178,   179,   179,   180,   181,   182,   182,   183,
-     184,   184,   185,   186,   187,   188,   189,   189,   189,   190,
-     191,   191,   192,   193,   193,   194,   195,   196,   197,   198,
-     198,   198,   198,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   208,   208,   209,   209,   209,   210,
-     211,   210,   212,   212,   213,   214,   214,   215,   216,   217,
-     218,   219,   219,   220,   220,   221,   221,   222,   222,   223,
-     223,   223,   224,   224,   224,   224,   224,   224,   224,   224,
-     224,   224,   224,   224,   224,   224,   224,   224,   224,   224,
-     224,   224,   224,   224,   224,   224,   224,   224,   224,   224,
-     224,   224,   224,   224,   224,   224,   224,   224,   224,   224,
-     224,   224,   224,   224,   224,   224,   224,   224,   224,   224,
-     224,   224,   224,   224,   224,   224,   224,   224,   224,   224,
-     224,   224,   224,   224,   224,   224,   224,   224,   224,   224,
-     224,   224,   224,   224,   224,   224,   224,   224,   224,   224,
-     224,   224,   224
+       0,   139,   140,   141,   141,   142,   142,   142,   142,   142,
+     143,   143,   144,   144,   145,   146,   146,   146,   147,   148,
+     148,   149,   149,   149,   150,   150,   151,   150,   152,   152,
+     152,   153,   154,   154,   155,   155,   156,   157,   157,   158,
+     158,   158,   159,   159,   160,   160,   161,   162,   162,   162,
+     162,   163,   163,   164,   164,   165,   165,   166,   166,   167,
+     167,   168,   168,   168,   168,   168,   168,   168,   168,   168,
+     168,   168,   168,   168,   168,   168,   168,   168,   168,   168,
+     168,   168,   168,   168,   168,   169,   170,   170,   171,   172,
+     173,   173,   173,   174,   174,   175,   176,   177,   177,   177,
+     178,   179,   179,   180,   180,   181,   182,   183,   183,   184,
+     185,   185,   186,   187,   188,   189,   190,   190,   190,   191,
+     192,   192,   193,   194,   194,   195,   196,   197,   198,   199,
+     199,   199,   199,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   209,   209,   210,   210,   210,   211,
+     212,   211,   213,   213,   214,   215,   215,   216,   217,   218,
+     219,   220,   220,   221,   221,   222,   222,   223,   223,   224,
+     224,   224,   225,   225,   225,   225,   225,   225,   225,   225,
+     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
+     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
+     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
+     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
+     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
+     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
+     225,   225,   225,   225,   225,   225,   225,   225,   225,   225,
+     225,   225,   225,   225
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1147,7 +1147,7 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1
+       1,     1,     1,     1
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1164,100 +1164,100 @@ static const yytype_uint8 yydefact[] =
      220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
      230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
      240,   241,   242,   243,   244,   245,   246,   247,   248,   249,
-     250,   251,   252,     0,   170,     0,     0,     0,    13,     2,
-      59,    18,    16,   162,     5,    10,     6,    11,     7,     9,
-       8,   163,    42,     0,    22,    17,    20,    21,    44,    43,
-     132,   133,    88,     0,   127,    86,   106,     0,   145,   124,
-      87,   150,   134,   123,   138,    90,   159,   129,   130,   131,
-     138,     0,     0,    85,   126,   125,   145,     0,    60,    75,
-      76,    62,    77,    63,    64,    65,    66,    67,    68,    69,
-     165,    70,    71,    72,    73,    74,    78,    79,    80,    81,
-      82,    83,    84,     0,     0,     0,    19,     0,    45,     0,
-      30,     0,    46,     0,     0,   147,   148,   146,     0,     0,
-       0,     0,     0,    91,    92,     0,    59,     0,   140,   135,
-       0,    61,     0,   166,   165,     0,     0,    59,   160,    23,
-       0,    29,    26,    47,   164,   159,   110,   108,   139,   143,
-       0,   141,     0,   151,   153,     0,     0,   163,     0,   142,
-     158,   167,   122,    14,   117,   118,   116,    59,     0,   120,
-     163,   112,    59,    39,    41,     0,    40,    32,     0,    51,
-      59,    59,   107,     0,   144,     0,   156,   157,   152,   136,
-      98,    99,    97,     0,    94,     0,   103,   137,   168,   114,
-     115,     0,     0,     0,   113,    25,     0,     0,    48,    50,
-      49,     0,     0,   163,   163,     0,     0,    59,    89,     0,
-      58,    57,    96,    59,   159,     0,   121,     0,   165,     0,
-      34,    46,    38,    37,    31,    52,    56,    53,    24,    54,
-      55,     0,   155,   163,    93,    95,   163,    59,     0,   160,
-       0,    33,     0,    36,    27,   105,   163,     0,    59,   128,
-      35,   100,   119
+     250,   251,   252,   253,     0,   170,     0,     0,     0,    13,
+       2,    59,    18,    16,   162,     5,    10,     6,    11,     7,
+       9,     8,   163,    42,     0,    22,    17,    20,    21,    44,
+      43,   132,   133,    88,     0,   127,    86,   106,     0,   145,
+     124,    87,   150,   134,   123,   138,    90,   159,   129,   130,
+     131,   138,     0,     0,    85,   126,   125,   145,     0,    60,
+      75,    76,    62,    77,    63,    64,    65,    66,    67,    68,
+      69,   165,    70,    71,    72,    73,    74,    78,    79,    80,
+      81,    82,    83,    84,     0,     0,     0,    19,     0,    45,
+       0,    30,     0,    46,     0,     0,   147,   148,   146,     0,
+       0,     0,     0,     0,    91,    92,     0,    59,     0,   140,
+     135,     0,    61,     0,   166,   165,     0,     0,    59,   160,
+      23,     0,    29,    26,    47,   164,   159,   110,   108,   139,
+     143,     0,   141,     0,   151,   153,     0,     0,   163,     0,
+     142,   158,   167,   122,    14,   117,   118,   116,    59,     0,
+     120,   163,   112,    59,    39,    41,     0,    40,    32,     0,
+      51,    59,    59,   107,     0,   144,     0,   156,   157,   152,
+     136,    98,    99,    97,     0,    94,     0,   103,   137,   168,
+     114,   115,     0,     0,     0,   113,    25,     0,     0,    48,
+      50,    49,     0,     0,   163,   163,     0,     0,    59,    89,
+       0,    58,    57,    96,    59,   159,     0,   121,     0,   165,
+       0,    34,    46,    38,    37,    31,    52,    56,    53,    24,
+      54,    55,     0,   155,   163,    93,    95,   163,    59,     0,
+     160,     0,    33,     0,    36,    27,   105,   163,     0,    59,
+     128,    35,   100,   119
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,     2,     6,   106,    99,   147,     8,   102,   115,
-     116,   117,   247,   181,   324,   277,   299,   300,   304,   245,
-     118,   182,   213,   249,   282,   308,   309,   292,   240,   148,
-     149,   150,   151,   152,   195,   263,   264,   315,   265,   153,
-     266,   295,   154,   184,   216,   217,   253,   155,   156,   157,
-     237,   238,   158,   272,   159,   160,   161,   162,   163,   241,
-     164,   165,   166,   167,   168,   192,   169,   170,   171,   172,
-     190,   188,   173,   191,   223,   224,   255,   256,   268,   196,
-     242,     9,   174,   202,   232,   203,    94
+      -1,     1,     2,     6,   107,   100,   148,     8,   103,   116,
+     117,   118,   248,   182,   325,   278,   300,   301,   305,   246,
+     119,   183,   214,   250,   283,   309,   310,   293,   241,   149,
+     150,   151,   152,   153,   196,   264,   265,   316,   266,   154,
+     267,   296,   155,   185,   217,   218,   254,   156,   157,   158,
+     238,   239,   159,   273,   160,   161,   162,   163,   164,   242,
+     165,   166,   167,   168,   169,   193,   170,   171,   172,   173,
+     191,   189,   174,   192,   224,   225,   256,   257,   269,   197,
+     243,     9,   175,   203,   233,   204,    95
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -253
+#define YYPACT_NINF -260
 static const yytype_int16 yypact[] =
 {
-    -253,    36,   -20,  -253,   353,   -49,  -253,   -87,    14,    -2,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  -253,  -253,    26,  -253,    -3,   674,   -40,  -253,  -253,
-    -253,  -253,   245,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  1041,  -253,   353,  -253,   245,  -253,  -253,    -7,  -253,
-    -253,  -253,  -253,   353,  -253,  -253,  -253,    49,    38,  -253,
-    -253,  -253,  -253,  -253,  -253,   -38,  -253,  -253,  -253,  -253,
-    -253,   -59,    49,  -253,  -253,  -253,    38,   -34,  -253,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-     353,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  -253,  -253,    34,   -50,    80,  -253,    27,  -253,    -5,
-    -253,    58,  -253,    85,   -17,  -253,  -253,  -253,   -19,     1,
-     -16,   -14,    49,  -253,  -253,    63,  -253,    49,  -253,  -253,
-     -11,  -253,   -98,  -253,   353,    69,    69,  -253,  -253,  -253,
-     461,  -253,  -253,    83,    -8,  -253,   -41,  -253,  -253,  -253,
-      88,  -253,   353,   -14,  -253,    48,    81,   887,    -1,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,    52,    13,
-    1118,  -253,  -253,  -253,  -253,     0,  -253,     2,   569,    40,
-    -253,  -253,  -253,    71,  -253,   -64,  -253,  -253,  -253,  -253,
-    -253,  -253,  -253,   -72,  -253,   -12,    18,  -253,  -253,  -253,
-    -253,   123,    59,    54,  -253,  -253,   779,   -39,  -253,  -253,
-    -253,    46,   -13,    -9,  1195,   102,   353,  -253,  -253,    81,
-    -253,  -253,  -253,  -253,  -253,    82,  -253,   109,   353,   -76,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,     8,  -253,   124,  -253,  -253,  1272,  -253,    70,  -253,
-      10,  -253,   779,  -253,  -253,  -253,   964,    12,  -253,  -253,
-    -253,  -253,  -253
+    -260,    21,   -20,  -260,   355,   -61,  -260,   -99,     3,     7,
+    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,  -260,  -260,  -260,    22,  -260,    23,   679,   -38,  -260,
+    -260,  -260,  -260,   246,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,  -260,  1026,  -260,   355,  -260,   246,  -260,  -260,   -18,
+    -260,  -260,  -260,  -260,   355,  -260,  -260,  -260,    30,    49,
+    -260,  -260,  -260,  -260,  -260,  -260,   -37,  -260,  -260,  -260,
+    -260,  -260,   -48,    30,  -260,  -260,  -260,    49,   -33,  -260,
+    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,   355,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,  -260,  -260,  -260,    36,   -23,    78,  -260,    37,  -260,
+     -10,  -260,    58,  -260,    85,   -17,  -260,  -260,  -260,   -22,
+     -19,   -16,   -15,    30,  -260,  -260,    62,  -260,    30,  -260,
+    -260,   -11,  -260,   -95,  -260,   355,    68,    68,  -260,  -260,
+    -260,   464,  -260,  -260,    79,    -2,  -260,   -50,  -260,  -260,
+    -260,    86,  -260,   355,   -15,  -260,    48,    71,   894,    -6,
+    -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,    53,
+      13,  1092,  -260,  -260,  -260,  -260,    -3,  -260,    -1,   573,
+      42,  -260,  -260,  -260,    73,  -260,   -51,  -260,  -260,  -260,
+    -260,  -260,  -260,  -260,   -76,  -260,   -12,    15,  -260,  -260,
+    -260,  -260,   125,    59,    54,  -260,  -260,   785,   -39,  -260,
+    -260,  -260,    46,   -13,    -9,  1158,   102,   355,  -260,  -260,
+      71,  -260,  -260,  -260,  -260,  -260,    80,  -260,   110,   355,
+     -60,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -260,
+    -260,  -260,     8,  -260,   124,  -260,  -260,  1224,  -260,    69,
+    -260,    10,  -260,   785,  -260,  -260,  -260,   960,    11,  -260,
+    -260,  -260,  -260,  -260
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -253,  -253,  -253,  -253,  -253,  -253,   148,  -253,  -253,  -253,
-      37,  -253,  -253,  -253,  -253,  -253,  -253,  -171,  -253,  -253,
-    -252,  -253,  -144,  -253,  -253,  -253,  -253,  -123,   -96,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -127,  -253,  -253,  -253,
-    -253,  -253,  -253,  -253,  -253,   -52,  -253,  -253,  -253,  -253,
-    -253,   -37,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -231,
-    -253,  -253,  -253,  -253,  -253,    25,  -253,  -253,  -253,  -253,
-      20,  -130,  -253,  -253,  -253,   -55,  -253,  -116,  -253,  -206,
-    -147,  -253,  -253,  -196,  -253,    -4,   -95
+    -260,  -260,  -260,  -260,  -260,  -260,   148,  -260,  -260,  -260,
+      35,  -260,  -260,  -260,  -260,  -260,  -260,  -171,  -260,  -260,
+    -259,  -260,  -145,  -260,  -260,  -260,  -260,  -124,   -97,  -260,
+    -260,  -260,  -260,  -260,  -260,  -260,  -128,  -260,  -260,  -260,
+    -260,  -260,  -260,  -260,  -260,   -53,  -260,  -260,  -260,  -260,
+    -260,   -42,  -260,  -260,  -260,  -260,  -260,  -260,  -260,  -221,
+    -260,  -260,  -260,  -260,  -260,    25,  -260,  -260,  -260,  -260,
+      26,  -131,  -260,  -260,  -260,   -56,  -260,  -118,  -260,  -210,
+    -150,  -260,  -260,  -196,  -260,    -4,   -96
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -1267,76 +1267,55 @@ static const yytype_int16 yypgoto[] =
 #define YYTABLE_NINF -163
 static const yytype_int16 yytable[] =
 {
-      93,   107,   290,   290,   111,     4,   269,   119,   233,   250,
-     193,   274,   199,   120,   121,   122,   123,   251,   205,   206,
-     119,   177,   108,   124,   301,  -161,  -162,   125,   126,   302,
-     127,   286,   230,   207,   128,   231,     3,   178,   129,   219,
-     306,   303,   -28,  -161,  -162,    95,    98,   130,   100,  -109,
-     101,  -109,   103,    96,   104,   132,   133,   134,   287,   321,
-     322,   288,   225,   135,   289,   136,   137,   228,   189,   138,
-     301,   185,   186,   187,   198,   139,   293,   294,   140,    97,
-     194,   208,   179,   141,   142,   109,   110,   143,   317,   215,
-     220,   234,   235,   236,   204,   210,   144,   332,   145,   201,
-     227,   146,   320,   260,   261,   262,   209,   212,   180,   175,
-     211,   214,     5,   215,   218,   246,   222,   221,   226,   183,
-     307,  -109,   229,   248,   291,   291,   254,   259,   270,   271,
-     281,   285,   267,   275,   296,   297,   276,   298,   305,   311,
-     319,   325,   318,   329,   327,   331,   120,   121,   122,   123,
-       7,   330,   176,   280,   283,   284,   124,   323,  -161,   310,
-     125,   126,   314,   127,   252,   197,   200,   128,   258,   239,
-     312,   129,   328,     0,     0,     0,  -161,     0,     0,     0,
-     130,   119,     0,     0,  -154,     0,     0,     0,   132,   133,
-     134,   313,     0,     0,     0,     0,   135,   316,   136,   137,
-       0,     0,   138,     0,     0,     0,     0,     0,   139,     0,
-       0,   140,     0,     0,     0,     0,   141,   142,   257,     0,
-     143,   326,     0,     0,     0,     0,     0,   119,     0,   144,
-       0,   145,     0,     0,   146,     0,     0,     0,     0,     0,
+      94,   108,   291,   291,   112,     4,   251,   120,   252,   234,
+     178,   194,   200,   121,   122,   123,   124,   270,   302,   220,
+     120,     3,   275,   125,   109,  -161,   179,   126,   127,   303,
+     128,   -28,  -162,    96,   129,    99,   231,   101,   130,   232,
+     307,   304,    97,  -161,   287,   206,   207,   131,   104,  -109,
+    -162,  -109,   186,   187,   188,   133,   134,   135,   289,   102,
+     208,   290,   226,   136,   302,   137,   138,   229,    98,   139,
+     221,   180,   288,   294,   295,   140,   322,   323,   141,   190,
+     105,   216,   195,   142,   143,   318,   199,   144,   110,   111,
+     235,   236,   237,   261,   262,   263,   205,   145,   181,   146,
+     228,   202,   147,   321,   210,   211,   212,   213,   333,   209,
+     176,   215,   219,     5,   216,   247,   223,   227,   222,   249,
+     184,   308,  -109,   230,   255,   292,   292,   260,   268,   271,
+     272,   276,   282,   286,   277,   298,   297,   299,   306,   312,
+     319,   320,   326,   328,   330,   332,   121,   122,   123,   124,
+       7,   177,   331,   281,   284,   285,   125,   324,  -161,   311,
+     126,   127,   315,   128,   253,   240,   198,   129,   259,   313,
+     329,   130,     0,   201,     0,     0,  -161,     0,     0,     0,
+     131,   120,     0,     0,  -154,     0,     0,     0,   133,   134,
+     135,   314,     0,     0,     0,     0,   136,   317,   137,   138,
+       0,     0,   139,     0,     0,     0,     0,     0,   140,     0,
+       0,   141,     0,     0,     0,     0,   142,   143,     0,   258,
+     144,   327,     0,     0,     0,     0,     0,   120,     0,     0,
+     145,     0,   146,     0,     0,   147,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  -154,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   112,     0,     0,
-     113,     0,    12,    13,     0,    14,    15,    16,    17,     0,
-       0,    18,   257,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,   114,    33,    34,
+       0,     0,     0,     0,     0,  -154,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   113,     0,
+       0,   114,     0,    12,    13,     0,    14,    15,    16,    17,
+       0,     0,    18,   258,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,   115,    33,
+      34,    35,    36,    37,     0,    38,     0,    39,    40,    41,
+       0,    42,    43,    44,     0,     0,    45,     0,    46,    47,
+       0,    48,     0,    49,    50,     0,    51,    52,    53,     0,
+      54,    55,    56,    57,    58,    59,     0,    60,     0,    61,
+      62,     0,    63,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,     0,    87,    88,     0,
+       0,    89,    90,    91,     0,    92,    93,    10,     0,    11,
+       0,     0,    12,    13,     0,    14,    15,    16,    17,     0,
+       0,    18,     0,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,     0,    33,    34,
       35,    36,    37,     0,    38,     0,    39,    40,    41,     0,
       42,    43,    44,     0,     0,    45,     0,    46,    47,     0,
       48,     0,    49,    50,     0,    51,    52,    53,     0,    54,
       55,    56,    57,    58,    59,     0,    60,     0,    61,    62,
        0,    63,    64,    65,    66,    67,    68,    69,    70,    71,
       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,     0,    86,    87,     0,     0,    88,
-      89,    90,     0,    91,    92,    10,     0,    11,     0,     0,
-      12,    13,     0,    14,    15,    16,    17,     0,     0,    18,
-       0,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,     0,    33,    34,    35,    36,
-      37,     0,    38,     0,    39,    40,    41,     0,    42,    43,
-      44,     0,     0,    45,     0,    46,    47,     0,    48,     0,
-      49,    50,     0,    51,    52,    53,     0,    54,    55,    56,
-      57,    58,    59,     0,    60,     0,    61,    62,     0,    63,
-      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,     0,    86,    87,     0,     0,    88,    89,    90,
-       0,    91,    92,   243,   244,     0,     0,     0,    12,    13,
-       0,    14,    15,    16,    17,     0,     0,    18,     0,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,     0,    33,    34,    35,    36,    37,     0,
-      38,     0,    39,    40,    41,     0,    42,    43,    44,     0,
-       0,    45,     0,    46,    47,     0,    48,     0,    49,    50,
-       0,    51,    52,    53,     0,    54,    55,    56,    57,    58,
-      59,     0,    60,     0,    61,    62,     0,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-       0,    86,    87,     0,     0,    88,    89,    90,     0,    91,
-      92,   278,   279,     0,     0,     0,    12,    13,     0,    14,
-      15,    16,    17,     0,     0,    18,     0,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,     0,    33,    34,    35,    36,    37,     0,    38,     0,
-      39,    40,    41,     0,    42,    43,    44,     0,     0,    45,
-       0,    46,    47,     0,    48,     0,    49,    50,     0,    51,
-      52,    53,     0,    54,    55,    56,    57,    58,    59,     0,
-      60,     0,    61,    62,     0,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,     0,    86,
-      87,     0,     0,    88,    89,    90,   105,    91,    92,     0,
+      82,    83,    84,    85,    86,     0,    87,    88,     0,     0,
+      89,    90,    91,     0,    92,    93,   244,   245,     0,     0,
        0,    12,    13,     0,    14,    15,    16,    17,     0,     0,
       18,     0,    19,    20,    21,    22,    23,    24,    25,    26,
       27,    28,    29,    30,    31,    32,     0,    33,    34,    35,
@@ -1346,8 +1325,19 @@ static const yytype_int16 yytable[] =
       56,    57,    58,    59,     0,    60,     0,    61,    62,     0,
       63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
       73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,     0,    86,    87,     0,     0,    88,    89,
-      90,   112,    91,    92,     0,     0,    12,    13,     0,    14,
+      83,    84,    85,    86,     0,    87,    88,     0,     0,    89,
+      90,    91,     0,    92,    93,   279,   280,     0,     0,     0,
+      12,    13,     0,    14,    15,    16,    17,     0,     0,    18,
+       0,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,     0,    33,    34,    35,    36,
+      37,     0,    38,     0,    39,    40,    41,     0,    42,    43,
+      44,     0,     0,    45,     0,    46,    47,     0,    48,     0,
+      49,    50,     0,    51,    52,    53,     0,    54,    55,    56,
+      57,    58,    59,     0,    60,     0,    61,    62,     0,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,     0,    87,    88,     0,     0,    89,    90,
+      91,   106,    92,    93,     0,     0,    12,    13,     0,    14,
       15,    16,    17,     0,     0,    18,     0,    19,    20,    21,
       22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
       32,     0,    33,    34,    35,    36,    37,     0,    38,     0,
@@ -1356,130 +1346,114 @@ static const yytype_int16 yytable[] =
       52,    53,     0,    54,    55,    56,    57,    58,    59,     0,
       60,     0,    61,    62,     0,    63,    64,    65,    66,    67,
       68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,     0,    86,
-      87,     0,     0,    88,    89,    90,     0,    91,    92,   120,
-     121,   122,   123,     0,     0,     0,     0,     0,     0,   124,
-       0,  -161,     0,   125,   126,     0,   127,     0,     0,     0,
-     128,     0,     0,     0,   129,     0,     0,     0,     0,  -161,
-       0,     0,     0,   130,     0,  -101,  -101,  -101,     0,     0,
-       0,   132,   133,   134,     0,     0,     0,     0,     0,   135,
-       0,   136,   137,     0,     0,   138,     0,     0,     0,     0,
-       0,   139,     0,     0,   140,     0,     0,     0,     0,   141,
-     142,     0,     0,   143,     0,     0,   120,   121,   122,   123,
-       0,     0,   144,     0,   145,     0,   124,   146,  -161,     0,
-     125,   126,     0,   127,     0,     0,     0,   128,     0,     0,
-       0,   129,     0,     0,     0,     0,  -161,     0,     0,     0,
-     130,     0,  -102,  -102,  -102,     0,     0,     0,   132,   133,
-     134,     0,     0,     0,     0,     0,   135,     0,   136,   137,
-       0,     0,   138,     0,     0,     0,     0,     0,   139,     0,
-       0,   140,     0,     0,     0,     0,   141,   142,     0,     0,
-     143,     0,     0,   120,   121,   122,   123,     0,     0,   144,
-       0,   145,     0,   124,   146,  -161,     0,   125,   126,     0,
-     127,     0,     0,     0,   128,     0,     0,     0,   129,     0,
-       0,     0,     0,  -161,     0,     0,     0,   130,     0,     0,
-       0,  -149,     0,     0,   131,   132,   133,   134,     0,     0,
-       0,     0,     0,   135,     0,   136,   137,     0,     0,   138,
-       0,     0,     0,     0,     0,   139,     0,     0,   140,     0,
-       0,     0,     0,   141,   142,     0,     0,   143,     0,     0,
-     120,   121,   122,   123,     0,     0,   144,     0,   145,     0,
-     124,   146,  -161,     0,   125,   126,     0,   127,     0,     0,
-       0,   128,     0,     0,     0,   129,     0,     0,     0,     0,
-    -161,     0,     0,     0,   130,     0,     0,     0,   273,     0,
-       0,     0,   132,   133,   134,     0,     0,     0,     0,     0,
-     135,     0,   136,   137,     0,     0,   138,     0,     0,     0,
-       0,     0,   139,     0,     0,   140,     0,     0,     0,     0,
-     141,   142,     0,     0,   143,     0,     0,   120,   121,   122,
-     123,     0,     0,   144,     0,   145,     0,   124,   146,  -161,
-       0,   125,   126,     0,   127,     0,     0,     0,   128,     0,
-       0,     0,   129,     0,     0,     0,     0,  -161,     0,     0,
-       0,   130,     0,     0,     0,  -111,     0,     0,     0,   132,
-     133,   134,     0,     0,     0,     0,     0,   135,     0,   136,
-     137,     0,     0,   138,     0,     0,     0,     0,     0,   139,
-       0,     0,   140,     0,     0,     0,     0,   141,   142,     0,
-       0,   143,     0,     0,   120,   121,   122,   123,     0,     0,
-     144,     0,   145,     0,   124,   146,  -161,     0,   125,   126,
-       0,   127,     0,     0,     0,   128,     0,     0,     0,   129,
-       0,     0,     0,     0,  -161,     0,     0,     0,   130,     0,
-       0,     0,  -104,     0,     0,     0,   132,   133,   134,     0,
-       0,     0,     0,     0,   135,     0,   136,   137,     0,     0,
-     138,     0,     0,     0,     0,     0,   139,     0,     0,   140,
-       0,     0,     0,     0,   141,   142,     0,     0,   143,     0,
-       0,     0,     0,     0,     0,     0,     0,   144,     0,   145,
-       0,     0,   146
+      78,    79,    80,    81,    82,    83,    84,    85,    86,     0,
+      87,    88,     0,     0,    89,    90,    91,   113,    92,    93,
+       0,     0,    12,    13,     0,    14,    15,    16,    17,     0,
+       0,    18,     0,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,     0,    33,    34,
+      35,    36,    37,     0,    38,     0,    39,    40,    41,     0,
+      42,    43,    44,     0,     0,    45,     0,    46,    47,     0,
+      48,     0,    49,    50,     0,    51,    52,    53,     0,    54,
+      55,    56,    57,    58,    59,     0,    60,     0,    61,    62,
+       0,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,     0,    87,    88,     0,     0,
+      89,    90,    91,     0,    92,    93,   121,   122,   123,   124,
+       0,     0,     0,     0,     0,     0,   125,     0,  -161,     0,
+     126,   127,     0,   128,     0,     0,     0,   129,     0,     0,
+       0,   130,     0,     0,     0,     0,  -161,     0,     0,     0,
+     131,     0,  -101,  -101,  -101,     0,     0,     0,   133,   134,
+     135,     0,     0,     0,     0,     0,   136,     0,   137,   138,
+       0,     0,   139,     0,     0,     0,     0,     0,   140,     0,
+       0,   141,   121,   122,   123,   124,   142,   143,     0,     0,
+     144,     0,   125,     0,  -161,     0,   126,   127,     0,   128,
+     145,     0,   146,   129,     0,   147,     0,   130,     0,     0,
+       0,     0,  -161,     0,     0,     0,   131,     0,  -102,  -102,
+    -102,     0,     0,     0,   133,   134,   135,     0,     0,     0,
+       0,     0,   136,     0,   137,   138,     0,     0,   139,     0,
+       0,     0,     0,     0,   140,     0,     0,   141,   121,   122,
+     123,   124,   142,   143,     0,     0,   144,     0,   125,     0,
+    -161,     0,   126,   127,     0,   128,   145,     0,   146,   129,
+       0,   147,     0,   130,     0,     0,     0,     0,  -161,     0,
+       0,     0,   131,     0,     0,     0,  -149,     0,     0,   132,
+     133,   134,   135,     0,     0,     0,     0,     0,   136,     0,
+     137,   138,     0,     0,   139,     0,     0,     0,     0,     0,
+     140,     0,     0,   141,   121,   122,   123,   124,   142,   143,
+       0,     0,   144,     0,   125,     0,  -161,     0,   126,   127,
+       0,   128,   145,     0,   146,   129,     0,   147,     0,   130,
+       0,     0,     0,     0,  -161,     0,     0,     0,   131,     0,
+       0,     0,   274,     0,     0,     0,   133,   134,   135,     0,
+       0,     0,     0,     0,   136,     0,   137,   138,     0,     0,
+     139,     0,     0,     0,     0,     0,   140,     0,     0,   141,
+     121,   122,   123,   124,   142,   143,     0,     0,   144,     0,
+     125,     0,  -161,     0,   126,   127,     0,   128,   145,     0,
+     146,   129,     0,   147,     0,   130,     0,     0,     0,     0,
+    -161,     0,     0,     0,   131,     0,     0,     0,  -111,     0,
+       0,     0,   133,   134,   135,     0,     0,     0,     0,     0,
+     136,     0,   137,   138,     0,     0,   139,     0,     0,     0,
+       0,     0,   140,     0,     0,   141,   121,   122,   123,   124,
+     142,   143,     0,     0,   144,     0,   125,     0,  -161,     0,
+     126,   127,     0,   128,   145,     0,   146,   129,     0,   147,
+       0,   130,     0,     0,     0,     0,  -161,     0,     0,     0,
+     131,     0,     0,     0,  -104,     0,     0,     0,   133,   134,
+     135,     0,     0,     0,     0,     0,   136,     0,   137,   138,
+       0,     0,   139,     0,     0,     0,     0,     0,   140,     0,
+       0,   141,     0,     0,     0,     0,   142,   143,     0,     0,
+     144,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     145,     0,   146,     0,     0,   147
 };
 
 static const yytype_int16 yycheck[] =
 {
-       4,    96,    15,    15,   100,    25,   237,   102,   204,   215,
-      48,   242,   142,    22,    23,    24,    25,    58,    68,    69,
-     115,    28,    62,    32,   276,    34,    34,    36,    37,    68,
-      39,    95,   130,    83,    43,   133,     0,    44,    47,    38,
-      53,    80,    49,    52,    52,    94,   133,    56,    34,    58,
-      52,    60,    26,   102,    57,    64,    65,    66,   122,   135,
-     136,   133,   192,    72,   136,    74,    75,   197,    30,    78,
-     322,    22,    23,    24,   133,    84,    58,    59,    87,   128,
-     118,   131,    89,    92,    93,   125,   126,    96,   294,   130,
-      89,    22,    23,    24,    60,    68,   105,   328,   107,   133,
-     196,   110,   298,    22,    23,    24,    26,    49,   115,   113,
-     115,    26,   132,   130,   133,   210,   130,   133,    55,   123,
-     133,   130,   133,    40,   137,   137,    38,    79,    76,   116,
-      90,    60,   133,   133,    11,    76,   134,    83,    92,    37,
-      31,   133,    60,   133,    74,   133,    22,    23,    24,    25,
-       2,   322,   115,   248,   250,   251,    32,   301,    34,   282,
-      36,    37,   289,    39,   216,   140,   146,    43,   223,   206,
-     286,    47,   319,    -1,    -1,    -1,    52,    -1,    -1,    -1,
-      56,   276,    -1,    -1,    60,    -1,    -1,    -1,    64,    65,
-      66,   287,    -1,    -1,    -1,    -1,    72,   293,    74,    75,
+       4,    97,    15,    15,   101,    25,   216,   103,    58,   205,
+      28,    48,   143,    22,    23,    24,    25,   238,   277,    38,
+     116,     0,   243,    32,    62,    34,    44,    36,    37,    68,
+      39,    49,    34,    94,    43,   134,   131,    34,    47,   134,
+      53,    80,   103,    52,    95,    68,    69,    56,    26,    58,
+      52,    60,    22,    23,    24,    64,    65,    66,   134,    52,
+      83,   137,   193,    72,   323,    74,    75,   198,   129,    78,
+      89,    89,   123,    58,    59,    84,   136,   137,    87,    30,
+      57,   131,   119,    92,    93,   295,   134,    96,   126,   127,
+      22,    23,    24,    22,    23,    24,    60,   106,   116,   108,
+     197,   134,   111,   299,    26,    68,   116,    49,   329,   132,
+     114,    26,   134,   133,   131,   211,   131,    55,   134,    40,
+     124,   134,   131,   134,    38,   138,   138,    79,   134,    76,
+     117,   134,    90,    60,   135,    76,    11,    83,    92,    37,
+      60,    31,   134,    74,   134,   134,    22,    23,    24,    25,
+       2,   116,   323,   249,   251,   252,    32,   302,    34,   283,
+      36,    37,   290,    39,   217,   207,   141,    43,   224,   287,
+     320,    47,    -1,   147,    -1,    -1,    52,    -1,    -1,    -1,
+      56,   277,    -1,    -1,    60,    -1,    -1,    -1,    64,    65,
+      66,   288,    -1,    -1,    -1,    -1,    72,   294,    74,    75,
       -1,    -1,    78,    -1,    -1,    -1,    -1,    -1,    84,    -1,
-      -1,    87,    -1,    -1,    -1,    -1,    92,    93,   222,    -1,
-      96,   317,    -1,    -1,    -1,    -1,    -1,   322,    -1,   105,
-      -1,   107,    -1,    -1,   110,    -1,    -1,    -1,    -1,    -1,
+      -1,    87,    -1,    -1,    -1,    -1,    92,    93,    -1,   223,
+      96,   318,    -1,    -1,    -1,    -1,    -1,   323,    -1,    -1,
+     106,    -1,   108,    -1,    -1,   111,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   130,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    22,    -1,    -1,
-      25,    -1,    27,    28,    -1,    30,    31,    32,    33,    -1,
-      -1,    36,   286,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      -1,    -1,    -1,    -1,    -1,   131,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    22,    -1,
+      -1,    25,    -1,    27,    28,    -1,    30,    31,    32,    33,
+      -1,    -1,    36,   287,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    -1,    59,    -1,    61,    62,    63,
+      -1,    65,    66,    67,    -1,    -1,    70,    -1,    72,    73,
+      -1,    75,    -1,    77,    78,    -1,    80,    81,    82,    -1,
+      84,    85,    86,    87,    88,    89,    -1,    91,    -1,    93,
+      94,    -1,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,    -1,   121,   122,    -1,
+      -1,   125,   126,   127,    -1,   129,   130,    22,    -1,    24,
+      -1,    -1,    27,    28,    -1,    30,    31,    32,    33,    -1,
+      -1,    36,    -1,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    -1,    53,    54,
       55,    56,    57,    -1,    59,    -1,    61,    62,    63,    -1,
       65,    66,    67,    -1,    -1,    70,    -1,    72,    73,    -1,
       75,    -1,    77,    78,    -1,    80,    81,    82,    -1,    84,
       85,    86,    87,    88,    89,    -1,    91,    -1,    93,    94,
       -1,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,    -1,   120,   121,    -1,    -1,   124,
-     125,   126,    -1,   128,   129,    22,    -1,    24,    -1,    -1,
-      27,    28,    -1,    30,    31,    32,    33,    -1,    -1,    36,
-      -1,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    -1,    53,    54,    55,    56,
-      57,    -1,    59,    -1,    61,    62,    63,    -1,    65,    66,
-      67,    -1,    -1,    70,    -1,    72,    73,    -1,    75,    -1,
-      77,    78,    -1,    80,    81,    82,    -1,    84,    85,    86,
-      87,    88,    89,    -1,    91,    -1,    93,    94,    -1,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,    -1,   120,   121,    -1,    -1,   124,   125,   126,
-      -1,   128,   129,    22,    23,    -1,    -1,    -1,    27,    28,
-      -1,    30,    31,    32,    33,    -1,    -1,    36,    -1,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    -1,    53,    54,    55,    56,    57,    -1,
-      59,    -1,    61,    62,    63,    -1,    65,    66,    67,    -1,
-      -1,    70,    -1,    72,    73,    -1,    75,    -1,    77,    78,
-      -1,    80,    81,    82,    -1,    84,    85,    86,    87,    88,
-      89,    -1,    91,    -1,    93,    94,    -1,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-      -1,   120,   121,    -1,    -1,   124,   125,   126,    -1,   128,
-     129,    22,    23,    -1,    -1,    -1,    27,    28,    -1,    30,
-      31,    32,    33,    -1,    -1,    36,    -1,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    -1,    53,    54,    55,    56,    57,    -1,    59,    -1,
-      61,    62,    63,    -1,    65,    66,    67,    -1,    -1,    70,
-      -1,    72,    73,    -1,    75,    -1,    77,    78,    -1,    80,
-      81,    82,    -1,    84,    85,    86,    87,    88,    89,    -1,
-      91,    -1,    93,    94,    -1,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,    -1,   120,
-     121,    -1,    -1,   124,   125,   126,    22,   128,   129,    -1,
+     115,   116,   117,   118,   119,    -1,   121,   122,    -1,    -1,
+     125,   126,   127,    -1,   129,   130,    22,    23,    -1,    -1,
       -1,    27,    28,    -1,    30,    31,    32,    33,    -1,    -1,
       36,    -1,    38,    39,    40,    41,    42,    43,    44,    45,
       46,    47,    48,    49,    50,    51,    -1,    53,    54,    55,
@@ -1489,8 +1463,19 @@ static const yytype_int16 yycheck[] =
       86,    87,    88,    89,    -1,    91,    -1,    93,    94,    -1,
       96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
      106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,    -1,   120,   121,    -1,    -1,   124,   125,
-     126,    22,   128,   129,    -1,    -1,    27,    28,    -1,    30,
+     116,   117,   118,   119,    -1,   121,   122,    -1,    -1,   125,
+     126,   127,    -1,   129,   130,    22,    23,    -1,    -1,    -1,
+      27,    28,    -1,    30,    31,    32,    33,    -1,    -1,    36,
+      -1,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    -1,    53,    54,    55,    56,
+      57,    -1,    59,    -1,    61,    62,    63,    -1,    65,    66,
+      67,    -1,    -1,    70,    -1,    72,    73,    -1,    75,    -1,
+      77,    78,    -1,    80,    81,    82,    -1,    84,    85,    86,
+      87,    88,    89,    -1,    91,    -1,    93,    94,    -1,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,    -1,   121,   122,    -1,    -1,   125,   126,
+     127,    22,   129,   130,    -1,    -1,    27,    28,    -1,    30,
       31,    32,    33,    -1,    -1,    36,    -1,    38,    39,    40,
       41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
       51,    -1,    53,    54,    55,    56,    57,    -1,    59,    -1,
@@ -1499,63 +1484,68 @@ static const yytype_int16 yycheck[] =
       81,    82,    -1,    84,    85,    86,    87,    88,    89,    -1,
       91,    -1,    93,    94,    -1,    96,    97,    98,    99,   100,
      101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,    -1,   120,
-     121,    -1,    -1,   124,   125,   126,    -1,   128,   129,    22,
-      23,    24,    25,    -1,    -1,    -1,    -1,    -1,    -1,    32,
-      -1,    34,    -1,    36,    37,    -1,    39,    -1,    -1,    -1,
-      43,    -1,    -1,    -1,    47,    -1,    -1,    -1,    -1,    52,
-      -1,    -1,    -1,    56,    -1,    58,    59,    60,    -1,    -1,
-      -1,    64,    65,    66,    -1,    -1,    -1,    -1,    -1,    72,
-      -1,    74,    75,    -1,    -1,    78,    -1,    -1,    -1,    -1,
-      -1,    84,    -1,    -1,    87,    -1,    -1,    -1,    -1,    92,
-      93,    -1,    -1,    96,    -1,    -1,    22,    23,    24,    25,
-      -1,    -1,   105,    -1,   107,    -1,    32,   110,    34,    -1,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,    -1,
+     121,   122,    -1,    -1,   125,   126,   127,    22,   129,   130,
+      -1,    -1,    27,    28,    -1,    30,    31,    32,    33,    -1,
+      -1,    36,    -1,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    -1,    53,    54,
+      55,    56,    57,    -1,    59,    -1,    61,    62,    63,    -1,
+      65,    66,    67,    -1,    -1,    70,    -1,    72,    73,    -1,
+      75,    -1,    77,    78,    -1,    80,    81,    82,    -1,    84,
+      85,    86,    87,    88,    89,    -1,    91,    -1,    93,    94,
+      -1,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,    -1,   121,   122,    -1,    -1,
+     125,   126,   127,    -1,   129,   130,    22,    23,    24,    25,
+      -1,    -1,    -1,    -1,    -1,    -1,    32,    -1,    34,    -1,
       36,    37,    -1,    39,    -1,    -1,    -1,    43,    -1,    -1,
       -1,    47,    -1,    -1,    -1,    -1,    52,    -1,    -1,    -1,
       56,    -1,    58,    59,    60,    -1,    -1,    -1,    64,    65,
       66,    -1,    -1,    -1,    -1,    -1,    72,    -1,    74,    75,
       -1,    -1,    78,    -1,    -1,    -1,    -1,    -1,    84,    -1,
-      -1,    87,    -1,    -1,    -1,    -1,    92,    93,    -1,    -1,
-      96,    -1,    -1,    22,    23,    24,    25,    -1,    -1,   105,
-      -1,   107,    -1,    32,   110,    34,    -1,    36,    37,    -1,
-      39,    -1,    -1,    -1,    43,    -1,    -1,    -1,    47,    -1,
-      -1,    -1,    -1,    52,    -1,    -1,    -1,    56,    -1,    -1,
-      -1,    60,    -1,    -1,    63,    64,    65,    66,    -1,    -1,
-      -1,    -1,    -1,    72,    -1,    74,    75,    -1,    -1,    78,
-      -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,    87,    -1,
-      -1,    -1,    -1,    92,    93,    -1,    -1,    96,    -1,    -1,
-      22,    23,    24,    25,    -1,    -1,   105,    -1,   107,    -1,
-      32,   110,    34,    -1,    36,    37,    -1,    39,    -1,    -1,
-      -1,    43,    -1,    -1,    -1,    47,    -1,    -1,    -1,    -1,
-      52,    -1,    -1,    -1,    56,    -1,    -1,    -1,    60,    -1,
-      -1,    -1,    64,    65,    66,    -1,    -1,    -1,    -1,    -1,
-      72,    -1,    74,    75,    -1,    -1,    78,    -1,    -1,    -1,
-      -1,    -1,    84,    -1,    -1,    87,    -1,    -1,    -1,    -1,
-      92,    93,    -1,    -1,    96,    -1,    -1,    22,    23,    24,
-      25,    -1,    -1,   105,    -1,   107,    -1,    32,   110,    34,
-      -1,    36,    37,    -1,    39,    -1,    -1,    -1,    43,    -1,
-      -1,    -1,    47,    -1,    -1,    -1,    -1,    52,    -1,    -1,
-      -1,    56,    -1,    -1,    -1,    60,    -1,    -1,    -1,    64,
-      65,    66,    -1,    -1,    -1,    -1,    -1,    72,    -1,    74,
-      75,    -1,    -1,    78,    -1,    -1,    -1,    -1,    -1,    84,
-      -1,    -1,    87,    -1,    -1,    -1,    -1,    92,    93,    -1,
-      -1,    96,    -1,    -1,    22,    23,    24,    25,    -1,    -1,
-     105,    -1,   107,    -1,    32,   110,    34,    -1,    36,    37,
-      -1,    39,    -1,    -1,    -1,    43,    -1,    -1,    -1,    47,
+      -1,    87,    22,    23,    24,    25,    92,    93,    -1,    -1,
+      96,    -1,    32,    -1,    34,    -1,    36,    37,    -1,    39,
+     106,    -1,   108,    43,    -1,   111,    -1,    47,    -1,    -1,
+      -1,    -1,    52,    -1,    -1,    -1,    56,    -1,    58,    59,
+      60,    -1,    -1,    -1,    64,    65,    66,    -1,    -1,    -1,
+      -1,    -1,    72,    -1,    74,    75,    -1,    -1,    78,    -1,
+      -1,    -1,    -1,    -1,    84,    -1,    -1,    87,    22,    23,
+      24,    25,    92,    93,    -1,    -1,    96,    -1,    32,    -1,
+      34,    -1,    36,    37,    -1,    39,   106,    -1,   108,    43,
+      -1,   111,    -1,    47,    -1,    -1,    -1,    -1,    52,    -1,
+      -1,    -1,    56,    -1,    -1,    -1,    60,    -1,    -1,    63,
+      64,    65,    66,    -1,    -1,    -1,    -1,    -1,    72,    -1,
+      74,    75,    -1,    -1,    78,    -1,    -1,    -1,    -1,    -1,
+      84,    -1,    -1,    87,    22,    23,    24,    25,    92,    93,
+      -1,    -1,    96,    -1,    32,    -1,    34,    -1,    36,    37,
+      -1,    39,   106,    -1,   108,    43,    -1,   111,    -1,    47,
       -1,    -1,    -1,    -1,    52,    -1,    -1,    -1,    56,    -1,
       -1,    -1,    60,    -1,    -1,    -1,    64,    65,    66,    -1,
       -1,    -1,    -1,    -1,    72,    -1,    74,    75,    -1,    -1,
       78,    -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,    87,
-      -1,    -1,    -1,    -1,    92,    93,    -1,    -1,    96,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   105,    -1,   107,
-      -1,    -1,   110
+      22,    23,    24,    25,    92,    93,    -1,    -1,    96,    -1,
+      32,    -1,    34,    -1,    36,    37,    -1,    39,   106,    -1,
+     108,    43,    -1,   111,    -1,    47,    -1,    -1,    -1,    -1,
+      52,    -1,    -1,    -1,    56,    -1,    -1,    -1,    60,    -1,
+      -1,    -1,    64,    65,    66,    -1,    -1,    -1,    -1,    -1,
+      72,    -1,    74,    75,    -1,    -1,    78,    -1,    -1,    -1,
+      -1,    -1,    84,    -1,    -1,    87,    22,    23,    24,    25,
+      92,    93,    -1,    -1,    96,    -1,    32,    -1,    34,    -1,
+      36,    37,    -1,    39,   106,    -1,   108,    43,    -1,   111,
+      -1,    47,    -1,    -1,    -1,    -1,    52,    -1,    -1,    -1,
+      56,    -1,    -1,    -1,    60,    -1,    -1,    -1,    64,    65,
+      66,    -1,    -1,    -1,    -1,    -1,    72,    -1,    74,    75,
+      -1,    -1,    78,    -1,    -1,    -1,    -1,    -1,    84,    -1,
+      -1,    87,    -1,    -1,    -1,    -1,    92,    93,    -1,    -1,
+      96,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     106,    -1,   108,    -1,    -1,   111
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,   139,   140,     0,    25,   132,   141,   144,   145,   219,
+       0,   140,   141,     0,    25,   133,   142,   145,   146,   220,
       22,    24,    27,    28,    30,    31,    32,    33,    36,    38,
       39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
       49,    50,    51,    53,    54,    55,    56,    57,    59,    61,
@@ -1563,32 +1553,32 @@ static const yytype_uint8 yystos[] =
       78,    80,    81,    82,    84,    85,    86,    87,    88,    89,
       91,    93,    94,    96,    97,    98,    99,   100,   101,   102,
      103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   120,   121,   124,   125,
-     126,   128,   129,   223,   224,    94,   102,   128,   133,   143,
-      34,    52,   146,    26,    57,    22,   142,   224,    62,   125,
-     126,   166,    22,    25,    52,   147,   148,   149,   158,   224,
-      22,    23,    24,    25,    32,    36,    37,    39,    43,    47,
-      56,    63,    64,    65,    66,    72,    74,    75,    78,    84,
-      87,    92,    93,    96,   105,   107,   110,   144,   167,   168,
-     169,   170,   171,   177,   180,   185,   186,   187,   190,   192,
-     193,   194,   195,   196,   198,   199,   200,   201,   202,   204,
-     205,   206,   207,   210,   220,   223,   148,    28,    44,    89,
-     115,   151,   159,   223,   181,    22,    23,    24,   209,    30,
-     208,   211,   203,    48,   118,   172,   217,   203,   133,   209,
-     208,   133,   221,   223,    60,    68,    69,    83,   131,    26,
-      68,   115,    49,   160,    26,   130,   182,   183,   133,    38,
-      89,   133,   130,   212,   213,   209,    55,   166,   209,   133,
-     130,   133,   222,   221,    22,    23,    24,   188,   189,   189,
-     166,   197,   218,    22,    23,   157,   224,   150,    40,   161,
-     217,    58,   183,   184,    38,   214,   215,   223,   213,    79,
-      22,    23,    24,   173,   174,   176,   178,   133,   216,   197,
-      76,   116,   191,    60,   197,   133,   134,   153,    22,    23,
-     224,    90,   162,   166,   166,    60,    95,   122,   133,   136,
-      15,   137,   165,    58,    59,   179,    11,    76,    83,   154,
-     155,   158,    68,    80,   156,    92,    53,   133,   163,   164,
-     165,    37,   215,   166,   174,   175,   166,   217,    60,    31,
-     221,   135,   136,   160,   152,   133,   166,    74,   218,   133,
-     155,   133,   197
+     113,   114,   115,   116,   117,   118,   119,   121,   122,   125,
+     126,   127,   129,   130,   224,   225,    94,   103,   129,   134,
+     144,    34,    52,   147,    26,    57,    22,   143,   225,    62,
+     126,   127,   167,    22,    25,    52,   148,   149,   150,   159,
+     225,    22,    23,    24,    25,    32,    36,    37,    39,    43,
+      47,    56,    63,    64,    65,    66,    72,    74,    75,    78,
+      84,    87,    92,    93,    96,   106,   108,   111,   145,   168,
+     169,   170,   171,   172,   178,   181,   186,   187,   188,   191,
+     193,   194,   195,   196,   197,   199,   200,   201,   202,   203,
+     205,   206,   207,   208,   211,   221,   224,   149,    28,    44,
+      89,   116,   152,   160,   224,   182,    22,    23,    24,   210,
+      30,   209,   212,   204,    48,   119,   173,   218,   204,   134,
+     210,   209,   134,   222,   224,    60,    68,    69,    83,   132,
+      26,    68,   116,    49,   161,    26,   131,   183,   184,   134,
+      38,    89,   134,   131,   213,   214,   210,    55,   167,   210,
+     134,   131,   134,   223,   222,    22,    23,    24,   189,   190,
+     190,   167,   198,   219,    22,    23,   158,   225,   151,    40,
+     162,   218,    58,   184,   185,    38,   215,   216,   224,   214,
+      79,    22,    23,    24,   174,   175,   177,   179,   134,   217,
+     198,    76,   117,   192,    60,   198,   134,   135,   154,    22,
+      23,   225,    90,   163,   167,   167,    60,    95,   123,   134,
+     137,    15,   138,   166,    58,    59,   180,    11,    76,    83,
+     155,   156,   159,    68,    80,   157,    92,    53,   134,   164,
+     165,   166,    37,   216,   167,   175,   176,   167,   218,    60,
+      31,   222,   136,   137,   161,   153,   134,   167,    74,   219,
+     134,   156,   134,   198
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2429,21 +2419,21 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 363 "pl_gram.y"
+#line 361 "pl_gram.y"
     {
 						plpgsql_parse_result = (PLpgSQL_stmt_block *) (yyvsp[(2) - (3)].stmt);
 					;}
     break;
 
   case 5:
-#line 373 "pl_gram.y"
+#line 371 "pl_gram.y"
     {
 						plpgsql_DumpExecTree = true;
 					;}
     break;
 
   case 6:
-#line 377 "pl_gram.y"
+#line 375 "pl_gram.y"
     {
 						if (strcmp((yyvsp[(3) - (3)].str), "on") == 0)
 							plpgsql_curr_compile->print_strict_params = true;
@@ -2455,42 +2445,42 @@ yyreduce:
     break;
 
   case 7:
-#line 386 "pl_gram.y"
+#line 384 "pl_gram.y"
     {
 						plpgsql_curr_compile->resolve_option = PLPGSQL_RESOLVE_ERROR;
 					;}
     break;
 
   case 8:
-#line 390 "pl_gram.y"
+#line 388 "pl_gram.y"
     {
 						plpgsql_curr_compile->resolve_option = PLPGSQL_RESOLVE_VARIABLE;
 					;}
     break;
 
   case 9:
-#line 394 "pl_gram.y"
+#line 392 "pl_gram.y"
     {
 						plpgsql_curr_compile->resolve_option = PLPGSQL_RESOLVE_COLUMN;
 					;}
     break;
 
   case 10:
-#line 400 "pl_gram.y"
+#line 398 "pl_gram.y"
     {
 					(yyval.str) = (yyvsp[(1) - (1)].word).ident;
 				;}
     break;
 
   case 11:
-#line 404 "pl_gram.y"
+#line 402 "pl_gram.y"
     {
 					(yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword));
 				;}
     break;
 
   case 14:
-#line 413 "pl_gram.y"
+#line 411 "pl_gram.y"
     {
 						PLpgSQL_stmt_block *new;
 
@@ -2513,7 +2503,7 @@ yyreduce:
     break;
 
   case 15:
-#line 436 "pl_gram.y"
+#line 434 "pl_gram.y"
     {
 						/* done with decls, so resume identifier lookup */
 						plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;
@@ -2524,7 +2514,7 @@ yyreduce:
     break;
 
   case 16:
-#line 444 "pl_gram.y"
+#line 442 "pl_gram.y"
     {
 						plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;
 						(yyval.declhdr).label	  = (yyvsp[(1) - (2)].str);
@@ -2534,7 +2524,7 @@ yyreduce:
     break;
 
   case 17:
-#line 451 "pl_gram.y"
+#line 449 "pl_gram.y"
     {
 						plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;
 						(yyval.declhdr).label	  = (yyvsp[(1) - (3)].str);
@@ -2544,7 +2534,7 @@ yyreduce:
     break;
 
   case 18:
-#line 460 "pl_gram.y"
+#line 458 "pl_gram.y"
     {
 						/* Forget any variables created before block */
 						plpgsql_add_initdatums(NULL);
@@ -2557,14 +2547,14 @@ yyreduce:
     break;
 
   case 22:
-#line 477 "pl_gram.y"
+#line 475 "pl_gram.y"
     {
 						/* We allow useless extra DECLAREs */
 					;}
     break;
 
   case 23:
-#line 481 "pl_gram.y"
+#line 479 "pl_gram.y"
     {
 						/*
 						 * Throw a helpful error if user tries to put block
@@ -2578,7 +2568,7 @@ yyreduce:
     break;
 
   case 24:
-#line 494 "pl_gram.y"
+#line 492 "pl_gram.y"
     {
 						PLpgSQL_variable	*var;
 
@@ -2619,7 +2609,7 @@ yyreduce:
     break;
 
   case 25:
-#line 532 "pl_gram.y"
+#line 530 "pl_gram.y"
     {
 						plpgsql_ns_additem((yyvsp[(4) - (5)].nsitem)->itemtype,
 										   (yyvsp[(4) - (5)].nsitem)->itemno, (yyvsp[(1) - (5)].varname).name);
@@ -2627,18 +2617,14 @@ yyreduce:
     break;
 
   case 26:
-#line 537 "pl_gram.y"
+#line 535 "pl_gram.y"
     { plpgsql_ns_push((yyvsp[(1) - (3)].varname).name, PLPGSQL_LABEL_OTHER); ;}
     break;
 
   case 27:
-#line 539 "pl_gram.y"
+#line 537 "pl_gram.y"
     {
 						PLpgSQL_var *new;
-						PLpgSQL_expr *curname_def;
-						char		buf[NAMEDATALEN * 2 + 64];
-						char	   *cp1;
-						char	   *cp2;
 
 						/* pop local namespace for cursor args */
 						plpgsql_ns_pop();
@@ -2651,29 +2637,6 @@ yyreduce:
 																		  NULL),
 												   true);
 
-						curname_def = palloc0(sizeof(PLpgSQL_expr));
-
-						/* Note: refname has been truncated to NAMEDATALEN */
-						cp1 = new->refname;
-						cp2 = buf;
-						/*
-						 * Don't trust standard_conforming_strings here;
-						 * it might change before we use the string.
-						 */
-						if (strchr(cp1, '\\') != NULL)
-							*cp2++ = ESCAPE_STRING_SYNTAX;
-						*cp2++ = '\'';
-						while (*cp1)
-						{
-							if (SQL_STR_DOUBLE(*cp1, true))
-								*cp2++ = *cp1;
-							*cp2++ = *cp1++;
-						}
-						strcpy(cp2, "'::pg_catalog.refcursor");
-						curname_def->query = pstrdup(buf);
-						curname_def->parseMode = RAW_PARSE_PLPGSQL_EXPR;
-						new->default_val = curname_def;
-
 						new->cursor_explicit_expr = (yyvsp[(7) - (7)].expr);
 						if ((yyvsp[(5) - (7)].datum) == NULL)
 							new->cursor_explicit_argrow = -1;
@@ -2684,42 +2647,42 @@ yyreduce:
     break;
 
   case 28:
-#line 590 "pl_gram.y"
+#line 561 "pl_gram.y"
     {
 						(yyval.ival) = 0;
 					;}
     break;
 
   case 29:
-#line 594 "pl_gram.y"
+#line 565 "pl_gram.y"
     {
 						(yyval.ival) = CURSOR_OPT_NO_SCROLL;
 					;}
     break;
 
   case 30:
-#line 598 "pl_gram.y"
+#line 569 "pl_gram.y"
     {
 						(yyval.ival) = CURSOR_OPT_SCROLL;
 					;}
     break;
 
   case 31:
-#line 604 "pl_gram.y"
+#line 575 "pl_gram.y"
     {
 						(yyval.expr) = read_sql_stmt();
 					;}
     break;
 
   case 32:
-#line 610 "pl_gram.y"
+#line 581 "pl_gram.y"
     {
 						(yyval.datum) = NULL;
 					;}
     break;
 
   case 33:
-#line 614 "pl_gram.y"
+#line 585 "pl_gram.y"
     {
 						PLpgSQL_row *new;
 						int			i;
@@ -2751,21 +2714,21 @@ yyreduce:
     break;
 
   case 34:
-#line 645 "pl_gram.y"
+#line 616 "pl_gram.y"
     {
 						(yyval.list) = list_make1((yyvsp[(1) - (1)].datum));
 					;}
     break;
 
   case 35:
-#line 649 "pl_gram.y"
+#line 620 "pl_gram.y"
     {
 						(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].datum));
 					;}
     break;
 
   case 36:
-#line 655 "pl_gram.y"
+#line 626 "pl_gram.y"
     {
 						(yyval.datum) = (PLpgSQL_datum *)
 							plpgsql_build_variable((yyvsp[(1) - (2)].varname).name, (yyvsp[(1) - (2)].varname).lineno,
@@ -2774,7 +2737,7 @@ yyreduce:
     break;
 
   case 39:
-#line 666 "pl_gram.y"
+#line 637 "pl_gram.y"
     {
 						PLpgSQL_nsitem *nsi;
 
@@ -2792,7 +2755,7 @@ yyreduce:
     break;
 
   case 40:
-#line 681 "pl_gram.y"
+#line 652 "pl_gram.y"
     {
 						PLpgSQL_nsitem *nsi;
 
@@ -2810,7 +2773,7 @@ yyreduce:
     break;
 
   case 41:
-#line 696 "pl_gram.y"
+#line 667 "pl_gram.y"
     {
 						PLpgSQL_nsitem *nsi;
 
@@ -2839,7 +2802,7 @@ yyreduce:
     break;
 
   case 42:
-#line 724 "pl_gram.y"
+#line 695 "pl_gram.y"
     {
 						(yyval.varname).name = (yyvsp[(1) - (1)].word).ident;
 						(yyval.varname).lineno = plpgsql_location_to_lineno((yylsp[(1) - (1)]));
@@ -2870,7 +2833,7 @@ yyreduce:
     break;
 
   case 43:
-#line 752 "pl_gram.y"
+#line 723 "pl_gram.y"
     {
 						(yyval.varname).name = pstrdup((yyvsp[(1) - (1)].keyword));
 						(yyval.varname).lineno = plpgsql_location_to_lineno((yylsp[(1) - (1)]));
@@ -2901,21 +2864,22 @@ yyreduce:
     break;
 
   case 44:
-#line 782 "pl_gram.y"
+#line 753 "pl_gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 45:
-#line 784 "pl_gram.y"
+#line 755 "pl_gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 46:
-#line 788 "pl_gram.y"
+#line 759 "pl_gram.y"
     {
 						/*
-						 * If there's a lookahead token, read_datatype
-						 * should consume it.
+						 * If there's a lookahead token, read_datatype() will
+						 * consume it, and then we must tell bison to forget
+						 * it.
 						 */
 						(yyval.dtype) = read_datatype(yychar);
 						yyclearin;
@@ -2923,12 +2887,12 @@ yyreduce:
     break;
 
   case 47:
-#line 799 "pl_gram.y"
+#line 771 "pl_gram.y"
     { (yyval.oid) = InvalidOid; ;}
     break;
 
   case 48:
-#line 801 "pl_gram.y"
+#line 773 "pl_gram.y"
     {
 						(yyval.oid) = get_collation_oid(list_make1(makeString((yyvsp[(2) - (2)].word).ident)),
 											   false);
@@ -2936,7 +2900,7 @@ yyreduce:
     break;
 
   case 49:
-#line 806 "pl_gram.y"
+#line 778 "pl_gram.y"
     {
 						(yyval.oid) = get_collation_oid(list_make1(makeString(pstrdup((yyvsp[(2) - (2)].keyword)))),
 											   false);
@@ -2944,41 +2908,41 @@ yyreduce:
     break;
 
   case 50:
-#line 811 "pl_gram.y"
+#line 783 "pl_gram.y"
     {
 						(yyval.oid) = get_collation_oid((yyvsp[(2) - (2)].cword).idents, false);
 					;}
     break;
 
   case 51:
-#line 817 "pl_gram.y"
+#line 789 "pl_gram.y"
     { (yyval.boolean) = false; ;}
     break;
 
   case 52:
-#line 819 "pl_gram.y"
+#line 791 "pl_gram.y"
     { (yyval.boolean) = true; ;}
     break;
 
   case 53:
-#line 823 "pl_gram.y"
+#line 795 "pl_gram.y"
     { (yyval.expr) = NULL; ;}
     break;
 
   case 54:
-#line 825 "pl_gram.y"
+#line 797 "pl_gram.y"
     {
 						(yyval.expr) = read_sql_expression(';', ";");
 					;}
     break;
 
   case 59:
-#line 844 "pl_gram.y"
+#line 816 "pl_gram.y"
     { (yyval.list) = NIL; ;}
     break;
 
   case 60:
-#line 846 "pl_gram.y"
+#line 818 "pl_gram.y"
     {
 						/* don't bother linking null statements into list */
 						if ((yyvsp[(2) - (2)].stmt) == NULL)
@@ -2989,127 +2953,127 @@ yyreduce:
     break;
 
   case 61:
-#line 856 "pl_gram.y"
+#line 828 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (2)].stmt); ;}
     break;
 
   case 62:
-#line 858 "pl_gram.y"
+#line 830 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 63:
-#line 860 "pl_gram.y"
+#line 832 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 64:
-#line 862 "pl_gram.y"
+#line 834 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 65:
-#line 864 "pl_gram.y"
+#line 836 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 66:
-#line 866 "pl_gram.y"
+#line 838 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 67:
-#line 868 "pl_gram.y"
+#line 840 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 68:
-#line 870 "pl_gram.y"
+#line 842 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 69:
-#line 872 "pl_gram.y"
+#line 844 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 70:
-#line 874 "pl_gram.y"
+#line 846 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 71:
-#line 876 "pl_gram.y"
+#line 848 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 72:
-#line 878 "pl_gram.y"
+#line 850 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 73:
-#line 880 "pl_gram.y"
+#line 852 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 74:
-#line 882 "pl_gram.y"
+#line 854 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 75:
-#line 884 "pl_gram.y"
+#line 856 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 76:
-#line 886 "pl_gram.y"
+#line 858 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 77:
-#line 888 "pl_gram.y"
+#line 860 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 78:
-#line 890 "pl_gram.y"
+#line 862 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 79:
-#line 892 "pl_gram.y"
+#line 864 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 80:
-#line 894 "pl_gram.y"
+#line 866 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 81:
-#line 896 "pl_gram.y"
+#line 868 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 82:
-#line 898 "pl_gram.y"
+#line 870 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 83:
-#line 900 "pl_gram.y"
+#line 872 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 84:
-#line 902 "pl_gram.y"
+#line 874 "pl_gram.y"
     { (yyval.stmt) = (yyvsp[(1) - (1)].stmt); ;}
     break;
 
   case 85:
-#line 906 "pl_gram.y"
+#line 878 "pl_gram.y"
     {
 						PLpgSQL_stmt_perform *new;
 						int			startloc;
@@ -3130,7 +3094,7 @@ yyreduce:
 						 */
 						new->expr = read_sql_construct(';', 0, 0, ";",
 													   RAW_PARSE_DEFAULT,
-													   false, false, true,
+													   false, false,
 													   &startloc, NULL);
 						/* overwrite "perform" ... */
 						memcpy(new->expr->query, " SELECT", 7);
@@ -3146,7 +3110,7 @@ yyreduce:
     break;
 
   case 86:
-#line 942 "pl_gram.y"
+#line 914 "pl_gram.y"
     {
 						PLpgSQL_stmt_call *new;
 
@@ -3167,7 +3131,7 @@ yyreduce:
     break;
 
   case 87:
-#line 960 "pl_gram.y"
+#line 932 "pl_gram.y"
     {
 						/* use the same structures as for CALL, for simplicity */
 						PLpgSQL_stmt_call *new;
@@ -3189,7 +3153,7 @@ yyreduce:
     break;
 
   case 88:
-#line 981 "pl_gram.y"
+#line 953 "pl_gram.y"
     {
 						PLpgSQL_stmt_assign *new;
 						RawParseMode pmode;
@@ -3221,7 +3185,7 @@ yyreduce:
 						plpgsql_push_back_token(T_DATUM);
 						new->expr = read_sql_construct(';', 0, 0, ";",
 													   pmode,
-													   false, true, true,
+													   false, true,
 													   NULL, NULL);
 
 						(yyval.stmt) = (PLpgSQL_stmt *) new;
@@ -3229,7 +3193,7 @@ yyreduce:
     break;
 
   case 89:
-#line 1020 "pl_gram.y"
+#line 992 "pl_gram.y"
     {
 						PLpgSQL_stmt_getdiag *new;
 						ListCell	   *lc;
@@ -3252,6 +3216,7 @@ yyreduce:
 							{
 								/* these fields are disallowed in stacked case */
 								case PLPGSQL_GETDIAG_ROW_COUNT:
+								case PLPGSQL_GETDIAG_ROUTINE_OID:
 									if (new->is_stacked)
 										ereport(ERROR,
 												(errcode(ERRCODE_SYNTAX_ERROR),
@@ -3292,42 +3257,42 @@ yyreduce:
     break;
 
   case 90:
-#line 1082 "pl_gram.y"
+#line 1055 "pl_gram.y"
     {
 						(yyval.boolean) = false;
 					;}
     break;
 
   case 91:
-#line 1086 "pl_gram.y"
+#line 1059 "pl_gram.y"
     {
 						(yyval.boolean) = false;
 					;}
     break;
 
   case 92:
-#line 1090 "pl_gram.y"
+#line 1063 "pl_gram.y"
     {
 						(yyval.boolean) = true;
 					;}
     break;
 
   case 93:
-#line 1096 "pl_gram.y"
+#line 1069 "pl_gram.y"
     {
 						(yyval.list) = lappend((yyvsp[(1) - (3)].list), (yyvsp[(3) - (3)].diagitem));
 					;}
     break;
 
   case 94:
-#line 1100 "pl_gram.y"
+#line 1073 "pl_gram.y"
     {
 						(yyval.list) = list_make1((yyvsp[(1) - (1)].diagitem));
 					;}
     break;
 
   case 95:
-#line 1106 "pl_gram.y"
+#line 1079 "pl_gram.y"
     {
 						PLpgSQL_diag_item *new;
 
@@ -3340,13 +3305,16 @@ yyreduce:
     break;
 
   case 96:
-#line 1118 "pl_gram.y"
+#line 1091 "pl_gram.y"
     {
 						int			tok = yylex();
 
 						if (tok_is_keyword(tok, &yylval,
 										   K_ROW_COUNT, "row_count"))
 							(yyval.ival) = PLPGSQL_GETDIAG_ROW_COUNT;
+						else if (tok_is_keyword(tok, &yylval,
+												K_PG_ROUTINE_OID, "pg_routine_oid"))
+							(yyval.ival) = PLPGSQL_GETDIAG_ROUTINE_OID;
 						else if (tok_is_keyword(tok, &yylval,
 												K_PG_CONTEXT, "pg_context"))
 							(yyval.ival) = PLPGSQL_GETDIAG_CONTEXT;
@@ -3386,7 +3354,7 @@ yyreduce:
     break;
 
   case 97:
-#line 1163 "pl_gram.y"
+#line 1139 "pl_gram.y"
     {
 						/*
 						 * In principle we should support a getdiag_target
@@ -3407,7 +3375,7 @@ yyreduce:
     break;
 
   case 98:
-#line 1181 "pl_gram.y"
+#line 1157 "pl_gram.y"
     {
 						/* just to give a better message than "syntax error" */
 						word_is_not_variable(&((yyvsp[(1) - (1)].word)), (yylsp[(1) - (1)]));
@@ -3415,7 +3383,7 @@ yyreduce:
     break;
 
   case 99:
-#line 1186 "pl_gram.y"
+#line 1162 "pl_gram.y"
     {
 						/* just to give a better message than "syntax error" */
 						cword_is_not_variable(&((yyvsp[(1) - (1)].cword)), (yylsp[(1) - (1)]));
@@ -3423,7 +3391,7 @@ yyreduce:
     break;
 
   case 100:
-#line 1193 "pl_gram.y"
+#line 1169 "pl_gram.y"
     {
 						PLpgSQL_stmt_if *new;
 
@@ -3441,14 +3409,14 @@ yyreduce:
     break;
 
   case 101:
-#line 1210 "pl_gram.y"
+#line 1186 "pl_gram.y"
     {
 						(yyval.list) = NIL;
 					;}
     break;
 
   case 102:
-#line 1214 "pl_gram.y"
+#line 1190 "pl_gram.y"
     {
 						PLpgSQL_if_elsif *new;
 
@@ -3462,28 +3430,28 @@ yyreduce:
     break;
 
   case 103:
-#line 1227 "pl_gram.y"
+#line 1203 "pl_gram.y"
     {
 						(yyval.list) = NIL;
 					;}
     break;
 
   case 104:
-#line 1231 "pl_gram.y"
+#line 1207 "pl_gram.y"
     {
 						(yyval.list) = (yyvsp[(2) - (2)].list);
 					;}
     break;
 
   case 105:
-#line 1237 "pl_gram.y"
+#line 1213 "pl_gram.y"
     {
 						(yyval.stmt) = make_case((yylsp[(1) - (7)]), (yyvsp[(2) - (7)].expr), (yyvsp[(3) - (7)].list), (yyvsp[(4) - (7)].list));
 					;}
     break;
 
   case 106:
-#line 1243 "pl_gram.y"
+#line 1219 "pl_gram.y"
     {
 						PLpgSQL_expr *expr = NULL;
 						int			tok = yylex();
@@ -3499,21 +3467,21 @@ yyreduce:
     break;
 
   case 107:
-#line 1258 "pl_gram.y"
+#line 1234 "pl_gram.y"
     {
 						(yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].casewhen));
 					;}
     break;
 
   case 108:
-#line 1262 "pl_gram.y"
+#line 1238 "pl_gram.y"
     {
 						(yyval.list) = list_make1((yyvsp[(1) - (1)].casewhen));
 					;}
     break;
 
   case 109:
-#line 1268 "pl_gram.y"
+#line 1244 "pl_gram.y"
     {
 						PLpgSQL_case_when *new = palloc(sizeof(PLpgSQL_case_when));
 
@@ -3525,14 +3493,14 @@ yyreduce:
     break;
 
   case 110:
-#line 1279 "pl_gram.y"
+#line 1255 "pl_gram.y"
     {
 						(yyval.list) = NIL;
 					;}
     break;
 
   case 111:
-#line 1283 "pl_gram.y"
+#line 1259 "pl_gram.y"
     {
 						/*
 						 * proc_sect could return an empty list, but we
@@ -3548,7 +3516,7 @@ yyreduce:
     break;
 
   case 112:
-#line 1298 "pl_gram.y"
+#line 1274 "pl_gram.y"
     {
 						PLpgSQL_stmt_loop *new;
 
@@ -3567,7 +3535,7 @@ yyreduce:
     break;
 
   case 113:
-#line 1316 "pl_gram.y"
+#line 1292 "pl_gram.y"
     {
 						PLpgSQL_stmt_while *new;
 
@@ -3587,7 +3555,7 @@ yyreduce:
     break;
 
   case 114:
-#line 1335 "pl_gram.y"
+#line 1311 "pl_gram.y"
     {
 						/* This runs after we've scanned the loop body */
 						if ((yyvsp[(3) - (4)].stmt)->cmd_type == PLPGSQL_STMT_FORI)
@@ -3622,7 +3590,7 @@ yyreduce:
     break;
 
   case 115:
-#line 1369 "pl_gram.y"
+#line 1345 "pl_gram.y"
     {
 						int			tok = yylex();
 						int			tokloc = yylloc;
@@ -3755,7 +3723,6 @@ yyreduce:
 													   RAW_PARSE_DEFAULT,
 													   true,
 													   false,
-													   true,
 													   &expr1loc,
 													   &tok);
 
@@ -3864,7 +3831,7 @@ yyreduce:
     break;
 
   case 116:
-#line 1628 "pl_gram.y"
+#line 1603 "pl_gram.y"
     {
 						(yyval.forvariable).name = NameOfDatum(&((yyvsp[(1) - (1)].wdatum)));
 						(yyval.forvariable).lineno = plpgsql_location_to_lineno((yylsp[(1) - (1)]));
@@ -3893,7 +3860,7 @@ yyreduce:
     break;
 
   case 117:
-#line 1654 "pl_gram.y"
+#line 1629 "pl_gram.y"
     {
 						int			tok;
 
@@ -3910,7 +3877,7 @@ yyreduce:
     break;
 
   case 118:
-#line 1668 "pl_gram.y"
+#line 1643 "pl_gram.y"
     {
 						/* just to give a better message than "syntax error" */
 						cword_is_not_variable(&((yyvsp[(1) - (1)].cword)), (yylsp[(1) - (1)]));
@@ -3918,7 +3885,7 @@ yyreduce:
     break;
 
   case 119:
-#line 1675 "pl_gram.y"
+#line 1650 "pl_gram.y"
     {
 						PLpgSQL_stmt_foreach_a *new;
 
@@ -3957,21 +3924,21 @@ yyreduce:
     break;
 
   case 120:
-#line 1713 "pl_gram.y"
+#line 1688 "pl_gram.y"
     {
 						(yyval.ival) = 0;
 					;}
     break;
 
   case 121:
-#line 1717 "pl_gram.y"
+#line 1692 "pl_gram.y"
     {
 						(yyval.ival) = (yyvsp[(2) - (2)].ival);
 					;}
     break;
 
   case 122:
-#line 1723 "pl_gram.y"
+#line 1698 "pl_gram.y"
     {
 						PLpgSQL_stmt_exit *new;
 
@@ -4025,21 +3992,21 @@ yyreduce:
     break;
 
   case 123:
-#line 1776 "pl_gram.y"
+#line 1751 "pl_gram.y"
     {
 						(yyval.boolean) = true;
 					;}
     break;
 
   case 124:
-#line 1780 "pl_gram.y"
+#line 1755 "pl_gram.y"
     {
 						(yyval.boolean) = false;
 					;}
     break;
 
   case 125:
-#line 1786 "pl_gram.y"
+#line 1761 "pl_gram.y"
     {
 						int			tok;
 
@@ -4066,7 +4033,7 @@ yyreduce:
     break;
 
   case 126:
-#line 1812 "pl_gram.y"
+#line 1787 "pl_gram.y"
     {
 						PLpgSQL_stmt_raise *new;
 						int			tok;
@@ -4161,7 +4128,7 @@ yyreduce:
 									expr = read_sql_construct(',', ';', K_USING,
 															  ", or ; or USING",
 															  RAW_PARSE_PLPGSQL_EXPR,
-															  true, true, true,
+															  true, true,
 															  NULL, &tok);
 									new->params = lappend(new->params, expr);
 								}
@@ -4212,7 +4179,7 @@ yyreduce:
     break;
 
   case 127:
-#line 1957 "pl_gram.y"
+#line 1932 "pl_gram.y"
     {
 						PLpgSQL_stmt_assert	*new;
 						int			tok;
@@ -4237,7 +4204,7 @@ yyreduce:
     break;
 
   case 128:
-#line 1981 "pl_gram.y"
+#line 1956 "pl_gram.y"
     {
 						(yyval.loop_body).stmts = (yyvsp[(1) - (5)].list);
 						(yyval.loop_body).end_label = (yyvsp[(4) - (5)].str);
@@ -4246,28 +4213,28 @@ yyreduce:
     break;
 
   case 129:
-#line 1999 "pl_gram.y"
+#line 1974 "pl_gram.y"
     {
-						(yyval.stmt) = make_execsql_stmt(K_IMPORT, (yylsp[(1) - (1)]));
+						(yyval.stmt) = make_execsql_stmt(K_IMPORT, (yylsp[(1) - (1)]), NULL);
 					;}
     break;
 
   case 130:
-#line 2003 "pl_gram.y"
+#line 1978 "pl_gram.y"
     {
-						(yyval.stmt) = make_execsql_stmt(K_INSERT, (yylsp[(1) - (1)]));
+						(yyval.stmt) = make_execsql_stmt(K_INSERT, (yylsp[(1) - (1)]), NULL);
 					;}
     break;
 
   case 131:
-#line 2007 "pl_gram.y"
+#line 1982 "pl_gram.y"
     {
-						(yyval.stmt) = make_execsql_stmt(K_MERGE, (yylsp[(1) - (1)]));
+						(yyval.stmt) = make_execsql_stmt(K_MERGE, (yylsp[(1) - (1)]), NULL);
 					;}
     break;
 
   case 132:
-#line 2011 "pl_gram.y"
+#line 1986 "pl_gram.y"
     {
 						int			tok;
 
@@ -4276,12 +4243,12 @@ yyreduce:
 						if (tok == '=' || tok == COLON_EQUALS ||
 							tok == '[' || tok == '.')
 							word_is_not_variable(&((yyvsp[(1) - (1)].word)), (yylsp[(1) - (1)]));
-						(yyval.stmt) = make_execsql_stmt(T_WORD, (yylsp[(1) - (1)]));
+						(yyval.stmt) = make_execsql_stmt(T_WORD, (yylsp[(1) - (1)]), &((yyvsp[(1) - (1)].word)));
 					;}
     break;
 
   case 133:
-#line 2022 "pl_gram.y"
+#line 1997 "pl_gram.y"
     {
 						int			tok;
 
@@ -4290,12 +4257,12 @@ yyreduce:
 						if (tok == '=' || tok == COLON_EQUALS ||
 							tok == '[' || tok == '.')
 							cword_is_not_variable(&((yyvsp[(1) - (1)].cword)), (yylsp[(1) - (1)]));
-						(yyval.stmt) = make_execsql_stmt(T_CWORD, (yylsp[(1) - (1)]));
+						(yyval.stmt) = make_execsql_stmt(T_CWORD, (yylsp[(1) - (1)]), NULL);
 					;}
     break;
 
   case 134:
-#line 2035 "pl_gram.y"
+#line 2010 "pl_gram.y"
     {
 						PLpgSQL_stmt_dynexecute *new;
 						PLpgSQL_expr *expr;
@@ -4304,7 +4271,7 @@ yyreduce:
 						expr = read_sql_construct(K_INTO, K_USING, ';',
 												  "INTO or USING or ;",
 												  RAW_PARSE_PLPGSQL_EXPR,
-												  true, true, true,
+												  true, true,
 												  NULL, &endtoken);
 
 						new = palloc(sizeof(PLpgSQL_stmt_dynexecute));
@@ -4343,7 +4310,7 @@ yyreduce:
 									expr = read_sql_construct(',', ';', K_INTO,
 															  ", or ; or INTO",
 															  RAW_PARSE_PLPGSQL_EXPR,
-															  true, true, true,
+															  true, true,
 															  NULL, &endtoken);
 									new->params = lappend(new->params, expr);
 								} while (endtoken == ',');
@@ -4359,7 +4326,7 @@ yyreduce:
     break;
 
   case 135:
-#line 2099 "pl_gram.y"
+#line 2074 "pl_gram.y"
     {
 						PLpgSQL_stmt_open *new;
 						int			tok;
@@ -4438,7 +4405,7 @@ yyreduce:
     break;
 
   case 136:
-#line 2177 "pl_gram.y"
+#line 2152 "pl_gram.y"
     {
 						PLpgSQL_stmt_fetch *fetch = (yyvsp[(2) - (4)].fetch);
 						PLpgSQL_variable *target;
@@ -4469,7 +4436,7 @@ yyreduce:
     break;
 
   case 137:
-#line 2207 "pl_gram.y"
+#line 2182 "pl_gram.y"
     {
 						PLpgSQL_stmt_fetch *fetch = (yyvsp[(2) - (4)].fetch);
 
@@ -4482,14 +4449,14 @@ yyreduce:
     break;
 
   case 138:
-#line 2219 "pl_gram.y"
+#line 2194 "pl_gram.y"
     {
 						(yyval.fetch) = read_fetch_direction();
 					;}
     break;
 
   case 139:
-#line 2225 "pl_gram.y"
+#line 2200 "pl_gram.y"
     {
 						PLpgSQL_stmt_close *new;
 
@@ -4504,7 +4471,7 @@ yyreduce:
     break;
 
   case 140:
-#line 2239 "pl_gram.y"
+#line 2214 "pl_gram.y"
     {
 						/* We do not bother building a node for NULL */
 						(yyval.stmt) = NULL;
@@ -4512,7 +4479,7 @@ yyreduce:
     break;
 
   case 141:
-#line 2246 "pl_gram.y"
+#line 2221 "pl_gram.y"
     {
 						PLpgSQL_stmt_commit *new;
 
@@ -4527,7 +4494,7 @@ yyreduce:
     break;
 
   case 142:
-#line 2260 "pl_gram.y"
+#line 2235 "pl_gram.y"
     {
 						PLpgSQL_stmt_rollback *new;
 
@@ -4542,22 +4509,22 @@ yyreduce:
     break;
 
   case 143:
-#line 2274 "pl_gram.y"
+#line 2249 "pl_gram.y"
     { (yyval.ival) = true; ;}
     break;
 
   case 144:
-#line 2275 "pl_gram.y"
+#line 2250 "pl_gram.y"
     { (yyval.ival) = false; ;}
     break;
 
   case 145:
-#line 2276 "pl_gram.y"
+#line 2251 "pl_gram.y"
     { (yyval.ival) = false; ;}
     break;
 
   case 146:
-#line 2281 "pl_gram.y"
+#line 2256 "pl_gram.y"
     {
 						/*
 						 * In principle we should support a cursor_variable
@@ -4582,7 +4549,7 @@ yyreduce:
     break;
 
   case 147:
-#line 2303 "pl_gram.y"
+#line 2278 "pl_gram.y"
     {
 						/* just to give a better message than "syntax error" */
 						word_is_not_variable(&((yyvsp[(1) - (1)].word)), (yylsp[(1) - (1)]));
@@ -4590,7 +4557,7 @@ yyreduce:
     break;
 
   case 148:
-#line 2308 "pl_gram.y"
+#line 2283 "pl_gram.y"
     {
 						/* just to give a better message than "syntax error" */
 						cword_is_not_variable(&((yyvsp[(1) - (1)].cword)), (yylsp[(1) - (1)]));
@@ -4598,12 +4565,12 @@ yyreduce:
     break;
 
   case 149:
-#line 2315 "pl_gram.y"
+#line 2290 "pl_gram.y"
     { (yyval.exception_block) = NULL; ;}
     break;
 
   case 150:
-#line 2317 "pl_gram.y"
+#line 2292 "pl_gram.y"
     {
 						/*
 						 * We use a mid-rule action to add these
@@ -4639,7 +4606,7 @@ yyreduce:
     break;
 
   case 151:
-#line 2350 "pl_gram.y"
+#line 2325 "pl_gram.y"
     {
 						PLpgSQL_exception_block *new = (yyvsp[(2) - (3)].exception_block);
 						new->exc_list = (yyvsp[(3) - (3)].list);
@@ -4649,21 +4616,21 @@ yyreduce:
     break;
 
   case 152:
-#line 2359 "pl_gram.y"
+#line 2334 "pl_gram.y"
     {
 							(yyval.list) = lappend((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].exception));
 						;}
     break;
 
   case 153:
-#line 2363 "pl_gram.y"
+#line 2338 "pl_gram.y"
     {
 							(yyval.list) = list_make1((yyvsp[(1) - (1)].exception));
 						;}
     break;
 
   case 154:
-#line 2369 "pl_gram.y"
+#line 2344 "pl_gram.y"
     {
 						PLpgSQL_exception *new;
 
@@ -4677,7 +4644,7 @@ yyreduce:
     break;
 
   case 155:
-#line 2382 "pl_gram.y"
+#line 2357 "pl_gram.y"
     {
 							PLpgSQL_condition	*old;
 
@@ -4689,14 +4656,14 @@ yyreduce:
     break;
 
   case 156:
-#line 2391 "pl_gram.y"
+#line 2366 "pl_gram.y"
     {
 							(yyval.condition) = (yyvsp[(1) - (1)].condition);
 						;}
     break;
 
   case 157:
-#line 2397 "pl_gram.y"
+#line 2372 "pl_gram.y"
     {
 							if (strcmp((yyvsp[(1) - (1)].str), "sqlstate") != 0)
 							{
@@ -4733,22 +4700,22 @@ yyreduce:
     break;
 
   case 158:
-#line 2433 "pl_gram.y"
+#line 2408 "pl_gram.y"
     { (yyval.expr) = read_sql_expression(';', ";"); ;}
     break;
 
   case 159:
-#line 2437 "pl_gram.y"
+#line 2412 "pl_gram.y"
     { (yyval.expr) = read_sql_expression(K_THEN, "THEN"); ;}
     break;
 
   case 160:
-#line 2441 "pl_gram.y"
+#line 2416 "pl_gram.y"
     { (yyval.expr) = read_sql_expression(K_LOOP, "LOOP"); ;}
     break;
 
   case 161:
-#line 2445 "pl_gram.y"
+#line 2420 "pl_gram.y"
     {
 						plpgsql_ns_push(NULL, PLPGSQL_LABEL_BLOCK);
 						(yyval.str) = NULL;
@@ -4756,7 +4723,7 @@ yyreduce:
     break;
 
   case 162:
-#line 2450 "pl_gram.y"
+#line 2425 "pl_gram.y"
     {
 						plpgsql_ns_push((yyvsp[(2) - (3)].str), PLPGSQL_LABEL_BLOCK);
 						(yyval.str) = (yyvsp[(2) - (3)].str);
@@ -4764,7 +4731,7 @@ yyreduce:
     break;
 
   case 163:
-#line 2457 "pl_gram.y"
+#line 2432 "pl_gram.y"
     {
 						plpgsql_ns_push(NULL, PLPGSQL_LABEL_LOOP);
 						(yyval.str) = NULL;
@@ -4772,7 +4739,7 @@ yyreduce:
     break;
 
   case 164:
-#line 2462 "pl_gram.y"
+#line 2437 "pl_gram.y"
     {
 						plpgsql_ns_push((yyvsp[(2) - (3)].str), PLPGSQL_LABEL_LOOP);
 						(yyval.str) = (yyvsp[(2) - (3)].str);
@@ -4780,14 +4747,14 @@ yyreduce:
     break;
 
   case 165:
-#line 2469 "pl_gram.y"
+#line 2444 "pl_gram.y"
     {
 						(yyval.str) = NULL;
 					;}
     break;
 
   case 166:
-#line 2473 "pl_gram.y"
+#line 2448 "pl_gram.y"
     {
 						/* label validity will be checked by outer production */
 						(yyval.str) = (yyvsp[(1) - (1)].str);
@@ -4795,31 +4762,31 @@ yyreduce:
     break;
 
   case 167:
-#line 2480 "pl_gram.y"
+#line 2455 "pl_gram.y"
     { (yyval.expr) = NULL; ;}
     break;
 
   case 168:
-#line 2482 "pl_gram.y"
+#line 2457 "pl_gram.y"
     { (yyval.expr) = (yyvsp[(2) - (2)].expr); ;}
     break;
 
   case 169:
-#line 2489 "pl_gram.y"
+#line 2464 "pl_gram.y"
     {
 						(yyval.str) = (yyvsp[(1) - (1)].word).ident;
 					;}
     break;
 
   case 170:
-#line 2493 "pl_gram.y"
+#line 2468 "pl_gram.y"
     {
 						(yyval.str) = pstrdup((yyvsp[(1) - (1)].keyword));
 					;}
     break;
 
   case 171:
-#line 2497 "pl_gram.y"
+#line 2472 "pl_gram.y"
     {
 						if ((yyvsp[(1) - (1)].wdatum).ident == NULL) /* composite name not OK */
 							yyerror("syntax error");
@@ -4829,7 +4796,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 4780 "pl_gram.c"
+#line 4747 "pl_gram.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -5049,7 +5016,7 @@ yyreturn:
 }
 
 
-#line 2588 "pl_gram.y"
+#line 2564 "pl_gram.y"
 
 
 /*
@@ -5128,7 +5095,7 @@ read_sql_expression(int until, const char *expected)
 {
 	return read_sql_construct(until, 0, 0, expected,
 							  RAW_PARSE_PLPGSQL_EXPR,
-							  true, true, true, NULL, NULL);
+							  true, true, NULL, NULL);
 }
 
 /* Convenience routine to read an expression with two possible terminators */
@@ -5138,7 +5105,7 @@ read_sql_expression2(int until, int until2, const char *expected,
 {
 	return read_sql_construct(until, until2, 0, expected,
 							  RAW_PARSE_PLPGSQL_EXPR,
-							  true, true, true, NULL, endtoken);
+							  true, true, NULL, endtoken);
 }
 
 /* Convenience routine to read a SQL statement that must end with ';' */
@@ -5147,7 +5114,7 @@ read_sql_stmt(void)
 {
 	return read_sql_construct(';', 0, 0, ";",
 							  RAW_PARSE_DEFAULT,
-							  false, true, true, NULL, NULL);
+							  false, true, NULL, NULL);
 }
 
 /*
@@ -5160,7 +5127,6 @@ read_sql_stmt(void)
  * parsemode:	raw_parser() mode to use
  * isexpression: whether to say we're reading an "expression" or a "statement"
  * valid_sql:   whether to check the syntax of the expr
- * trim:		trim trailing whitespace
  * startloc:	if not NULL, location of first token is stored at *startloc
  * endtoken:	if not NULL, ending token is stored at *endtoken
  *				(this is only interesting if until2 or until3 isn't zero)
@@ -5173,7 +5139,6 @@ read_sql_construct(int until,
 				   RawParseMode parsemode,
 				   bool isexpression,
 				   bool valid_sql,
-				   bool trim,
 				   int *startloc,
 				   int *endtoken)
 {
@@ -5181,6 +5146,7 @@ read_sql_construct(int until,
 	StringInfoData ds;
 	IdentifierLookup save_IdentifierLookup;
 	int			startlocation = -1;
+	int			endlocation = -1;
 	int			parenlevel = 0;
 	PLpgSQL_expr *expr;
 
@@ -5231,6 +5197,8 @@ read_sql_construct(int until,
 								expected),
 						 parser_errposition(yylloc)));
 		}
+		/* Remember end+1 location of last accepted token */
+		endlocation = yylloc + plpgsql_token_length();
 	}
 
 	plpgsql_IdentifierLookup = save_IdentifierLookup;
@@ -5241,7 +5209,7 @@ read_sql_construct(int until,
 		*endtoken = tok;
 
 	/* give helpful complaint about empty input */
-	if (startlocation >= yylloc)
+	if (startlocation >= endlocation)
 	{
 		if (isexpression)
 			yyerror("missing expression");
@@ -5249,14 +5217,14 @@ read_sql_construct(int until,
 			yyerror("missing SQL statement");
 	}
 
-	plpgsql_append_source_text(&ds, startlocation, yylloc);
-
-	/* trim any trailing whitespace, for neatness */
-	if (trim)
-	{
-		while (ds.len > 0 && scanner_isspace(ds.data[ds.len - 1]))
-			ds.data[--ds.len] = '\0';
-	}
+	/*
+	 * We save only the text from startlocation to endlocation-1.  This
+	 * suppresses the "until" token as well as any whitespace or comments
+	 * following the last accepted token.  (We used to strip such trailing
+	 * whitespace by hand, but that causes problems if there's a "-- comment"
+	 * in front of said whitespace.)
+	 */
+	plpgsql_append_source_text(&ds, startlocation, endlocation);
 
 	expr = palloc0(sizeof(PLpgSQL_expr));
 	expr->query = pstrdup(ds.data);
@@ -5273,13 +5241,17 @@ read_sql_construct(int until,
 	return expr;
 }
 
+/*
+ * Read a datatype declaration, consuming the current lookahead token if any.
+ * Returns a PLpgSQL_type struct.
+ */
 static PLpgSQL_type *
 read_datatype(int tok)
 {
 	StringInfoData ds;
 	char	   *type_name;
 	int			startlocation;
-	PLpgSQL_type *result;
+	PLpgSQL_type *result = NULL;
 	int			parenlevel = 0;
 
 	/* Should only be called while parsing DECLARE sections */
@@ -5289,11 +5261,12 @@ read_datatype(int tok)
 	if (tok == YYEMPTY)
 		tok = yylex();
 
+	/* The current token is the start of what we'll pass to parse_datatype */
 	startlocation = yylloc;
 
 	/*
-	 * If we have a simple or composite identifier, check for %TYPE
-	 * and %ROWTYPE constructs.
+	 * If we have a simple or composite identifier, check for %TYPE and
+	 * %ROWTYPE constructs.
 	 */
 	if (tok == T_WORD)
 	{
@@ -5305,18 +5278,10 @@ read_datatype(int tok)
 			tok = yylex();
 			if (tok_is_keyword(tok, &yylval,
 							   K_TYPE, "type"))
-			{
 				result = plpgsql_parse_wordtype(dtname);
-				if (result)
-					return result;
-			}
 			else if (tok_is_keyword(tok, &yylval,
 									K_ROWTYPE, "rowtype"))
-			{
 				result = plpgsql_parse_wordrowtype(dtname);
-				if (result)
-					return result;
-			}
 		}
 	}
 	else if (plpgsql_token_is_unreserved_keyword(tok))
@@ -5329,18 +5294,10 @@ read_datatype(int tok)
 			tok = yylex();
 			if (tok_is_keyword(tok, &yylval,
 							   K_TYPE, "type"))
-			{
 				result = plpgsql_parse_wordtype(dtname);
-				if (result)
-					return result;
-			}
 			else if (tok_is_keyword(tok, &yylval,
 									K_ROWTYPE, "rowtype"))
-			{
 				result = plpgsql_parse_wordrowtype(dtname);
-				if (result)
-					return result;
-			}
 		}
 	}
 	else if (tok == T_CWORD)
@@ -5353,21 +5310,56 @@ read_datatype(int tok)
 			tok = yylex();
 			if (tok_is_keyword(tok, &yylval,
 							   K_TYPE, "type"))
-			{
 				result = plpgsql_parse_cwordtype(dtnames);
-				if (result)
-					return result;
-			}
 			else if (tok_is_keyword(tok, &yylval,
 									K_ROWTYPE, "rowtype"))
-			{
 				result = plpgsql_parse_cwordrowtype(dtnames);
-				if (result)
-					return result;
-			}
 		}
 	}
 
+	/*
+	 * If we recognized a %TYPE or %ROWTYPE construct, see if it is followed
+	 * by array decoration: [ ARRAY ] [ '[' [ iconst ] ']' [ ... ] ]
+	 *
+	 * Like the core parser, we ignore the specific numbers and sizes of
+	 * dimensions; arrays of different dimensionality are still the same type
+	 * in Postgres.
+	 */
+	if (result)
+	{
+		bool		is_array = false;
+
+		tok = yylex();
+		if (tok_is_keyword(tok, &yylval,
+						   K_ARRAY, "array"))
+		{
+			is_array = true;
+			tok = yylex();
+		}
+		while (tok == '[')
+		{
+			is_array = true;
+			tok = yylex();
+			if (tok == ICONST)
+				tok = yylex();
+			if (tok != ']')
+				yyerror("syntax error, expected \"]\"");
+			tok = yylex();
+		}
+		plpgsql_push_back_token(tok);
+
+		if (is_array)
+			result = plpgsql_build_datatype_arrayof(result);
+
+		return result;
+	}
+
+	/*
+	 * Not %TYPE or %ROWTYPE, so scan to the end of the datatype declaration,
+	 * which could include typmod or array decoration.  We are not very picky
+	 * here, instead relying on parse_datatype to complain about garbage.  But
+	 * we must count parens to handle typmods within cursor_arg correctly.
+	 */
 	while (tok != ';')
 	{
 		if (tok == 0)
@@ -5409,8 +5401,13 @@ read_datatype(int tok)
 	return result;
 }
 
+/*
+ * Read a generic SQL statement.  We have already read its first token;
+ * firsttoken is that token's code and location its starting location.
+ * If firsttoken == T_WORD, pass its yylval value as "word", else pass NULL.
+ */
 static PLpgSQL_stmt *
-make_execsql_stmt(int firsttoken, int location)
+make_execsql_stmt(int firsttoken, int location, PLword *word)
 {
 	StringInfoData ds;
 	IdentifierLookup save_IdentifierLookup;
@@ -5423,9 +5420,16 @@ make_execsql_stmt(int firsttoken, int location)
 	bool		have_strict = false;
 	int			into_start_loc = -1;
 	int			into_end_loc = -1;
+	int			paren_depth = 0;
+	int			begin_depth = 0;
+	bool		in_routine_definition = false;
+	int			token_count = 0;
+	char		tokens[4];		/* records the first few tokens */
 
 	initStringInfo(&ds);
 
+	memset(tokens, 0, sizeof(tokens));
+
 	/* special lookup mode for identifiers within the SQL text */
 	save_IdentifierLookup = plpgsql_IdentifierLookup;
 	plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_EXPR;
@@ -5434,6 +5438,12 @@ make_execsql_stmt(int firsttoken, int location)
 	 * Scan to the end of the SQL command.  Identify any INTO-variables
 	 * clause lurking within it, and parse that via read_into_target().
 	 *
+	 * The end of the statement is defined by a semicolon ... except that
+	 * semicolons within parentheses or BEGIN/END blocks don't terminate a
+	 * statement.  We follow psql's lead in not recognizing BEGIN/END except
+	 * after CREATE [OR REPLACE] {FUNCTION|PROCEDURE}.  END can also appear
+	 * within a CASE construct, so we treat CASE/END like BEGIN/END.
+	 *
 	 * Because INTO is sometimes used in the main SQL grammar, we have to be
 	 * careful not to take any such usage of INTO as a PL/pgSQL INTO clause.
 	 * There are currently three such cases:
@@ -5459,13 +5469,50 @@ make_execsql_stmt(int firsttoken, int location)
 	 * break this logic again ... beware!
 	 */
 	tok = firsttoken;
+	if (tok == T_WORD && strcmp(word->ident, "create") == 0)
+		tokens[token_count] = 'c';
+	token_count++;
+
 	for (;;)
 	{
 		prev_tok = tok;
 		tok = yylex();
 		if (have_into && into_end_loc < 0)
 			into_end_loc = yylloc;		/* token after the INTO part */
-		if (tok == ';')
+		/* Detect CREATE [OR REPLACE] {FUNCTION|PROCEDURE} */
+		if (tokens[0] == 'c' && token_count < sizeof(tokens))
+		{
+			if (tok == K_OR)
+				tokens[token_count] = 'o';
+			else if (tok == T_WORD &&
+					 strcmp(yylval.word.ident, "replace") == 0)
+				tokens[token_count] = 'r';
+			else if (tok == T_WORD &&
+					 strcmp(yylval.word.ident, "function") == 0)
+				tokens[token_count] = 'f';
+			else if (tok == T_WORD &&
+					 strcmp(yylval.word.ident, "procedure") == 0)
+				tokens[token_count] = 'f';	/* treat same as "function" */
+			if (tokens[1] == 'f' ||
+				(tokens[1] == 'o' && tokens[2] == 'r' && tokens[3] == 'f'))
+				in_routine_definition = true;
+			token_count++;
+		}
+		/* Track paren nesting (needed for CREATE RULE syntax) */
+		if (tok == '(')
+			paren_depth++;
+		else if (tok == ')' && paren_depth > 0)
+			paren_depth--;
+		/* We need track BEGIN/END nesting only in a routine definition */
+		if (in_routine_definition && paren_depth == 0)
+		{
+			if (tok == K_BEGIN || tok == K_CASE)
+				begin_depth++;
+			else if (tok == K_END && begin_depth > 0)
+				begin_depth--;
+		}
+		/* Command-ending semicolon? */
+		if (tok == ';' && paren_depth == 0 && begin_depth == 0)
 			break;
 		if (tok == 0)
 			yyerror("unexpected end of function definition");
@@ -5629,11 +5676,11 @@ read_fetch_direction(void)
 	{
 		/*
 		 * Assume it's a count expression with no preceding keyword.
-		 * Note: we allow this syntax because core SQL does, but we don't
-		 * document it because of the ambiguity with the omitted-direction
-		 * case.  For instance, "MOVE n IN c" will fail if n is a variable.
-		 * Perhaps this can be improved someday, but it's hardly worth a
-		 * lot of work.
+		 * Note: we allow this syntax because core SQL does, but it's
+		 * ambiguous with the case of an omitted direction clause; for
+		 * instance, "MOVE n IN c" will fail if n is a variable, because the
+		 * preceding else-arm will trigger.  Perhaps this can be improved
+		 * someday, but it hardly seems worth a lot of work.
 		 */
 		plpgsql_push_back_token(tok);
 		fetch->expr = read_sql_expression2(K_FROM, K_IN,
@@ -6123,7 +6170,30 @@ plpgsql_sql_error_callback(void *arg)
  * This is handled the same as in check_sql_expr(), and we likewise
  * expect that the given string is a copy from the source text.
  */
-static PLpgSQL_type * parse_datatype(const char *string, int location) { PLpgSQL_type *typ; typ = (PLpgSQL_type *) palloc0(sizeof(PLpgSQL_type)); typ->typname = pstrdup(string); typ->ttype = strcmp(string, "RECORD") == 0 ? PLPGSQL_TTYPE_REC : PLPGSQL_TTYPE_SCALAR; return typ; }
+
+#include "catalog/pg_collation_d.h"
+static PLpgSQL_type * parse_datatype(const char *string, int location) {
+	PLpgSQL_type *typ;
+
+	/* Ignore trailing spaces */
+	size_t len = strlen(string);
+	while (len > 0 && scanner_isspace(string[len - 1])) --len;
+
+	typ = (PLpgSQL_type *) palloc0(sizeof(PLpgSQL_type));
+	typ->typname = pstrdup(string);
+	typ->ttype = pg_strncasecmp(string, "RECORD", len) == 0 ? PLPGSQL_TTYPE_REC : PLPGSQL_TTYPE_SCALAR;
+	if (pg_strncasecmp(string, "REFCURSOR", len) == 0 || pg_strncasecmp(string, "CURSOR", len) == 0)
+	{
+		typ->typoid = REFCURSOROID;
+	}
+	else if (pg_strncasecmp(string, "TEXT", len) == 0)
+	{
+		typ->typoid = TEXTOID;
+		typ->collation = DEFAULT_COLLATION_OID;
+	}
+	return typ;
+}
+
 
 
 /*
@@ -6262,16 +6332,12 @@ read_cursor_args(PLpgSQL_var *cursor, int until)
 		 * Read the value expression. To provide the user with meaningful
 		 * parse error positions, we check the syntax immediately, instead of
 		 * checking the final expression that may have the arguments
-		 * reordered. Trailing whitespace must not be trimmed, because
-		 * otherwise input of the form (param -- comment\n, param) would be
-		 * translated into a form where the second parameter is commented
-		 * out.
+		 * reordered.
 		 */
 		item = read_sql_construct(',', ')', 0,
 								  ",\" or \")",
 								  RAW_PARSE_PLPGSQL_EXPR,
 								  true, true,
-								  false, /* do not trim */
 								  NULL, &endtoken);
 
 		argv[argpos] = item->query;