pg_query 2.2.1 → 4.2.1

data/ext/pg_query/src_backend_parser_scan.c

@@ -67,7 +67,7 @@
  * Postgres 9.2, this check is made automatically by the Makefile.)
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -84,9 +84,10 @@
 #include "parser/gramparse.h"
 #include "parser/parser.h"		/* only needed for GUC variables */
 #include "parser/scansup.h"
+#include "port/pg_bitutils.h"
 #include "mb/pg_wchar.h"
 
-#line 44 "scan.c"
+#line 45 "scan.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -660,8 +661,8 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner );
 	yyg->yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 66
-#define YY_END_OF_BUFFER 67
+#define YY_NUM_RULES 65
+#define YY_END_OF_BUFFER 66
 struct yy_trans_info
 	{
 	flex_int16_t yy_verify;
@@ -683,7 +684,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {  47,6665 }, {  48,6667 }, {  49,6667 }, {  50,6667 }, {  51,6667 },
  {  52,6667 }, {  53,6667 }, {  54,6667 }, {  55,6667 }, {  56,6667 },
  {  57,6667 }, {  58,6219 }, {  59,6216 }, {  60,6732 }, {  61,6743 },
- {  62,6810 }, {  63,6564 }, {  64,6241 }, {  65,6842 }, {  66,7099 },
+ {  62,6810 }, {  63,6241 }, {  64,6241 }, {  65,6842 }, {  66,7099 },
  {  67,6842 }, {  68,6842 }, {  69,7356 }, {  70,6842 }, {  71,6842 },
  {  72,6842 }, {  73,6842 }, {  74,6842 }, {  75,6842 }, {  76,6842 },
  {  77,6842 }, {  78,7613 }, {  79,6842 }, {  80,6842 }, {  81,6842 },
@@ -739,7 +740,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {  44,5958 }, {  45,6317 }, {  46,6336 }, {  47,6407 }, {  48,6409 },
  {  49,6409 }, {  50,6409 }, {  51,6409 }, {  52,6409 }, {  53,6409 },
  {  54,6409 }, {  55,6409 }, {  56,6409 }, {  57,6409 }, {  58,5961 },
- {  59,5958 }, {  60,6474 }, {  61,6485 }, {  62,6552 }, {  63,6306 },
+ {  59,5958 }, {  60,6474 }, {  61,6485 }, {  62,6552 }, {  63,5983 },
  {  64,5983 }, {  65,6584 }, {  66,6841 }, {  67,6584 }, {  68,6584 },
  {  69,7098 }, {  70,6584 }, {  71,6584 }, {  72,6584 }, {  73,6584 },
  {  74,6584 }, {  75,6584 }, {  76,6584 }, {  77,6584 }, {  78,7355 },
@@ -2030,18 +2031,18 @@ static const struct yy_trans_info yy_transition[17678] =
  { 238, 335 }, { 239, 335 }, { 240, 335 }, { 241, 335 }, { 242, 335 },
  { 243, 335 }, { 244, 335 }, { 245, 335 }, { 246, 335 }, { 247, 335 },
  { 248, 335 }, { 249, 335 }, { 250, 335 }, { 251, 335 }, { 252, 335 },
- { 253, 335 }, { 254, 335 }, { 255, 335 }, { 256, 335 }, {   0,  65 },
+ { 253, 335 }, { 254, 335 }, { 255, 335 }, { 256, 335 }, {   0,  64 },
  {   0,11228 }, {   0,   1 }, {   0,11226 }, {   0,  39 }, {   0,11224 },
 
- {   0,   0 }, {   0,   1 }, {   0,11221 }, {   0,  56 }, {   0,11219 },
+ {   0,   0 }, {   0,   1 }, {   0,11221 }, {   0,  55 }, {   0,11219 },
  {   0,   0 }, {   9,5098 }, {  10,5098 }, {   0,   0 }, {  12,5098 },
  {  13,5098 }, {   9,5093 }, {  10,5093 }, {   0,   0 }, {  12,5093 },
- {  13,5093 }, {   0,  14 }, {   0,11206 }, {   0,  55 }, {   0,11204 },
- {   0,   0 }, {   0,  55 }, {   0,11201 }, {   0,  17 }, {   0,11199 },
+ {  13,5093 }, {   0,  14 }, {   0,11206 }, {   0,  54 }, {   0,11204 },
+ {   0,   0 }, {   0,  54 }, {   0,11201 }, {   0,  17 }, {   0,11199 },
  {   0,   0 }, {   0,   7 }, {   0,11196 }, {   0,   0 }, {  32,5098 },
  {   0,   7 }, {   0,11192 }, {   0,   0 }, {   0,   0 }, {  32,5093 },
  {   0,  41 }, {   0,11187 }, {  33,5346 }, {   0,   0 }, {  35,5346 },
- {   0,   0 }, {  37,5346 }, {  38,5346 }, {   0,  56 }, {   0,11179 },
+ {   0,   0 }, {  37,5346 }, {  38,5346 }, {   0,  55 }, {   0,11179 },
  {   0,   0 }, {  42,5346 }, {  43,5346 }, {   0,   0 }, {  45,5346 },
 
  {   0,   0 }, {  47,5346 }, {   0,  17 }, {   0,11170 }, {   0,  20 },
@@ -2056,21 +2057,21 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {  34, 320 }, {   0,   0 }, {  94,5346 }, {  39, 324 },
 
  {  96,5346 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {  60,5306 },
- {  61,5306 }, {  62,5306 }, {  63,5306 }, {  64,5306 }, {   0,  65 },
+ {  61,5306 }, {  62,5306 }, {  63,5306 }, {  64,5306 }, {   0,  64 },
  {   0,11113 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,  26 }, {   0,11107 }, {   0,  33 }, {   0,11105 }, {   0,  48 },
- {   0,11103 }, {   0,  47 }, {   0,11101 }, {   0,  49 }, {   0,11099 },
- {   0,   0 }, {   0,   0 }, {   0,   0 }, { 124,5346 }, {   0,   0 },
- { 126,5346 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
+ {   0,  26 }, {   0,11107 }, {   0,  33 }, {   0,11105 }, {   0,  47 },
+ {   0,11103 }, {   0,  46 }, {   0,11101 }, {   0,  48 }, {   0,11099 },
+ {   0,   9 }, {   0,11097 }, {   0,   0 }, { 124,5346 }, {   0,   0 },
+ { 126,5346 }, {   0,  15 }, {   0,11091 }, {   0,  13 }, {   0,11089 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {  94,5306 }, {   0,   0 },
- {  96,5306 }, {   0,   0 }, {   0,  64 }, {   0,11080 }, {   0,   9 },
- {   0,11078 }, {  36,   8 }, {   0,  15 }, {   0,11075 }, {   0,   0 },
+ {  96,5306 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
+ {   0,   0 }, {  36,   8 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
 
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {  48,5268 }, {  49,5268 },
  {  50,5268 }, {  51,5268 }, {  52,5268 }, {  53,5268 }, {  54,5268 },
  {  55,5268 }, {  56,5268 }, {  57,5268 }, { 124,5306 }, {   0,   0 },
- { 126,5306 }, {   0,  46 }, {   0,11051 }, {   0,  13 }, {   0,11049 },
+ { 126,5306 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {  65,5331 }, {  66,5331 }, {  67,5331 }, {  68,5331 }, {  69,5331 },
  {  70,5331 }, {  71,5331 }, {  72,5331 }, {  73,5331 }, {  74,5331 },
  {  75,5331 }, {  76,5331 }, {  77,5331 }, {  78,5331 }, {  79,5331 },
@@ -2078,13 +2079,13 @@ static const struct yy_trans_info yy_transition[17678] =
  {  85,5331 }, {  86,5331 }, {  87,5331 }, {  88,5331 }, {  89,5331 },
 
  {  90,5331 }, {  85,8881 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {  95,5331 }, {  63,   0 }, {  97,5331 }, {  98,5331 }, {  99,5331 },
+ {  95,5331 }, {   0,   0 }, {  97,5331 }, {  98,5331 }, {  99,5331 },
  { 100,5331 }, { 101,5331 }, { 102,5331 }, { 103,5331 }, { 104,5331 },
  { 105,5331 }, { 106,5331 }, { 107,5331 }, { 108,5331 }, { 109,5331 },
  { 110,5331 }, { 111,5331 }, { 112,5331 }, { 113,5331 }, { 114,5331 },
  { 115,5331 }, { 116,5331 }, { 117,5331 }, { 118,5331 }, { 119,5331 },
  { 120,5331 }, { 121,5331 }, { 122,5331 }, { 117,8904 }, {   0,   0 },
- {  63, -29 }, {   0,   0 }, {   0,   0 }, { 128,5331 }, { 129,5331 },
+ {   0,   0 }, {   0,   0 }, {   0,   0 }, { 128,5331 }, { 129,5331 },
  { 130,5331 }, { 131,5331 }, { 132,5331 }, { 133,5331 }, { 134,5331 },
  { 135,5331 }, { 136,5331 }, { 137,5331 }, { 138,5331 }, { 139,5331 },
 
@@ -2113,13 +2114,13 @@ static const struct yy_trans_info yy_transition[17678] =
  { 240,5331 }, { 241,5331 }, { 242,5331 }, { 243,5331 }, { 244,5331 },
  { 245,5331 }, { 246,5331 }, { 247,5331 }, { 248,5331 }, { 249,5331 },
  { 250,5331 }, { 251,5331 }, { 252,5331 }, { 253,5331 }, { 254,5331 },
- { 255,5331 }, {   0,  55 }, {   0,10856 }, {   0,  45 }, {   0,10854 },
+ { 255,5331 }, {   0,  54 }, {   0,10856 }, {   0,  45 }, {   0,10854 },
  {   0,  12 }, {   0,10852 }, {   0,   0 }, {   0,   0 }, {   0,   8 },
- {   0,10848 }, {   0,   0 }, {   0,  55 }, {   0,10845 }, {   0,   5 },
+ {   0,10848 }, {   0,   0 }, {   0,  54 }, {   0,10845 }, {   0,   5 },
  {   0,10843 }, {   0,  43 }, {   0,10841 }, {   0,  21 }, {   0,10839 },
  {   0,  19 }, {   0,10837 }, {   0,  18 }, {   0,10835 }, {   0,  29 },
- {   0,10833 }, {   0,  35 }, {   0,10831 }, {   0,  60 }, {   0,10829 },
- {   0,   0 }, {   0,  55 }, {   0,10826 }, {   0,  40 }, {   0,10824 },
+ {   0,10833 }, {   0,  35 }, {   0,10831 }, {   0,  59 }, {   0,10829 },
+ {   0,   0 }, {   0,  54 }, {   0,10826 }, {   0,  40 }, {   0,10824 },
 
  {  33,4983 }, {   0,   0 }, {  35,4983 }, {  34,  30 }, {  37,4983 },
  {  38,4983 }, {   0,  16 }, {   0,10816 }, {  39,  38 }, {  42,4983 },
@@ -2135,7 +2136,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {  53,5559 }, {  54,5559 }, {  55,5559 }, {  56,5559 }, {  57,5559 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {  94,4983 }, {   0,   0 }, {  96,4983 }, {   0,   0 },
- {   0,   0 }, {   0,   0 }, {   0,  55 }, {   0,10755 }, {   0,  58 },
+ {   0,   0 }, {   0,   0 }, {   0,  54 }, {   0,10755 }, {   0,  57 },
  {   0,10753 }, {   0,   0 }, {  94,4972 }, {   0,   0 }, {  96,4972 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
@@ -2149,10 +2150,10 @@ static const struct yy_trans_info yy_transition[17678] =
  {  47,4882 }, {  46,5513 }, {   0,   0 }, {  48,5577 }, {  49,5577 },
  {  50,5577 }, {  51,5577 }, {  52,5577 }, {  53,5577 }, {  54,5577 },
  {  55,5577 }, {  56,5577 }, {  57,5577 }, {  60,4882 }, {  61,4882 },
- {  62,4882 }, {  63,4882 }, {  64,4882 }, {   0,   0 }, {   0,  55 },
+ {  62,4882 }, {  63,4882 }, {  64,4882 }, {   0,   0 }, {   0,  54 },
  {   0,10688 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {  69,5599 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,  55 }, {   0,10677 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
+ {   0,  54 }, {   0,10677 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
 
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
@@ -2167,13 +2168,13 @@ static const struct yy_trans_info yy_transition[17678] =
 
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {  60,4804 }, {  61,4804 }, {  62,5671 }, {  63,4804 },
- {  64,4804 }, {   0,   0 }, {   0,  55 }, {   0,10610 }, {   0,   0 },
+ {  64,4804 }, {   0,   0 }, {   0,  54 }, {   0,10610 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {  94,4815 },
  {   0,   0 }, {  96,4815 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {  94,4804 }, {   0,   0 }, {  96,4804 }, {   0,   0 }, {   0,  64 },
+ {  94,4804 }, {   0,   0 }, {  96,4804 }, {   0,   0 }, {   0,  63 },
  {   0,10578 }, {  33,4737 }, {   0,   0 }, {  35,4737 }, {   0,   0 },
 
  {  37,4737 }, {  38,4737 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
@@ -2188,7 +2189,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {  50,5663 }, {  51,5663 }, {  52,5663 }, {  53,5663 }, {  54,5663 },
 
  {  55,5663 }, {  56,5663 }, {  57,5663 }, {   0,   0 }, {   0,   0 },
- {   0,   0 }, {   0,   0 }, {  94,4737 }, {  63,-502 }, {  96,4737 },
+ {   0,   0 }, {   0,   0 }, {  94,4737 }, {   0,   0 }, {  96,4737 },
  {  65,5663 }, {  66,5663 }, {  67,5663 }, {  68,5663 }, {  69,5663 },
  {  70,5663 }, {  71,5663 }, {  72,5663 }, {  73,5663 }, {  74,5663 },
  {  75,5663 }, {  76,5663 }, {  77,5663 }, {  78,5663 }, {  79,5663 },
@@ -2231,7 +2232,7 @@ static const struct yy_trans_info yy_transition[17678] =
  { 245,5663 }, { 246,5663 }, { 247,5663 }, { 248,5663 }, { 249,5663 },
  { 250,5663 }, { 251,5663 }, { 252,5663 }, { 253,5663 }, { 254,5663 },
 
- { 255,5663 }, {   0,  64 }, {   0,10321 }, {   0,   0 }, {   0,   0 },
+ { 255,5663 }, {   0,  63 }, {   0,10321 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
@@ -2239,13 +2240,13 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {  36,5406 }, {   0,   0 },
- {   0,   0 }, {  39,-757 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
+ {   0,   0 }, {  39,-776 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
 
  {  48,5406 }, {  49,5406 }, {  50,5406 }, {  51,5406 }, {  52,5406 },
  {  53,5406 }, {  54,5406 }, {  55,5406 }, {  56,5406 }, {  57,5406 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {  63,-759 }, {   0,   0 }, {  65,5406 }, {  66,5406 }, {  67,5406 },
+ {   0,   0 }, {   0,   0 }, {  65,5406 }, {  66,5406 }, {  67,5406 },
  {  68,5406 }, {  69,5406 }, {  70,5406 }, {  71,5406 }, {  72,5406 },
  {  73,5406 }, {  74,5406 }, {  75,5406 }, {  76,5406 }, {  77,5406 },
  {  78,5406 }, {  79,5406 }, {  80,5406 }, {  81,5406 }, {  82,5406 },
@@ -2287,7 +2288,7 @@ static const struct yy_trans_info yy_transition[17678] =
  { 243,5406 }, { 244,5406 }, { 245,5406 }, { 246,5406 }, { 247,5406 },
 
  { 248,5406 }, { 249,5406 }, { 250,5406 }, { 251,5406 }, { 252,5406 },
- { 253,5406 }, { 254,5406 }, { 255,5406 }, {   0,  64 }, {   0,10064 },
+ { 253,5406 }, { 254,5406 }, { 255,5406 }, {   0,  63 }, {   0,10064 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
@@ -2295,13 +2296,13 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {  36,5149 }, {   0,   0 }, {   0,   0 }, {  39,-1011 }, {   0,   0 },
+ {  36,5149 }, {   0,   0 }, {   0,   0 }, {  39,-1027 }, {   0,   0 },
 
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {  48,5149 }, {  49,5149 }, {  50,5149 },
  {  51,5149 }, {  52,5149 }, {  53,5149 }, {  54,5149 }, {  55,5149 },
  {  56,5149 }, {  57,5149 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,   0 }, {   0,   0 }, {  63,-987 }, {   0,   0 }, {  65,5149 },
+ {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {  65,5149 },
  {  66,5149 }, {  67,5149 }, {  68,5149 }, {  69,5149 }, {  70,5149 },
  {  71,5149 }, {  72,5149 }, {  73,5149 }, {  74,5149 }, {  75,5149 },
  {  76,5149 }, {  77,5149 }, {  78,5149 }, {  79,5149 }, {  80,5149 },
@@ -2344,7 +2345,7 @@ static const struct yy_trans_info yy_transition[17678] =
  { 241,5149 }, { 242,5149 }, { 243,5149 }, { 244,5149 }, { 245,5149 },
  { 246,5149 }, { 247,5149 }, { 248,5149 }, { 249,5149 }, { 250,5149 },
  { 251,5149 }, { 252,5149 }, { 253,5149 }, { 254,5149 }, { 255,5149 },
- {   0,  64 }, {   0,9807 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
+ {   0,  63 }, {   0,9807 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
@@ -2353,11 +2354,11 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
 
  {   0,   0 }, {   0,   0 }, {  36,4892 }, {   0,   0 }, {   0,   0 },
- {  39,-1242 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
+ {  39,-1282 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {  48,4892 },
  {  49,4892 }, {  50,4892 }, {  51,4892 }, {  52,4892 }, {  53,4892 },
  {  54,4892 }, {  55,4892 }, {  56,4892 }, {  57,4892 }, {   0,   0 },
- {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {  63,-1273 },
+ {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {  65,4892 }, {  66,4892 }, {  67,4892 }, {  68,4892 },
  {  69,4892 }, {  70,4892 }, {  71,4892 }, {  72,4892 }, {  73,4892 },
  {  74,4892 }, {  75,4892 }, {  76,4892 }, {  77,4892 }, {  78,4892 },
@@ -2400,7 +2401,7 @@ static const struct yy_trans_info yy_transition[17678] =
  { 239,4892 }, { 240,4892 }, { 241,4892 }, { 242,4892 }, { 243,4892 },
  { 244,4892 }, { 245,4892 }, { 246,4892 }, { 247,4892 }, { 248,4892 },
  { 249,4892 }, { 250,4892 }, { 251,4892 }, { 252,4892 }, { 253,4892 },
- { 254,4892 }, { 255,4892 }, {   0,  64 }, {   0,9550 }, {   0,   0 },
+ { 254,4892 }, { 255,4892 }, {   0,  63 }, {   0,9550 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
@@ -2414,7 +2415,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {  48,4635 }, {  49,4635 }, {  50,4635 }, {  51,4635 },
  {  52,4635 }, {  53,4635 }, {  54,4635 }, {  55,4635 }, {  56,4635 },
  {  57,4635 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,   0 }, {  63,-1530 }, {   0,   0 }, {  65,4635 }, {  66,4635 },
+ {   0,   0 }, {   0,   0 }, {   0,   0 }, {  65,4635 }, {  66,4635 },
  {  67,4635 }, {  68,4635 }, {  69,4635 }, {  70,4635 }, {  71,4635 },
  {  72,4635 }, {  73,4635 }, {  74,4635 }, {  75,4635 }, {  76,4635 },
 
@@ -2456,7 +2457,7 @@ static const struct yy_trans_info yy_transition[17678] =
  { 237,4635 }, { 238,4635 }, { 239,4635 }, { 240,4635 }, { 241,4635 },
  { 242,4635 }, { 243,4635 }, { 244,4635 }, { 245,4635 }, { 246,4635 },
  { 247,4635 }, { 248,4635 }, { 249,4635 }, { 250,4635 }, { 251,4635 },
- { 252,4635 }, { 253,4635 }, { 254,4635 }, { 255,4635 }, {   0,  64 },
+ { 252,4635 }, { 253,4635 }, { 254,4635 }, { 255,4635 }, {   0,  63 },
  {   0,9293 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
@@ -2470,7 +2471,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {  48,4378 }, {  49,4378 },
  {  50,4378 }, {  51,4378 }, {  52,4378 }, {  53,4378 }, {  54,4378 },
  {  55,4378 }, {  56,4378 }, {  57,4378 }, {   0,   0 }, {   0,   0 },
- {   0,   0 }, {   0,   0 }, {   0,   0 }, {  63,-1787 }, {   0,   0 },
+ {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {  65,4378 }, {  66,4378 }, {  67,4378 }, {  68,4378 }, {  69,4378 },
 
  {  70,4378 }, {  71,4378 }, {  72,4378 }, {  73,4378 }, {  74,4378 },
@@ -3208,14 +3209,14 @@ static const struct yy_trans_info yy_transition[17678] =
  { 237,3647 }, { 238,3647 }, { 239,3647 }, { 240,3647 }, { 241,3647 },
  { 242,3647 }, { 243,3647 }, { 244,3647 }, { 245,3647 }, { 246,3647 },
  { 247,3647 }, { 248,3647 }, { 249,3647 }, { 250,3647 }, { 251,3647 },
- { 252,3647 }, { 253,3647 }, { 254,3647 }, { 255,3647 }, {   0,  56 },
+ { 252,3647 }, { 253,3647 }, { 254,3647 }, { 255,3647 }, {   0,  55 },
 
  {   0,5873 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,  54 }, {   0,5862 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
+ {   0,  53 }, {   0,5862 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,   0 }, {   0,   0 }, {   0,  57 }, {   0,5845 }, {   0,   0 },
+ {   0,   0 }, {   0,   0 }, {   0,  56 }, {   0,5845 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {  33,   0 }, {   0,   0 },
  {  35,   0 }, {   0,   0 }, {  37,   0 }, {  38,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {  42,   0 }, {  43,   0 }, {  33, -11 },
@@ -3343,12 +3344,12 @@ static const struct yy_trans_info yy_transition[17678] =
  { 247,3638 }, { 248,3638 }, { 249,3638 }, { 250,3638 }, { 251,3638 },
 
  { 252,3638 }, { 253,3638 }, { 254,3638 }, { 255,3638 }, { 256,3638 },
- {   0,  59 }, {   0,5267 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
+ {   0,  58 }, {   0,5267 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,   3 }, {   0,5242 }, {   0,  59 }, {   0,5240 }, {   0,   0 },
+ {   0,   3 }, {   0,5242 }, {   0,  58 }, {   0,5240 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
@@ -3362,12 +3363,12 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {  48,3871 }, {  49,3871 }, {  50,3871 }, {  51,3871 },
  {  52,3871 }, {  53,3871 }, {  54,3871 }, {  55,3871 }, {  56,3871 },
  {  57,3871 }, {  60,3871 }, {  61,3871 }, {  62,3871 }, {  63,3871 },
- {  64,3871 }, {   0,  58 }, {   0,5176 }, {   0,   0 }, {   0,   0 },
+ {  64,3871 }, {   0,  57 }, {   0,5176 }, {   0,   0 }, {   0,   0 },
 
  {   0,   0 }, {   0,   0 }, {  69,  86 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, { 101, 113 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,  62 }, {   0,5154 },
+ {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,  61 }, {   0,5154 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {  94,3871 }, {   0,   0 }, {  96,3871 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, { 101,  86 },
@@ -3376,7 +3377,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {  48,   0 }, {  49,   0 }, {  50,   0 }, {  51,   0 }, {  52,   0 },
 
  {  53,   0 }, {  54,   0 }, {  55,   0 }, {  56,   0 }, {  57,   0 },
- { 124,3871 }, {   0,   0 }, { 126,3871 }, {   0,  51 }, {   0,5114 },
+ { 124,3871 }, {   0,   0 }, { 126,3871 }, {   0,  50 }, {   0,5114 },
  {   0,   0 }, {   0,   0 }, {  43,3807 }, {   0,   0 }, {  45,3807 },
  {   0,   0 }, {  69,  22 }, {  48,3849 }, {  49,3849 }, {  50,3849 },
  {  51,3849 }, {  52,3849 }, {  53,3849 }, {  54,3849 }, {  55,3849 },
@@ -3384,7 +3385,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {  33,-759 }, {   0,   0 }, {  35,-759 },
- {   0,   0 }, {  37,-759 }, {  38,-759 }, { 101,  22 }, {   0,  53 },
+ {   0,   0 }, {  37,-759 }, {  38,-759 }, { 101,  22 }, {   0,  52 },
 
  {   0,5073 }, {  42,-759 }, {  43,-759 }, {   0,   0 }, {  45,-759 },
  {   0,   0 }, {  47,-759 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
@@ -3400,9 +3401,9 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {  94,-759 }, {   0,   0 },
  {  96,-759 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {  60,-800 }, {  61,-800 }, {  62,-800 }, {  63,-800 }, {  64,-800 },
- {   0,   0 }, {   0,  50 }, {   0,5006 }, {   0,   0 }, {   0,   0 },
+ {   0,   0 }, {   0,  49 }, {   0,5006 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,   0 }, {   0,   0 }, {   0,  52 }, {   0,4995 }, {   0,   0 },
+ {   0,   0 }, {   0,   0 }, {   0,  51 }, {   0,4995 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, { 124,-759 }, {   0,   0 },
  { 126,-759 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {  94,-800 },
@@ -3420,7 +3421,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
 
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,   0 }, {   0,   0 }, {   0,  64 }, {   0,4915 }, {   0,   0 },
+ {   0,   0 }, {   0,   0 }, {   0,  63 }, {   0,4915 }, {   0,   0 },
  {   0,   0 }, {  94,-867 }, {   0,   0 }, {  96,-867 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {  94,-878 }, {   0,   0 }, {  96,-878 },
@@ -3434,7 +3435,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {  48,   0 }, {  49,   0 }, {  50,   0 }, {  51,   0 },
  {  52,   0 }, {  53,   0 }, {  54,   0 }, {  55,   0 }, {  56,   0 },
  {  57,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,   0 }, {  63,-6165 }, {   0,   0 }, {  65,   0 }, {  66,   0 },
+ {   0,   0 }, {   0,   0 }, {   0,   0 }, {  65,   0 }, {  66,   0 },
  {  67,   0 }, {  68,   0 }, {  69,   0 }, {  70,   0 }, {  71,   0 },
  {  72,   0 }, {  73,   0 }, {  74,   0 }, {  75,   0 }, {  76,   0 },
  {  77,   0 }, {  78,   0 }, {  79,   0 }, {  80,   0 }, {  81,   0 },
@@ -4200,12 +4201,12 @@ static const struct yy_trans_info yy_transition[17678] =
  { 246,-258 }, { 247,-258 }, { 248,-258 }, { 249,-258 }, { 250,-258 },
  { 251,-258 }, { 252,-258 }, { 253,-258 }, { 254,-258 }, { 255,-258 },
 
- { 256,-258 }, {   0,   3 }, {   0,1371 }, {   0,  59 }, {   0,1369 },
+ { 256,-258 }, {   0,   3 }, {   0,1371 }, {   0,  58 }, {   0,1369 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,  63 }, {   0,1347 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
+ {   0,  62 }, {   0,1347 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {  33,   0 }, {   0,   0 }, {  35,   0 }, {   0,   0 }, {  37,   0 },
  {  38,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {  42,   0 },
@@ -4214,7 +4215,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {   0,   0 }, {  48,   0 }, {  49,   0 }, {  50,   0 },
  {  51,   0 }, {  52,   0 }, {  53,   0 }, {  54,   0 }, {  55,   0 },
  {  56,   0 }, {  57,   0 }, {  60,   0 }, {  61,   0 }, {  62,   0 },
- {  63,   0 }, {  64,   0 }, {   0,  61 }, {   0,1305 }, {   0,   0 },
+ {  63,   0 }, {  64,   0 }, {   0,  60 }, {   0,1305 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {  69,-3785 }, {  48,  42 },
  {  49,  42 }, {  50,  42 }, {  51,  42 }, {  52,  42 }, {  53,  42 },
  {  54,  42 }, {  55,  42 }, {  56,  42 }, {  57,  42 }, {   0,   0 },
@@ -4501,7 +4502,7 @@ static const struct yy_trans_info yy_transition[17678] =
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
  {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 }, {   0,   0 },
- {   0,   0 }, {   0,   0 }, { 257,  67 }, {   1,   0 },    };
+ {   0,   0 }, {   0,   0 }, { 257,  66 }, {   1,   0 },    };
 
 static __thread const struct yy_trans_info *yy_start_state_list[25] =
     {
@@ -4543,7 +4544,7 @@ static __thread const struct yy_trans_info *yy_start_state_list[25] =
 #define YY_RESTORE_YY_MORE_OFFSET
 #line 1 "scan.l"
 
-#line 46 "scan.l"
+#line 47 "scan.l"
 
 /* LCOV_EXCL_START */
 
@@ -4577,7 +4578,7 @@ __thread bool		standard_conforming_strings = true;
  * callers need to pass it to scanner_init, if they are using the
  * standard keyword list ScanKeywords.
  */
-#define PG_KEYWORD(kwname, value, category) value,
+#define PG_KEYWORD(kwname, value, category, collabel) value,
 
 const uint16 ScanKeywordTokens[] = {
 #include "parser/kwlist.h"
@@ -4646,7 +4647,7 @@ static void check_escape_warning(core_yyscan_t yyscanner);
 extern int	core_yyget_column(yyscan_t yyscanner);
 extern void core_yyset_column(int column_no, yyscan_t yyscanner);
 
-#line 4600 "scan.c"
+#line 4601 "scan.c"
 #define YY_NO_INPUT 1
 /*
  * OK, here is a short description of lex/flex rules behavior.
@@ -4662,7 +4663,7 @@ extern void core_yyset_column(int column_no, yyscan_t yyscanner);
  *  <xb> bit string literal
  *  <xc> extended C-style comments
  *  <xd> delimited identifiers (double-quoted identifiers)
- *  <xh> hexadecimal numeric string
+ *  <xh> hexadecimal byte string
  *  <xq> standard quoted strings
  *  <xqs> quote stop (detect continued strings)
  *  <xe> extended quoted strings (support backslash escape sequences)
@@ -4715,10 +4716,9 @@ extern void core_yyset_column(int column_no, yyscan_t yyscanner);
  * Better to pass the string forward and let the input routines
  * validate the contents.
  */
-/* Hexadecimal number */
+/* Hexadecimal byte string */
 /* National character */
 /* Quoted string that allows backslash escapes */
-/* Normalized escaped string */
 /* Extended quote
  * xqdouble implements embedded quote, ''''
  */
@@ -4774,9 +4774,11 @@ extern void core_yyset_column(int column_no, yyscan_t yyscanner);
  * If you change either set, adjust the character lists appearing in the
  * rule for "operator"!
  */
-/* we no longer allow unary minus in numbers.
- * instead we pass it separately to parser. there it gets
- * coerced via doNegate() -- Leon aug 20 1999
+/*
+ * Numbers
+ *
+ * Unary minus is not part of a number here.  Instead we pass it separately to
+ * the parser, and there it gets coerced via doNegate().
  *
  * {decimalfail} is used because we would like "1..10" to lex as 1, dot_dot, 10.
  *
@@ -4795,7 +4797,7 @@ extern void core_yyset_column(int column_no, yyscan_t yyscanner);
  * Note that xcstart must appear before operator, as explained above!
  *  Also whitespace (comment) must appear before operator.
  */
-#line 4749 "scan.c"
+#line 4751 "scan.c"
 
 #define INITIAL 0
 #define xb 1
@@ -5088,10 +5090,10 @@ YY_DECL
 		}
 
 	{
-#line 420 "scan.l"
+#line 419 "scan.l"
 
 
-#line 5045 "scan.c"
+#line 5047 "scan.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -5131,14 +5133,14 @@ do_action:	/* This label is used only to access EOF actions. */
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 422 "scan.l"
+#line 421 "scan.l"
 {
 					/* ignore */
 				}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 426 "scan.l"
+#line 425 "scan.l"
 {
 					SET_YYLLOC();
 					return SQL_COMMENT;
@@ -5146,7 +5148,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 431 "scan.l"
+#line 430 "scan.l"
 {
 					/* Set location in case of syntax error in comment */
 					SET_YYLLOC();
@@ -5159,7 +5161,7 @@ YY_RULE_SETUP
 
 case 4:
 YY_RULE_SETUP
-#line 441 "scan.l"
+#line 440 "scan.l"
 {
 					(yyextra->xcdepth)++;
 					/* Put back any characters past slash-star; see above */
@@ -5168,7 +5170,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 447 "scan.l"
+#line 446 "scan.l"
 {
 					if (yyextra->xcdepth <= 0)
 					{
@@ -5183,27 +5185,27 @@ YY_RULE_SETUP
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
-#line 458 "scan.l"
+#line 457 "scan.l"
 {
 					/* ignore */
 				}
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 462 "scan.l"
+#line 461 "scan.l"
 {
 					/* ignore */
 				}
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 466 "scan.l"
+#line 465 "scan.l"
 {
 					/* ignore */
 				}
 	YY_BREAK
 case YY_STATE_EOF(xc):
-#line 470 "scan.l"
+#line 469 "scan.l"
 {
 					yyerror("unterminated /* comment");
 				}
@@ -5211,7 +5213,7 @@ case YY_STATE_EOF(xc):
 /* <xc> */
 case 9:
 YY_RULE_SETUP
-#line 475 "scan.l"
+#line 474 "scan.l"
 {
 					/* Binary bit type.
 					 * At some point we should simply pass the string
@@ -5227,22 +5229,22 @@ YY_RULE_SETUP
 	YY_BREAK
 case 10:
 /* rule 10 can match eol */
-#line 488 "scan.l"
+#line 487 "scan.l"
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
-#line 488 "scan.l"
+#line 487 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
 	YY_BREAK
 case YY_STATE_EOF(xb):
-#line 491 "scan.l"
+#line 490 "scan.l"
 { yyerror("unterminated bit string literal"); }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 493 "scan.l"
+#line 492 "scan.l"
 {
 					/* Hexadecimal bit type.
 					 * At some point we should simply pass the string
@@ -5257,12 +5259,12 @@ YY_RULE_SETUP
 				}
 	YY_BREAK
 case YY_STATE_EOF(xh):
-#line 505 "scan.l"
+#line 504 "scan.l"
 { yyerror("unterminated hexadecimal string literal"); }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 507 "scan.l"
+#line 506 "scan.l"
 {
 					/* National character.
 					 * We will pass this along as a normal character string,
@@ -5292,7 +5294,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 534 "scan.l"
+#line 533 "scan.l"
 {
 					yyextra->warn_on_first_escape = true;
 					yyextra->saw_non_ascii = false;
@@ -5306,7 +5308,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 544 "scan.l"
+#line 543 "scan.l"
 {
 					yyextra->warn_on_first_escape = false;
 					yyextra->saw_non_ascii = false;
@@ -5317,7 +5319,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 551 "scan.l"
+#line 550 "scan.l"
 {
 					SET_YYLLOC();
 					if (!yyextra->standard_conforming_strings)
@@ -5332,7 +5334,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 563 "scan.l"
+#line 562 "scan.l"
 {
 					/*
 					 * When we are scanning a quoted string and see an end
@@ -5349,7 +5351,7 @@ YY_RULE_SETUP
 case 18:
 /* rule 18 can match eol */
 YY_RULE_SETUP
-#line 575 "scan.l"
+#line 574 "scan.l"
 {
 					/*
 					 * Found a quote continuation, so return to the in-quote
@@ -5361,13 +5363,13 @@ YY_RULE_SETUP
 	YY_BREAK
 case 19:
 /* rule 19 can match eol */
-#line 584 "scan.l"
+#line 583 "scan.l"
 case 20:
 /* rule 20 can match eol */
-#line 585 "scan.l"
+#line 584 "scan.l"
 YY_RULE_SETUP
 case YY_STATE_EOF(xqs):
-#line 585 "scan.l"
+#line 584 "scan.l"
 {
 					/*
 					 * Failed to see a quote continuation.  Throw back
@@ -5411,7 +5413,7 @@ case YY_STATE_EOF(xqs):
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 626 "scan.l"
+#line 625 "scan.l"
 {
 					addlitchar('\'', yyscanner);
 				}
@@ -5419,7 +5421,7 @@ YY_RULE_SETUP
 case 22:
 /* rule 22 can match eol */
 YY_RULE_SETUP
-#line 629 "scan.l"
+#line 628 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
@@ -5427,14 +5429,14 @@ YY_RULE_SETUP
 case 23:
 /* rule 23 can match eol */
 YY_RULE_SETUP
-#line 632 "scan.l"
+#line 631 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 635 "scan.l"
+#line 634 "scan.l"
 {
 					pg_wchar	c = strtoul(yytext + 2, NULL, 16);
 
@@ -5466,7 +5468,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 663 "scan.l"
+#line 662 "scan.l"
 {
 					pg_wchar	c = strtoul(yytext + 2, NULL, 16);
 
@@ -5489,13 +5491,13 @@ YY_RULE_SETUP
 				}
 	YY_BREAK
 case 26:
-#line 684 "scan.l"
+#line 683 "scan.l"
 case 27:
 /* rule 27 can match eol */
-#line 685 "scan.l"
+#line 684 "scan.l"
 YY_RULE_SETUP
 case YY_STATE_EOF(xeu):
-#line 685 "scan.l"
+#line 684 "scan.l"
 {
 					/* Set the error cursor to point at missing esc seq */
 					SET_YYLLOC();
@@ -5504,7 +5506,7 @@ case YY_STATE_EOF(xeu):
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 690 "scan.l"
+#line 689 "scan.l"
 {
 					/* Set the error cursor to point at malformed esc seq */
 					SET_YYLLOC();
@@ -5518,7 +5520,7 @@ YY_RULE_SETUP
 case 29:
 /* rule 29 can match eol */
 YY_RULE_SETUP
-#line 699 "scan.l"
+#line 698 "scan.l"
 {
 					if (yytext[1] == '\'')
 					{
@@ -5538,7 +5540,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 715 "scan.l"
+#line 714 "scan.l"
 {
 					unsigned char c = strtoul(yytext + 1, NULL, 8);
 
@@ -5550,7 +5552,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 723 "scan.l"
+#line 722 "scan.l"
 {
 					unsigned char c = strtoul(yytext + 2, NULL, 16);
 
@@ -5562,7 +5564,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 731 "scan.l"
+#line 730 "scan.l"
 {
 					/* This is only needed for \ just before EOF */
 					addlitchar(yytext[0], yyscanner);
@@ -5571,12 +5573,12 @@ YY_RULE_SETUP
 case YY_STATE_EOF(xq):
 case YY_STATE_EOF(xe):
 case YY_STATE_EOF(xus):
-#line 735 "scan.l"
+#line 734 "scan.l"
 { yyerror("unterminated quoted string"); }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 737 "scan.l"
+#line 736 "scan.l"
 {
 					SET_YYLLOC();
 					yyextra->dolqstart = pstrdup(yytext);
@@ -5586,7 +5588,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 743 "scan.l"
+#line 742 "scan.l"
 {
 					SET_YYLLOC();
 					/* throw back all but the initial "$" */
@@ -5597,7 +5599,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 750 "scan.l"
+#line 749 "scan.l"
 {
 					if (strcmp(yytext, yyextra->dolqstart) == 0)
 					{
@@ -5623,33 +5625,33 @@ YY_RULE_SETUP
 case 36:
 /* rule 36 can match eol */
 YY_RULE_SETUP
-#line 771 "scan.l"
+#line 770 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 774 "scan.l"
+#line 773 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 777 "scan.l"
+#line 776 "scan.l"
 {
 					/* This is only needed for $ inside the quoted text */
 					addlitchar(yytext[0], yyscanner);
 				}
 	YY_BREAK
 case YY_STATE_EOF(xdolq):
-#line 781 "scan.l"
+#line 780 "scan.l"
 { yyerror("unterminated dollar-quoted string"); }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 783 "scan.l"
+#line 782 "scan.l"
 {
 					SET_YYLLOC();
 					BEGIN(xd);
@@ -5658,7 +5660,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 788 "scan.l"
+#line 787 "scan.l"
 {
 					SET_YYLLOC();
 					BEGIN(xui);
@@ -5667,7 +5669,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 793 "scan.l"
+#line 792 "scan.l"
 {
 					char	   *ident;
 
@@ -5684,7 +5686,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 806 "scan.l"
+#line 805 "scan.l"
 {
 					BEGIN(INITIAL);
 					if (yyextra->literallen == 0)
@@ -5697,7 +5699,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 815 "scan.l"
+#line 814 "scan.l"
 {
 					addlitchar('"', yyscanner);
 				}
@@ -5705,19 +5707,19 @@ YY_RULE_SETUP
 case 44:
 /* rule 44 can match eol */
 YY_RULE_SETUP
-#line 818 "scan.l"
+#line 817 "scan.l"
 {
 					addlit(yytext, yyleng, yyscanner);
 				}
 	YY_BREAK
 case YY_STATE_EOF(xd):
 case YY_STATE_EOF(xui):
-#line 821 "scan.l"
+#line 820 "scan.l"
 { yyerror("unterminated quoted identifier"); }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 823 "scan.l"
+#line 822 "scan.l"
 {
 					char	   *ident;
 
@@ -5733,58 +5735,59 @@ YY_RULE_SETUP
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 836 "scan.l"
+#line 835 "scan.l"
 {
-					/* ignore E */
-					return yytext[1];
+					SET_YYLLOC();
+					return TYPECAST;
 				}
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 841 "scan.l"
+#line 840 "scan.l"
 {
 					SET_YYLLOC();
-					return TYPECAST;
+					return DOT_DOT;
 				}
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 846 "scan.l"
+#line 845 "scan.l"
 {
 					SET_YYLLOC();
-					return DOT_DOT;
+					return COLON_EQUALS;
 				}
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 851 "scan.l"
+#line 850 "scan.l"
 {
 					SET_YYLLOC();
-					return COLON_EQUALS;
+					return EQUALS_GREATER;
 				}
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 856 "scan.l"
+#line 855 "scan.l"
 {
 					SET_YYLLOC();
-					return EQUALS_GREATER;
+					return LESS_EQUALS;
 				}
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 861 "scan.l"
+#line 860 "scan.l"
 {
 					SET_YYLLOC();
-					return LESS_EQUALS;
+					return GREATER_EQUALS;
 				}
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 866 "scan.l"
+#line 865 "scan.l"
 {
+					/* We accept both "<>" and "!=" as meaning NOT_EQUALS */
 					SET_YYLLOC();
-					return GREATER_EQUALS;
+					return NOT_EQUALS;
 				}
 	YY_BREAK
 case 53:
@@ -5799,23 +5802,14 @@ YY_RULE_SETUP
 case 54:
 YY_RULE_SETUP
 #line 877 "scan.l"
-{
-					/* We accept both "<>" and "!=" as meaning NOT_EQUALS */
-					SET_YYLLOC();
-					return NOT_EQUALS;
-				}
-	YY_BREAK
-case 55:
-YY_RULE_SETUP
-#line 883 "scan.l"
 {
 					SET_YYLLOC();
 					return yytext[0];
 				}
 	YY_BREAK
-case 56:
+case 55:
 YY_RULE_SETUP
-#line 888 "scan.l"
+#line 882 "scan.l"
 {
 					/*
 					 * Check for embedded slash-star or dash-dash; those
@@ -5875,29 +5869,6 @@ YY_RULE_SETUP
 						}
 					}
 
-					/* We don't accept leading ? in any multi-character operators
-					 * except for those in use by hstore, JSON and geometric operators.
-					 *
-					 * We don't accept contained or trailing ? in any
-					 * multi-character operators, except for those in use by JSON operators.
-					 *
-					 * This is necessary in order to support normalized queries without
-					 * spacing between ? as a substition character and a simple operator (e.g. "?=?")
-					 */
-					if (yytext[0] == '?' &&
-					  strcmp(yytext, "?<@") != 0 && strcmp(yytext, "?@>") != 0 &&
-					  strcmp(yytext, "?~") != 0 && strcmp(yytext, "?@") != 0 &&
-					  strcmp(yytext, "?|") != 0 && strcmp(yytext, "?&") != 0 &&
-					  strcmp(yytext, "?#") != 0 && strcmp(yytext, "?-") != 0 &&
-					  strcmp(yytext, "?-|") != 0 && strcmp(yytext, "?||") != 0)
-						nchars = 1;
-
-					if (yytext[0] != '?' && strchr(yytext, '?') &&
-					  strcmp(yytext, "^?") != 0 && strcmp(yytext, "#?") != 0 &&
-					  strcmp(yytext, "@?") != 0)
-						/* Lex up to just before the ? character */
-						nchars = strchr(yytext, '?') - yytext;
-
 					SET_YYLLOC();
 
 					if (nchars < yyleng)
@@ -5911,7 +5882,7 @@ YY_RULE_SETUP
 						 * that the "self" rule would have.
 						 */
 						if (nchars == 1 &&
-							strchr(",()[].;:+-*/%^<>=?", yytext[0]))
+							strchr(",()[].;:+-*/%^<>=", yytext[0]))
 							return yytext[0];
 						/*
 						 * Likewise, if what we have left is two chars, and
@@ -5947,35 +5918,35 @@ YY_RULE_SETUP
 					return Op;
 				}
 	YY_BREAK
-case 57:
+case 56:
 YY_RULE_SETUP
-#line 1019 "scan.l"
+#line 990 "scan.l"
 {
 					SET_YYLLOC();
 					yylval->ival = atol(yytext + 1);
 					return PARAM;
 				}
 	YY_BREAK
-case 58:
+case 57:
 YY_RULE_SETUP
-#line 1025 "scan.l"
+#line 996 "scan.l"
 {
 					SET_YYLLOC();
 					return process_integer_literal(yytext, yylval);
 				}
 	YY_BREAK
-case 59:
+case 58:
 YY_RULE_SETUP
-#line 1029 "scan.l"
+#line 1000 "scan.l"
 {
 					SET_YYLLOC();
 					yylval->str = pstrdup(yytext);
 					return FCONST;
 				}
 	YY_BREAK
-case 60:
+case 59:
 YY_RULE_SETUP
-#line 1034 "scan.l"
+#line 1005 "scan.l"
 {
 					/* throw back the .., and treat as integer */
 					yyless(yyleng - 2);
@@ -5983,18 +5954,18 @@ YY_RULE_SETUP
 					return process_integer_literal(yytext, yylval);
 				}
 	YY_BREAK
-case 61:
+case 60:
 YY_RULE_SETUP
-#line 1040 "scan.l"
+#line 1011 "scan.l"
 {
 					SET_YYLLOC();
 					yylval->str = pstrdup(yytext);
 					return FCONST;
 				}
 	YY_BREAK
-case 62:
+case 61:
 YY_RULE_SETUP
-#line 1045 "scan.l"
+#line 1016 "scan.l"
 {
 					/*
 					 * throw back the [Ee], and figure out whether what
@@ -6005,9 +5976,9 @@ YY_RULE_SETUP
 					return process_integer_literal(yytext, yylval);
 				}
 	YY_BREAK
-case 63:
+case 62:
 YY_RULE_SETUP
-#line 1054 "scan.l"
+#line 1025 "scan.l"
 {
 					/* throw back the [Ee][+-], and proceed as above */
 					yyless(yyleng - 2);
@@ -6015,25 +5986,20 @@ YY_RULE_SETUP
 					return process_integer_literal(yytext, yylval);
 				}
 	YY_BREAK
-case 64:
+case 63:
 YY_RULE_SETUP
-#line 1062 "scan.l"
+#line 1033 "scan.l"
 {
 					int			kwnum;
 					char	   *ident;
-					char *keyword_text = pstrdup(yytext);
 
 					SET_YYLLOC();
 
 					/* Is it a keyword? */
-					if (yytext[yyleng - 1] == '?')
-					  keyword_text[yyleng - 1] = '\0';
-					kwnum = ScanKeywordLookup(keyword_text,
+					kwnum = ScanKeywordLookup(yytext,
 											  yyextra->keywordlist);
 					if (kwnum >= 0)
 					{
-						if (keyword_text[yyleng - 1] == '\0')
-						  yyless(yyleng - 1);
 						yylval->keyword = GetScanKeyword(kwnum,
 														 yyextra->keywordlist);
 						return yyextra->keyword_tokens[kwnum];
@@ -6049,27 +6015,27 @@ YY_RULE_SETUP
 					return IDENT;
 				}
 	YY_BREAK
-case 65:
+case 64:
 YY_RULE_SETUP
-#line 1093 "scan.l"
+#line 1059 "scan.l"
 {
 					SET_YYLLOC();
 					return yytext[0];
 				}
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 1098 "scan.l"
+#line 1064 "scan.l"
 {
 					SET_YYLLOC();
 					yyterminate();
 				}
 	YY_BREAK
-case 66:
+case 65:
 YY_RULE_SETUP
-#line 1103 "scan.l"
+#line 1069 "scan.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 6023 "scan.c"
+#line 5989 "scan.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -6949,7 +6915,7 @@ static int yy_flex_strlen (const char * s , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 1103 "scan.l"
+#line 1069 "scan.l"
 
 
 /* LCOV_EXCL_STOP */
@@ -7159,10 +7125,7 @@ addlit(char *ytext, int yleng, core_yyscan_t yyscanner)
 	/* enlarge buffer if needed */
 	if ((yyextra->literallen + yleng) >= yyextra->literalalloc)
 	{
-		do
-		{
-			yyextra->literalalloc *= 2;
-		} while ((yyextra->literallen + yleng) >= yyextra->literalalloc);
+		yyextra->literalalloc = pg_nextpower2_32(yyextra->literallen + yleng + 1);
 		yyextra->literalbuf = (char *) repalloc(yyextra->literalbuf,
 												yyextra->literalalloc);
 	}