@port-labs/jq-node-bindings 1.0.4 → 1.1.0-dev

package/deps/jq/src/parser.c

@@ -345,12 +345,12 @@ enum yysymbol_kind_t
   YYSYMBOL_57_ = 57,                       /* '%'  */
   YYSYMBOL_NONOPT = 58,                    /* NONOPT  */
   YYSYMBOL_59_ = 59,                       /* '?'  */
-  YYSYMBOL_60_ = 60,                       /* ';'  */
-  YYSYMBOL_61_ = 61,                       /* '('  */
-  YYSYMBOL_62_ = 62,                       /* ')'  */
+  YYSYMBOL_60_ = 60,                       /* '.'  */
+  YYSYMBOL_61_ = 61,                       /* '['  */
+  YYSYMBOL_62_ = 62,                       /* ';'  */
   YYSYMBOL_63_ = 63,                       /* ':'  */
-  YYSYMBOL_64_ = 64,                       /* '.'  */
-  YYSYMBOL_65_ = 65,                       /* '['  */
+  YYSYMBOL_64_ = 64,                       /* '('  */
+  YYSYMBOL_65_ = 65,                       /* ')'  */
   YYSYMBOL_66_ = 66,                       /* ']'  */
   YYSYMBOL_67_ = 67,                       /* '{'  */
   YYSYMBOL_68_ = 68,                       /* '}'  */
@@ -360,18 +360,18 @@ enum yysymbol_kind_t
   YYSYMBOL_Module = 72,                    /* Module  */
   YYSYMBOL_Imports = 73,                   /* Imports  */
   YYSYMBOL_FuncDefs = 74,                  /* FuncDefs  */
-  YYSYMBOL_Exp = 75,                       /* Exp  */
-  YYSYMBOL_Import = 76,                    /* Import  */
-  YYSYMBOL_ImportWhat = 77,                /* ImportWhat  */
-  YYSYMBOL_ImportFrom = 78,                /* ImportFrom  */
-  YYSYMBOL_FuncDef = 79,                   /* FuncDef  */
-  YYSYMBOL_Params = 80,                    /* Params  */
-  YYSYMBOL_Param = 81,                     /* Param  */
-  YYSYMBOL_StringStart = 82,               /* StringStart  */
-  YYSYMBOL_String = 83,                    /* String  */
-  YYSYMBOL_QQString = 84,                  /* QQString  */
-  YYSYMBOL_ElseBody = 85,                  /* ElseBody  */
-  YYSYMBOL_ExpD = 86,                      /* ExpD  */
+  YYSYMBOL_Query = 75,                     /* Query  */
+  YYSYMBOL_Expr = 76,                      /* Expr  */
+  YYSYMBOL_Import = 77,                    /* Import  */
+  YYSYMBOL_ImportWhat = 78,                /* ImportWhat  */
+  YYSYMBOL_ImportFrom = 79,                /* ImportFrom  */
+  YYSYMBOL_FuncDef = 80,                   /* FuncDef  */
+  YYSYMBOL_Params = 81,                    /* Params  */
+  YYSYMBOL_Param = 82,                     /* Param  */
+  YYSYMBOL_StringStart = 83,               /* StringStart  */
+  YYSYMBOL_String = 84,                    /* String  */
+  YYSYMBOL_QQString = 85,                  /* QQString  */
+  YYSYMBOL_ElseBody = 86,                  /* ElseBody  */
   YYSYMBOL_Term = 87,                      /* Term  */
   YYSYMBOL_Args = 88,                      /* Args  */
   YYSYMBOL_Arg = 89,                       /* Arg  */
@@ -382,8 +382,9 @@ enum yysymbol_kind_t
   YYSYMBOL_ObjPats = 94,                   /* ObjPats  */
   YYSYMBOL_ObjPat = 95,                    /* ObjPat  */
   YYSYMBOL_Keyword = 96,                   /* Keyword  */
-  YYSYMBOL_MkDict = 97,                    /* MkDict  */
-  YYSYMBOL_MkDictPair = 98                 /* MkDictPair  */
+  YYSYMBOL_DictPairs = 97,                 /* DictPairs  */
+  YYSYMBOL_DictPair = 98,                  /* DictPair  */
+  YYSYMBOL_DictExpr = 99                   /* DictExpr  */
 };
 typedef enum yysymbol_kind_t yysymbol_kind_t;
 
@@ -405,15 +406,7 @@ struct lexer_param {
 void yyerror(YYLTYPE* loc, block* answer, int* errors,
              struct locfile* locations, struct lexer_param* lexer_param_ptr, const char *s){
   (*errors)++;
-  if (strstr(s, "unexpected")) {
-#ifdef WIN32
-      locfile_locate(locations, *loc, "jq: error: %s (Windows cmd shell quoting issues?)", s);
-#else
-      locfile_locate(locations, *loc, "jq: error: %s (Unix shell quoting issues?)", s);
-#endif
-  } else {
-      locfile_locate(locations, *loc, "jq: error: %s", s);
-  }
+  locfile_locate(locations, *loc, "jq: error: %s", s);
 }
 
 int yylex(YYSTYPE* yylval, YYLTYPE* yylloc, block* answer, int* errors,
@@ -550,7 +543,7 @@ static block gen_loc_object(location *loc, struct locfile *locations) {
 }
 
 
-#line 554 "src/parser.c"
+#line 547 "src/parser.c"
 
 
 #ifdef short
@@ -875,18 +868,18 @@ union yyalloc
 #endif /* !YYCOPY_NEEDED */
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  30
+#define YYFINAL  31
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2051
+#define YYLAST   1226
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  70
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  29
+#define YYNNTS  30
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  169
+#define YYNRULES  168
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  315
+#define YYNSTATES  312
 
 /* YYMAXUTOK -- Last valid token kind.  */
 #define YYMAXUTOK   303
@@ -907,12 +900,12 @@ static const yytype_int8 yytranslate[] =
        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,    69,    57,     2,     2,
-      61,    62,    55,    53,    49,    54,    64,    56,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    63,    60,
+      64,    65,    55,    53,    49,    54,    60,    56,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    63,    62,
       51,    50,    52,    59,     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,    65,     2,    66,     2,     2,     2,     2,     2,     2,
+       2,    61,     2,    66,     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,    67,    48,    68,     2,     2,     2,     2,
@@ -940,23 +933,23 @@ static const yytype_int8 yytranslate[] =
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
-       0,   290,   290,   293,   298,   301,   316,   319,   324,   327,
-     332,   336,   339,   343,   347,   351,   354,   359,   362,   365,
-     370,   377,   381,   385,   389,   393,   397,   401,   405,   409,
-     413,   417,   421,   425,   429,   433,   437,   441,   445,   449,
-     453,   457,   461,   465,   469,   473,   477,   481,   486,   489,
-     506,   515,   522,   530,   541,   546,   552,   555,   560,   564,
-     571,   574,   580,   587,   590,   593,   599,   602,   605,   610,
-     613,   616,   622,   625,   628,   636,   640,   643,   646,   649,
-     652,   655,   658,   661,   664,   668,   674,   677,   680,   683,
-     686,   689,   692,   695,   698,   701,   704,   707,   710,   713,
-     716,   719,   722,   725,   728,   731,   734,   756,   760,   764,
-     767,   779,   784,   785,   786,   787,   790,   793,   798,   803,
-     806,   811,   814,   819,   823,   826,   831,   834,   839,   842,
-     847,   850,   853,   856,   859,   862,   870,   876,   879,   882,
-     885,   888,   891,   894,   897,   900,   903,   906,   909,   912,
-     915,   918,   921,   924,   927,   932,   935,   936,   937,   940,
-     943,   946,   949,   953,   958,   962,   966,   970,   974,   982
+       0,   282,   282,   285,   290,   293,   308,   311,   316,   319,
+     325,   328,   331,   337,   340,   343,   349,   352,   355,   358,
+     361,   364,   367,   370,   373,   376,   379,   382,   385,   388,
+     391,   394,   397,   400,   403,   406,   409,   412,   415,   421,
+     424,   441,   450,   457,   465,   476,   481,   487,   490,   495,
+     499,   506,   509,   515,   522,   525,   528,   534,   537,   540,
+     546,   549,   552,   560,   564,   567,   570,   573,   576,   579,
+     582,   585,   588,   592,   598,   601,   604,   607,   610,   613,
+     616,   619,   622,   625,   628,   631,   634,   637,   640,   643,
+     646,   649,   652,   655,   658,   661,   664,   671,   674,   677,
+     680,   683,   687,   690,   694,   712,   716,   720,   723,   735,
+     740,   741,   742,   743,   746,   749,   754,   759,   762,   767,
+     770,   775,   779,   782,   787,   790,   795,   798,   803,   806,
+     809,   812,   815,   818,   826,   832,   835,   838,   841,   844,
+     847,   850,   853,   856,   859,   862,   865,   868,   871,   874,
+     877,   880,   883,   889,   892,   895,   900,   903,   906,   909,
+     913,   918,   922,   926,   930,   934,   942,   948,   951
 };
 #endif
 
@@ -982,12 +975,13 @@ static const char *const yytname[] =
   "\">=\"", "\"?//\"", "QQSTRING_START", "QQSTRING_TEXT",
   "QQSTRING_INTERP_START", "QQSTRING_INTERP_END", "QQSTRING_END",
   "FUNCDEF", "'|'", "','", "'='", "'<'", "'>'", "'+'", "'-'", "'*'", "'/'",
-  "'%'", "NONOPT", "'?'", "';'", "'('", "')'", "':'", "'.'", "'['", "']'",
+  "'%'", "NONOPT", "'?'", "'.'", "'['", "';'", "':'", "'('", "')'", "']'",
   "'{'", "'}'", "'$'", "$accept", "TopLevel", "Module", "Imports",
-  "FuncDefs", "Exp", "Import", "ImportWhat", "ImportFrom", "FuncDef",
-  "Params", "Param", "StringStart", "String", "QQString", "ElseBody",
-  "ExpD", "Term", "Args", "Arg", "RepPatterns", "Patterns", "Pattern",
-  "ArrayPats", "ObjPats", "ObjPat", "Keyword", "MkDict", "MkDictPair", YY_NULLPTR
+  "FuncDefs", "Query", "Expr", "Import", "ImportWhat", "ImportFrom",
+  "FuncDef", "Params", "Param", "StringStart", "String", "QQString",
+  "ElseBody", "Term", "Args", "Arg", "RepPatterns", "Patterns", "Pattern",
+  "ArrayPats", "ObjPats", "ObjPat", "Keyword", "DictPairs", "DictPair",
+  "DictExpr", YY_NULLPTR
 };
 
 static const char *
@@ -997,12 +991,12 @@ yysymbol_name (yysymbol_kind_t yysymbol)
 }
 #endif
 
-#define YYPACT_NINF (-157)
+#define YYPACT_NINF (-146)
 
 #define yypact_value_is_default(Yyn) \
   ((Yyn) == YYPACT_NINF)
 
-#define YYTABLE_NINF (-156)
+#define YYTABLE_NINF (-154)
 
 #define yytable_value_is_error(Yyn) \
   ((Yyn) == YYTABLE_NINF)
@@ -1011,38 +1005,38 @@ yysymbol_name (yysymbol_kind_t yysymbol)
    STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-     -14,   881,    15,    62,   -33,   -23,  -157,  -157,    -9,  -157,
-      37,   881,   912,   912,   881,    40,     2,  -157,  -157,   881,
-     193,   282,   415,   595,   -18,  1400,   881,  -157,  -157,    12,
-    -157,     1,     1,   881,    62,   683,   881,  -157,  -157,   -11,
-    1756,    17,    49,    26,    10,  -157,  -157,    14,    21,  1230,
-    -157,    74,    -9,    53,    51,  -157,  1041,   -26,    63,    64,
-    -157,  -157,  -157,  -157,  -157,  -157,  -157,  -157,  -157,  -157,
-    -157,  -157,  -157,  -157,  -157,  -157,  -157,  -157,  -157,   881,
-      65,    69,    70,    82,    67,   881,   881,   881,   881,   881,
-     881,   881,   881,   881,   881,   881,   881,   881,   881,   881,
-     881,   881,   881,   881,   881,   881,   881,   881,   881,  -157,
-    -157,  1924,    13,    87,    -5,    -4,   348,   127,  -157,  -157,
-    -157,  1924,   881,  -157,  -157,  1451,  1924,    56,  -157,    68,
-     881,   482,    -5,    -5,   533,   881,  -157,  -157,  -157,  -157,
-    -157,  -157,   651,   513,  -157,   513,   513,  1264,   513,   513,
-    -157,   651,   144,  1992,   113,   113,  1958,   594,   913,  1992,
-    1992,  1992,  1992,  1992,  1992,   113,   113,  1924,  1958,  1992,
-     113,   113,    14,    14,    98,    98,    98,  -157,   881,  -157,
-    -157,  -157,    -5,   974,   117,   111,   119,   749,   102,    96,
-     881,   104,  1007,   116,  -157,  -157,   881,  -157,  -157,  -157,
-      61,  -157,  1502,  -157,  1706,   110,   112,  -157,  -157,  1924,
-     -10,  -157,   513,   126,     0,   126,   126,   115,   126,   126,
-    -157,  -157,  1790,  -157,   -37,   118,   120,   121,   881,   122,
-     -38,  -157,   124,    -5,   881,   123,  1075,  -157,  -157,  1109,
-    -157,   815,   131,  -157,  -157,  -157,    68,   128,  -157,   881,
-     881,  -157,  -157,   881,   881,  -157,   513,   513,  -157,    -5,
-    -157,    -5,    -5,    -5,  1298,    -5,   974,  -157,    -5,   134,
-    1924,  -157,   133,   137,   145,  1143,  -157,  -157,   881,  1840,
-    1890,  1553,  1604,   126,   126,  -157,  -157,  -157,  -157,   130,
-    -157,  -157,  -157,  -157,  -157,  -157,   146,  1655,  -157,   881,
-     881,   881,    -5,  -157,  -157,  1706,  1332,  1177,  -157,  -157,
-    -157,   881,  -157,  1366,  -157
+      31,   890,    44,    35,    11,     9,  -146,  -146,    38,  -146,
+      85,   890,   956,   956,   956,   112,    26,  -146,  -146,   956,
+     279,   345,   412,   608,    59,    25,  1040,   890,  -146,  -146,
+      -2,  -146,     4,     4,   890,    35,   692,   890,  -146,  -146,
+      20,   -18,  1073,  1105,   131,    86,  -146,  -146,    -2,  -146,
+     164,    38,   108,   107,  -146,    22,   104,     0,   -34,   121,
+     124,  -146,  -146,  -146,  -146,  -146,  -146,  -146,  -146,  -146,
+    -146,  -146,  -146,  -146,  -146,  -146,  -146,  -146,  -146,  -146,
+     890,   135,   137,   134,   126,   141,   890,   890,  -146,   956,
+     956,   956,   956,    -5,   956,   956,   956,   956,   956,   956,
+     956,   956,   956,   956,   956,   956,   956,   956,   956,   956,
+     956,   956,    84,   177,   147,  -146,     3,   173,   199,  -146,
+    -146,  -146,    84,   890,  -146,  -146,   114,    84,    77,  -146,
+     890,    13,   479,    -5,    -5,   546,   890,  -146,  -146,  -146,
+    -146,  -146,  -146,   956,  -146,   956,   956,    78,   956,   956,
+    -146,   663,   220,    84,  -146,  1169,   505,   505,  1137,  -146,
+      -5,  1018,   187,   166,   188,   606,   205,  1169,  1169,  1169,
+    1169,  1169,  1169,   505,   505,  1169,   505,   505,   208,   208,
+    -146,  -146,  -146,  -146,   890,  -146,  -146,   758,   176,   175,
+     890,   184,     6,    57,  -146,  -146,   890,  -146,   123,  -146,
+    -146,    83,  -146,  -146,    18,   185,   189,  -146,  -146,    84,
+    1137,   200,   200,   200,   203,   200,   200,   206,  -146,  -146,
+    -146,   -42,   207,   209,   210,   890,   212,   -45,  -146,   213,
+      -5,   890,    33,   193,    28,  -146,  -146,    71,  -146,   824,
+     218,  -146,  -146,  -146,  -146,    13,   215,   890,   890,  -146,
+    -146,   890,   890,   956,   956,    -5,  -146,    -5,    -5,    -5,
+     103,    -5,  1018,  -146,    -5,   227,    84,  -146,  -146,   222,
+     223,   226,    74,  -146,  -146,   890,    -7,     2,   160,   163,
+     200,   200,  -146,  -146,  -146,  -146,   225,  -146,  -146,  -146,
+    -146,  -146,  -146,   235,   170,  -146,   890,   890,   890,    -5,
+    -146,  -146,    18,   105,    76,  -146,  -146,  -146,   890,  -146,
+     142,  -146
 };
 
 /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1050,54 +1044,54 @@ static const yytype_int16 yypact[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       4,     0,     0,     6,   110,    81,   108,   100,   102,    73,
-       0,     0,     0,     0,     0,     0,     0,   109,    61,     0,
-       0,     0,     0,     0,     0,     0,     0,    63,   101,    47,
-       1,     0,     0,     8,     6,     0,     0,    77,    60,     0,
-       0,     0,     0,    18,     0,    75,    74,    32,     0,     0,
-      84,     0,     0,    83,     0,   105,     0,     0,   165,   164,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   166,     0,
-     162,   167,     0,   156,     0,     0,     0,     0,     0,     0,
+       4,     0,     0,     6,   108,    69,   106,    89,    91,    61,
+       0,     0,     0,     0,     0,     0,     0,   107,    52,     0,
+       0,     0,     0,     0,     0,     0,    15,     0,    54,    90,
+      38,     1,     0,     0,     8,     6,     0,     0,    65,    51,
+       0,     0,     0,     0,   104,     0,    63,    62,    92,    72,
+       0,     0,    71,     0,    95,     0,     0,     0,     0,   162,
+     161,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   152,   163,
+       0,   159,   164,     0,   154,     0,     0,     0,     5,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    21,
-       5,    10,     0,    80,     0,     0,     0,     0,    53,    52,
-       3,     2,     8,     7,    48,     0,   118,     0,   116,     0,
-       0,     0,     0,     0,     0,     0,   112,   103,    85,    79,
-     113,   104,     0,     0,   115,     0,     0,     0,     0,     0,
-     106,     0,     0,    40,    41,    42,    25,    24,    23,    27,
-      31,    34,    36,    39,    26,    45,    46,    28,    29,    22,
-      43,    44,    30,    33,    35,    37,    38,    64,     0,    62,
-      76,   123,     0,     0,     0,     0,   122,     0,    82,     0,
-       0,    91,     0,     0,     9,    49,     0,   111,    59,    58,
-       0,    56,     0,    16,     0,     0,     0,    19,    17,    20,
-       0,   158,     0,   169,    71,   159,   163,     0,   161,   160,
-     157,   107,     0,   126,     0,     0,     0,   130,     0,     0,
-       0,   128,     0,     0,     0,    93,     0,    78,   114,     0,
-      90,     0,    87,    51,    50,   117,     0,     0,    54,     0,
-       0,    68,    15,     0,     0,    70,     0,     0,    65,     0,
-     124,     0,     0,     0,     0,     0,     0,   125,     0,   121,
-      11,    92,    89,    99,    98,     0,    86,    57,     0,     0,
-       0,     0,     0,    69,   168,   127,   136,   132,   131,     0,
-     134,   129,   133,    88,    96,    95,    97,     0,    67,     0,
-       0,     0,     0,    94,    55,     0,     0,     0,   135,    66,
-      12,     0,    14,     0,    13
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    10,     0,    68,    88,     0,     0,     0,    44,
+      43,     3,     2,     8,     7,    39,     0,   116,     0,   114,
+       0,     0,     0,     0,     0,     0,     0,    73,    67,   111,
+      94,   110,    93,     0,   113,     0,     0,     0,     0,     0,
+      96,     0,     0,    13,    14,    31,    32,    33,    16,   121,
+       0,     0,     0,     0,   120,    19,    18,    21,    23,    25,
+      27,    30,    20,    36,    37,    17,    34,    35,    22,    24,
+      26,    28,    29,    55,     0,    53,    64,     0,    70,     0,
+       0,    79,     0,     0,     9,    40,     0,   109,     0,    50,
+      49,     0,    47,   101,     0,     0,     0,   103,   102,    12,
+     168,   166,   156,   160,     0,   158,   157,     0,   155,   105,
+     124,     0,     0,     0,   128,     0,     0,     0,   126,     0,
+       0,     0,     0,    81,     0,    66,   112,     0,    78,     0,
+      75,    42,    41,   115,    45,     0,     0,     0,     0,    59,
+     100,     0,     0,     0,     0,     0,   122,     0,     0,     0,
+       0,     0,     0,   123,     0,   119,    11,    56,    80,    77,
+      87,    86,     0,    74,    48,     0,     0,     0,     0,     0,
+     167,   165,   125,   134,   130,   129,     0,   132,   127,   131,
+      76,    84,    83,    85,     0,    58,     0,     0,     0,     0,
+      82,    46,     0,     0,     0,   133,    57,    97,     0,    99,
+       0,    98
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -157,  -157,  -157,   169,    57,    -1,  -157,  -157,   148,   -13,
-    -157,   -39,  -157,    -7,  -157,   -96,  -101,    -6,  -157,    18,
-    -157,   -66,  -114,  -157,  -157,   -56,  -156,  -102,  -157
+    -146,  -146,  -146,   236,   179,    -1,     1,  -146,  -146,   253,
+      -8,  -146,    53,  -146,     5,  -146,     7,   284,  -146,   115,
+    -146,    60,  -100,  -146,  -146,    48,  -145,   169,  -146,  -140
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_uint8 yydefgoto[] =
 {
-       0,     2,     3,    33,   120,   111,    34,    35,   117,    26,
-     200,   201,    27,    28,   112,   252,   213,    29,   127,   128,
-     184,   185,   186,   224,   230,   231,    81,    82,    83
+       0,     2,     3,    34,   121,   112,    26,    35,    36,   118,
+      27,   201,   202,    28,    29,   113,   250,    30,   128,   129,
+     162,   163,   164,   221,   227,   228,    82,    83,    84,   211
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1105,422 +1099,256 @@ static const yytype_uint8 yydefgoto[] =
    number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      25,   181,     1,    45,    52,   113,    41,    42,    46,    52,
-      40,   266,   259,    43,    53,    30,    80,   113,    47,    49,
-     122,    56,   113,   142,   118,   118,   114,   232,    36,   260,
-     267,   132,   121,    38,   125,   126,    37,   143,    18,   142,
-     211,    39,   144,    18,   215,   216,    44,   218,   219,   220,
-     129,    84,   130,   143,   113,   134,   177,   178,   135,   179,
-     182,   187,   183,   133,   115,   116,   205,   206,   223,   106,
-     107,   108,   198,   109,   199,   138,   115,   116,   147,    31,
-      32,   115,   116,   136,   153,   154,   155,   156,   157,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   188,   122,
-     232,   255,   139,   115,   116,   192,   196,   140,   197,   269,
-     243,   246,   244,   247,  -156,  -156,   145,   146,   148,   202,
-     204,   151,   149,   208,   209,    80,   152,   214,   150,   214,
-     214,   193,   214,   214,    80,   285,   180,   286,   287,   288,
-     221,   290,  -156,  -156,   292,   283,   284,   109,   233,   234,
-    -120,   237,   238,   240,  -156,  -156,   104,   105,   106,   107,
-     108,   253,   109,   254,   256,  -119,   229,   222,   257,   194,
-     119,   261,   271,   262,   263,   265,   236,   268,   308,   239,
-     276,   278,   293,   302,    48,   126,   294,     4,     5,     6,
-       7,     8,     9,   123,   295,   303,   214,   277,    10,   309,
-     291,     0,    11,     0,   245,     0,    12,    13,     0,     0,
-       0,    14,     0,    15,    16,    17,     0,   264,     0,     0,
-       0,     0,     0,   270,     0,    18,     0,     0,     0,     0,
-     275,     0,     0,     0,     0,     0,     0,    19,   279,   280,
-     214,   214,   281,   282,    20,     0,     0,    21,    22,   229,
-      23,     0,    24,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   297,     0,     0,
-       0,     0,   -72,    50,     0,     0,    51,   -72,     0,     0,
-      52,     0,   -72,   -72,   -72,   -72,   -72,     0,   305,   306,
-     307,     0,   -72,   -72,   -72,     0,     0,   -72,   -72,   -72,
-     313,   -72,     0,     0,     0,   -72,   -72,   -72,   -72,   -72,
-     -72,   -72,   -72,     0,    18,     0,     0,   -72,     0,     0,
-     -72,   -72,   -72,   -72,   -72,   -72,   -72,   -72,   -72,   -72,
-       0,   -72,   -72,     0,   -72,   -72,   -72,   -72,   -72,   189,
-     -72,     0,     4,     5,     6,     7,     8,     9,     0,     0,
-       0,     0,     0,    10,     0,     0,     0,    11,     0,     0,
-       0,    12,    13,     0,     0,     0,    14,     0,    15,    16,
-      17,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      18,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    19,     0,     0,     0,     0,     0,     0,    20,
-       0,   190,    21,    22,   191,    23,    54,    24,     0,     4,
+      25,   159,   132,   114,   262,   212,   213,   255,   215,   216,
+      41,    51,    51,    42,    43,    44,   229,   199,   295,   200,
+      55,    57,   296,   263,   256,    52,   123,    46,    81,   143,
+      86,    87,    47,   122,   144,   126,   127,   119,   119,   247,
+     248,    86,    87,   249,    31,    18,    18,     1,    86,    87,
+      86,    87,    32,    33,    86,    87,   160,   115,   116,   117,
+     220,   241,   161,   242,   187,   142,    86,    87,    38,   239,
+      86,    87,   240,    86,    87,    37,    86,    87,   267,   147,
+      39,    86,    87,   130,   131,   153,   154,    88,   140,    40,
+     155,   156,   157,   158,   269,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   182,   280,   281,   123,   192,   229,    45,    86,
+      87,   188,    86,    87,    86,    87,    86,    87,    85,   198,
+     265,   204,    86,    87,   136,   209,   208,   270,   308,   196,
+     293,   309,   197,   214,   210,   245,   210,   210,   246,   210,
+     210,    86,    87,    86,    87,   282,    81,   283,   284,   285,
+     135,   287,    86,    87,   289,   137,   226,   138,   286,   141,
+     307,    86,    87,   139,   189,   151,   195,     4,     5,     6,
+       7,     8,     9,   232,   145,   244,   234,   146,    10,   237,
+      86,    87,    11,   205,   206,   127,    12,    13,   148,   305,
+     149,    14,   150,    15,    16,    17,   186,   311,    86,    87,
+     152,    86,    87,   193,   231,    18,    90,    91,    86,    87,
+     183,   184,   297,   185,   260,   298,   219,    19,   230,  -118,
+     266,    94,   301,    20,    21,   235,   190,    22,   272,   191,
+      23,   236,    24,   238,   102,   103,   276,   277,   253,   251,
+     278,   279,   268,   252,   210,   210,   105,   106,   107,   108,
+     109,   110,   111,   109,   110,   111,   254,   226,  -117,   143,
+     257,   124,   258,   259,   294,   261,   264,   273,   275,   -60,
+      49,   290,   291,    50,   -60,   292,   120,    51,   299,   -60,
+     -60,   -60,   -60,   -60,   300,   302,   303,   304,   274,   -60,
+     -60,   -60,   194,    48,   -60,   -60,   -60,   310,   -60,   306,
+     288,   243,   -60,   -60,   -60,   -60,   -60,   -60,   -60,   -60,
+     218,    18,     0,     0,   -60,     0,     0,   -60,   -60,   -60,
+     -60,   -60,   -60,   -60,   -60,   -60,   -60,     0,   -60,   -60,
+     -60,   -60,   -60,     0,   -60,   -60,    53,   -60,     0,     4,
        5,     6,     7,     8,     9,     0,     0,     0,     0,     0,
       10,     0,     0,     0,    11,     0,     0,     0,    12,    13,
        0,     0,     0,    14,     0,    15,    16,    17,     0,     0,
        0,     0,     0,     0,     0,     0,     0,    18,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    19,
-       0,     0,     0,     0,     0,     0,    20,     0,     0,    21,
-      22,    55,    23,   203,    24,     0,     4,     5,     6,     7,
+       0,     0,     0,     0,     0,    20,    21,     0,     0,    22,
+       0,    54,    23,    56,    24,     0,     4,     5,     6,     7,
        8,     9,     0,     0,     0,     0,     0,    10,     0,     0,
        0,    11,     0,     0,     0,    12,    13,     0,     0,     0,
-      14,     0,    15,    16,    17,     0,     0,     4,     5,     6,
-       7,     8,     9,     0,    18,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   207,     0,    19,     4,     5,     6,
-       7,     8,     9,    20,    16,    17,    21,    22,    10,    23,
-       0,    24,    11,     0,     0,    18,    12,    13,     0,     0,
-       0,    14,     0,    15,    16,    17,     0,   212,     0,     0,
-       0,     0,     0,     0,    20,    18,     0,    21,    22,     0,
-      23,     0,    24,     0,     0,     0,     0,    19,     0,     0,
-       0,     0,     0,     0,    20,     0,    57,    21,    22,    58,
-      23,    59,    24,    52,     0,    86,    87,     0,     0,    60,
-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,     0,     0,
-       0,     0,     0,    97,    98,     0,     0,    18,     0,     0,
-       0,     0,     0,     0,     0,   102,   103,   104,   105,   106,
-     107,   108,   210,   109,     0,    58,    79,    59,     0,    52,
-       0,     0,     0,  -155,     0,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,     0,     0,     0,     4,     5,     6,
-       7,     8,     9,    18,     0,     0,     0,     0,    10,     0,
-       0,     0,    11,     0,     0,     0,    12,    13,     0,     0,
-       0,    14,    79,    15,    16,    17,     0,     0,     0,  -155,
-       0,     0,     0,     0,     0,    18,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    19,     0,     0,
-       0,     0,     0,   124,    20,     0,     0,    21,    22,     0,
-      23,     0,    24,     4,     5,     6,     7,     8,     9,     0,
+      14,     0,    15,    16,    17,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    18,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    19,     0,     0,     0,
+       0,     0,    20,    21,     0,     0,    22,     0,     0,    23,
+     203,    24,     0,     4,     5,     6,     7,     8,     9,     0,
        0,     0,     0,     0,    10,     0,     0,     0,    11,     0,
        0,     0,    12,    13,     0,     0,     0,    14,     0,    15,
-      16,    17,     0,     0,     0,     0,     0,     0,     0,     0,
+      16,    17,     0,     0,     0,     0,  -154,  -154,     0,     0,
        0,    18,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    19,     0,     0,     0,     0,     0,     0,
-      20,     0,     0,    21,    22,   235,    23,     0,    24,     4,
-       5,     6,     7,     8,     9,     0,     0,     0,     0,     0,
-      10,     0,     0,     0,    11,     0,     0,     0,    12,    13,
-       0,     0,     0,    14,     0,    15,    16,    17,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    18,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    19,
-       0,     0,     0,     0,     0,     0,    20,     0,     0,    21,
-      22,   274,    23,     0,    24,     4,     5,     6,     7,     8,
-       9,     0,     0,     0,     0,     0,    10,     0,     0,     0,
-      11,     0,     0,     0,    12,    13,     0,     0,     0,    14,
-       0,    15,    16,    17,     0,     0,     4,     5,     6,     7,
-       8,     9,     0,    18,    86,    87,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    19,     0,     0,     0,    89,
-       0,     0,    20,    16,    17,    21,    22,     0,    23,     0,
-      24,     0,    97,    98,    18,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   102,   103,   104,   105,   106,   107,
-     108,     0,   109,    20,     0,   225,    21,    22,   226,    23,
-     227,    24,    52,     0,     0,     0,     0,     0,    60,    61,
-      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    18,    85,    86,    87,
-      88,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    89,    90,   228,     0,     0,     0,     0,
-      91,    92,    93,    94,    95,    96,    97,    98,     0,     0,
-       0,    85,    86,    87,    88,    99,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,     0,   109,    89,    90,     0,
-     241,     0,     0,   242,    91,    92,    93,    94,    95,    96,
-      97,    98,     0,     0,     0,    85,    86,    87,    88,    99,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,     0,
-     109,    89,    90,     0,     0,     0,     0,   141,    91,    92,
-      93,    94,    95,    96,    97,    98,     0,     0,     0,    85,
-      86,    87,    88,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,     0,   109,    89,    90,     0,     0,     0,
-       0,   272,    91,    92,    93,    94,    95,    96,    97,    98,
-       0,     0,     0,    85,    86,    87,    88,    99,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,     0,   109,    89,
-      90,     0,     0,     0,     0,   273,    91,    92,    93,    94,
-      95,    96,    97,    98,     0,     0,     0,    85,    86,    87,
-      88,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,     0,   109,    89,    90,     0,     0,     0,     0,   296,
-      91,    92,    93,    94,    95,    96,    97,    98,     0,     0,
-       0,     0,     0,     0,     0,    99,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,     0,   109,   311,     0,   312,
-      85,    86,    87,    88,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    89,    90,     0,     0,
-       0,     0,     0,    91,    92,    93,    94,    95,    96,    97,
-      98,     0,     0,     0,    85,    86,    87,    88,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,     0,   109,
-      89,    90,   137,     0,     0,     0,     0,    91,    92,    93,
-      94,    95,    96,    97,    98,     0,     0,     0,    85,    86,
-      87,    88,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,     0,   109,    89,    90,   217,     0,     0,     0,
-       0,    91,    92,    93,    94,    95,    96,    97,    98,     0,
-       0,     0,    85,    86,    87,    88,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,     0,   109,    89,    90,
-     289,     0,     0,     0,     0,    91,    92,    93,    94,    95,
-      96,    97,    98,     0,     0,     0,    85,    86,    87,    88,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-       0,   109,    89,    90,   310,     0,     0,     0,     0,    91,
-      92,    93,    94,    95,    96,    97,    98,     0,     0,     0,
-      85,    86,    87,    88,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,     0,   109,    89,    90,   314,     0,
-       0,     0,     0,    91,    92,    93,    94,    95,    96,    97,
-      98,     0,     0,     0,     0,     0,     0,     0,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,     0,   109,
-     110,    85,    86,    87,    88,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    89,    90,     0,
-       0,     0,     0,     0,    91,    92,    93,    94,    95,    96,
-      97,    98,     0,     0,     0,     0,     0,     0,     0,    99,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,     0,
-     109,   195,    85,    86,    87,    88,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    89,    90,
-       0,     0,     0,     0,     0,    91,    92,    93,    94,    95,
-      96,    97,    98,     0,     0,     0,     0,     0,     0,     0,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-       0,   109,   248,    85,    86,    87,    88,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    89,
-      90,     0,     0,     0,     0,     0,    91,    92,    93,    94,
-      95,    96,    97,    98,     0,     0,     0,     0,     0,     0,
-       0,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,     0,   109,   300,    85,    86,    87,    88,     0,     0,
+       0,     0,     0,    19,     0,     0,     0,     0,     0,    20,
+      21,     0,     0,    22,  -154,  -154,    23,   207,    24,     0,
+       4,     5,     6,     7,     8,     9,  -154,  -154,   107,   108,
+     109,   110,   111,     0,     0,    11,     0,     0,     0,    12,
+      13,     0,     0,     0,    14,     0,     0,    16,    17,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    18,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      89,    90,     0,     0,     0,     0,     0,    91,    92,    93,
-      94,    95,    96,    97,    98,     0,     0,     0,     0,     0,
-       0,     0,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,     0,   109,   301,    85,    86,    87,    88,     0,
+      19,     0,     0,     0,     0,     0,    20,    21,     0,    58,
+      22,     0,    59,    23,    60,    24,    51,    90,    91,     0,
+       0,     0,    61,    62,    63,    64,    65,    66,    67,    68,
+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+      79,     0,     0,     0,     0,   102,   103,     0,     0,     0,
+      18,     0,     0,     0,     0,     0,     0,   105,   106,   107,
+     108,   109,   110,   111,   217,     0,     0,    59,     0,    60,
+       0,    51,    80,     0,     0,     0,  -153,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,     4,     5,     6,     7,
+       8,     9,     0,     0,     0,    18,     0,    10,     0,     0,
+       0,    11,     0,     0,     0,    12,    13,     0,     0,     0,
+      14,     0,    15,    16,    17,     0,     0,    80,     0,     0,
+       0,  -153,     0,     0,    18,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    19,     0,     0,     0,
+       0,     0,    20,    21,   125,     0,    22,     0,     0,    23,
+       0,    24,     4,     5,     6,     7,     8,     9,     0,     0,
+       0,     0,     0,    10,     0,     0,     0,    11,     0,     0,
+       0,    12,    13,     0,     0,     0,    14,     0,    15,    16,
+      17,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      18,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    19,     0,     0,     0,     0,     0,    20,    21,
+       0,     0,    22,     0,   233,    23,     0,    24,     4,     5,
+       6,     7,     8,     9,     0,     0,     0,     0,     0,    10,
+       0,     0,     0,    11,     0,     0,     0,    12,    13,     0,
+       0,     0,    14,     0,    15,    16,    17,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    18,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    19,     0,
+       0,     0,     0,     0,    20,    21,     0,     0,    22,     0,
+     271,    23,     0,    24,     4,     5,     6,     7,     8,     9,
+       0,     0,     0,     0,     0,    10,     0,     0,     0,    11,
+       0,     0,     0,    12,    13,     0,     0,     0,    14,     0,
+      15,    16,    17,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    18,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    19,     0,     0,     0,     0,     0,
+      20,    21,     0,     0,    22,     0,     0,    23,     0,    24,
+       4,     5,     6,     7,     8,     9,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    11,     0,     0,     0,    12,
+      13,     0,     0,     0,    14,     0,     0,    16,    17,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    18,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    89,    90,     0,     0,     0,     0,     0,    91,    92,
-      93,    94,    95,    96,    97,    98,     0,     0,     0,     0,
-       0,     0,     0,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,     0,   109,   304,    85,    86,    87,    88,
-       0,     0,     0,     0,     0,     0,     0,   249,   250,     0,
-       0,   251,    89,    90,     0,     0,     0,     0,     0,    91,
-      92,    93,    94,    95,    96,    97,    98,     0,     0,     0,
-       0,     0,     0,     0,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,     0,   109,    85,    86,    87,    88,
-       0,     0,     0,     0,     0,     0,   131,     0,     0,     0,
-       0,     0,    89,    90,     0,     0,     0,     0,     0,    91,
-      92,    93,    94,    95,    96,    97,    98,     0,     0,     0,
-      85,    86,    87,    88,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,     0,   109,    89,    90,     0,     0,
-       0,     0,     0,    91,    92,    93,    94,    95,    96,    97,
-      98,     0,     0,     0,     0,   258,     0,     0,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,     0,   109,
-      85,    86,    87,    88,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   298,    89,    90,     0,     0,
-       0,     0,     0,    91,    92,    93,    94,    95,    96,    97,
-      98,     0,     0,     0,     0,     0,     0,     0,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,     0,   109,
-      85,    86,    87,    88,     0,     0,     0,     0,     0,     0,
-     299,     0,     0,     0,     0,     0,    89,    90,     0,     0,
-       0,     0,     0,    91,    92,    93,    94,    95,    96,    97,
-      98,     0,     0,     0,    85,    86,    87,    88,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,     0,   109,
-      89,    90,     0,     0,     0,     0,     0,    91,    92,    93,
-      94,    95,    96,    97,    98,     0,     0,     0,    85,    86,
-      87,    88,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,     0,   109,    89,    90,     0,     0,     0,     0,
-       0,    91,    92,    93,    94,    95,    96,    97,    98,     0,
-       0,     0,  -156,    86,    87,     0,     0,     0,   101,   102,
-     103,   104,   105,   106,   107,   108,     0,   109,    89,    90,
-       0,     0,     0,     0,     0,  -156,  -156,  -156,  -156,  -156,
-    -156,    97,    98,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  -156,   102,   103,   104,   105,   106,   107,   108,
-       0,   109
+      19,     0,     0,     0,     0,     0,    20,    21,     0,   222,
+      22,     0,   223,    23,   224,    24,    51,     0,     0,     0,
+       0,     0,    61,    62,    63,    64,    65,    66,    67,    68,
+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+      89,    90,    91,    92,    93,     0,     0,     0,     0,     0,
+      18,     0,     0,     0,     0,     0,    94,    95,     0,     0,
+       0,     0,     0,    96,    97,    98,    99,   100,   101,   102,
+     103,     0,   225,    89,    90,    91,    92,   133,     0,     0,
+     104,   105,   106,   107,   108,   109,   110,   111,     0,    94,
+      95,     0,     0,     0,     0,     0,    96,    97,    98,    99,
+     100,   101,   102,   103,     0,    89,    90,    91,    92,   134,
+       0,     0,     0,   104,   105,   106,   107,   108,   109,   110,
+     111,    94,    95,     0,     0,     0,     0,     0,    96,    97,
+      98,    99,   100,   101,   102,   103,     0,    89,    90,    91,
+      92,     0,     0,     0,     0,   104,   105,   106,   107,   108,
+     109,   110,   111,    94,    95,     0,     0,     0,     0,     0,
+      96,    97,    98,    99,   100,   101,   102,   103,     0,  -154,
+      90,    91,     0,     0,     0,     0,     0,   104,   105,   106,
+     107,   108,   109,   110,   111,    94,    95,     0,     0,     0,
+       0,     0,  -154,  -154,  -154,  -154,  -154,  -154,   102,   103,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  -154,
+     105,   106,   107,   108,   109,   110,   111
 };
 
 static const yytype_int16 yycheck[] =
 {
-       1,     6,    16,     1,     8,     5,    12,    13,     6,     8,
-      11,    49,    49,    14,    21,     0,    23,     5,    19,    20,
-      33,    22,     5,    49,    31,    32,    14,   183,    61,    66,
-      68,    14,    33,    42,    35,    36,    59,    63,    42,    49,
-     142,     4,    68,    42,   145,   146,     6,   148,   149,   151,
-      61,    69,    63,    63,     5,    29,    43,    44,    48,    46,
-      65,    65,    67,    14,    64,    65,   132,   133,   182,    55,
-      56,    57,     4,    59,     6,     1,    64,    65,    79,    17,
-      18,    64,    65,    62,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   115,   122,
-     266,   212,    59,    64,    65,   116,    60,    66,    62,   233,
-       4,    60,     6,    62,    11,    12,    63,    63,    63,   130,
-     131,    49,    63,   134,   135,   142,    69,   143,    68,   145,
-     146,    14,   148,   149,   151,   259,    59,   261,   262,   263,
-       6,   265,    39,    40,   268,   256,   257,    59,    41,    48,
-      41,    59,    66,    59,    51,    52,    53,    54,    55,    56,
-      57,    61,    59,    61,    48,    41,   183,   178,    63,   122,
-      32,    63,    59,    63,    63,    63,   187,    63,   302,   190,
-      59,    63,    59,    63,     1,   196,    59,     4,     5,     6,
-       7,     8,     9,    34,    59,    59,   212,   246,    15,   305,
-     266,    -1,    19,    -1,   196,    -1,    23,    24,    -1,    -1,
-      -1,    28,    -1,    30,    31,    32,    -1,   228,    -1,    -1,
-      -1,    -1,    -1,   234,    -1,    42,    -1,    -1,    -1,    -1,
-     241,    -1,    -1,    -1,    -1,    -1,    -1,    54,   249,   250,
-     256,   257,   253,   254,    61,    -1,    -1,    64,    65,   266,
-      67,    -1,    69,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   278,    -1,    -1,
-      -1,    -1,     0,     1,    -1,    -1,     4,     5,    -1,    -1,
-       8,    -1,    10,    11,    12,    13,    14,    -1,   299,   300,
-     301,    -1,    20,    21,    22,    -1,    -1,    25,    26,    27,
-     311,    29,    -1,    -1,    -1,    33,    34,    35,    36,    37,
-      38,    39,    40,    -1,    42,    -1,    -1,    45,    -1,    -1,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      -1,    59,    60,    -1,    62,    63,    64,    65,    66,     1,
-      68,    -1,     4,     5,     6,     7,     8,     9,    -1,    -1,
-      -1,    -1,    -1,    15,    -1,    -1,    -1,    19,    -1,    -1,
-      -1,    23,    24,    -1,    -1,    -1,    28,    -1,    30,    31,
-      32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      42,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    54,    -1,    -1,    -1,    -1,    -1,    -1,    61,
-      -1,    63,    64,    65,    66,    67,     1,    69,    -1,     4,
+       1,     6,    20,     5,    49,   145,   146,    49,   148,   149,
+      11,     8,     8,    12,    13,    14,   161,     4,    25,     6,
+      21,    22,    20,    68,    66,    20,    34,     1,    23,    63,
+      48,    49,     6,    34,    68,    36,    37,    32,    33,    21,
+      22,    48,    49,    25,     0,    42,    42,    16,    48,    49,
+      48,    49,    17,    18,    48,    49,    61,    59,    60,    61,
+     160,     4,    67,     6,    61,    65,    48,    49,    59,    63,
+      48,    49,    66,    48,    49,    64,    48,    49,    45,    80,
+      42,    48,    49,    63,    64,    86,    87,    62,    66,     4,
+      89,    90,    91,    92,    66,    94,    95,    96,    97,    98,
+      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+     109,   110,   111,   253,   254,   123,   117,   262,     6,    48,
+      49,   116,    48,    49,    48,    49,    48,    49,    69,   130,
+     230,   132,    48,    49,    48,   136,   135,    66,    62,    62,
+      66,    65,    65,    65,   143,    62,   145,   146,    65,   148,
+     149,    48,    49,    48,    49,   255,   151,   257,   258,   259,
+      29,   261,    48,    49,   264,     1,   161,    59,    65,    65,
+      65,    48,    49,    66,     1,    49,    62,     4,     5,     6,
+       7,     8,     9,   184,    63,    62,   187,    63,    15,   190,
+      48,    49,    19,   133,   134,   196,    23,    24,    63,   299,
+      63,    28,    68,    30,    31,    32,    59,    65,    48,    49,
+      69,    48,    49,    14,    48,    42,    11,    12,    48,    49,
+      43,    44,    62,    46,   225,    62,     6,    54,    41,    41,
+     231,    26,    62,    60,    61,    59,    63,    64,   239,    66,
+      67,    66,    69,    59,    39,    40,   247,   248,    48,    64,
+     251,   252,    59,    64,   253,   254,    51,    52,    53,    54,
+      55,    56,    57,    55,    56,    57,    63,   262,    41,    63,
+      63,    35,    63,    63,   275,    63,    63,    59,    63,     0,
+       1,    59,    59,     4,     5,    59,    33,     8,    63,    10,
+      11,    12,    13,    14,    59,   296,   297,   298,   245,    20,
+      21,    22,   123,    19,    25,    26,    27,   308,    29,   302,
+     262,   196,    33,    34,    35,    36,    37,    38,    39,    40,
+     151,    42,    -1,    -1,    45,    -1,    -1,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    -1,    59,    60,
+      61,    62,    63,    -1,    65,    66,     1,    68,    -1,     4,
        5,     6,     7,     8,     9,    -1,    -1,    -1,    -1,    -1,
       15,    -1,    -1,    -1,    19,    -1,    -1,    -1,    23,    24,
       -1,    -1,    -1,    28,    -1,    30,    31,    32,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    54,
-      -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,    -1,    64,
-      65,    66,    67,     1,    69,    -1,     4,     5,     6,     7,
+      -1,    -1,    -1,    -1,    -1,    60,    61,    -1,    -1,    64,
+      -1,    66,    67,     1,    69,    -1,     4,     5,     6,     7,
        8,     9,    -1,    -1,    -1,    -1,    -1,    15,    -1,    -1,
       -1,    19,    -1,    -1,    -1,    23,    24,    -1,    -1,    -1,
-      28,    -1,    30,    31,    32,    -1,    -1,     4,     5,     6,
-       7,     8,     9,    -1,    42,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     1,    -1,    54,     4,     5,     6,
-       7,     8,     9,    61,    31,    32,    64,    65,    15,    67,
-      -1,    69,    19,    -1,    -1,    42,    23,    24,    -1,    -1,
-      -1,    28,    -1,    30,    31,    32,    -1,    54,    -1,    -1,
-      -1,    -1,    -1,    -1,    61,    42,    -1,    64,    65,    -1,
-      67,    -1,    69,    -1,    -1,    -1,    -1,    54,    -1,    -1,
-      -1,    -1,    -1,    -1,    61,    -1,     1,    64,    65,     4,
-      67,     6,    69,     8,    -1,    11,    12,    -1,    -1,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    -1,    -1,
-      -1,    -1,    -1,    39,    40,    -1,    -1,    42,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    51,    52,    53,    54,    55,
-      56,    57,     1,    59,    -1,     4,    61,     6,    -1,     8,
-      -1,    -1,    -1,    68,    -1,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    -1,    -1,    -1,     4,     5,     6,
-       7,     8,     9,    42,    -1,    -1,    -1,    -1,    15,    -1,
-      -1,    -1,    19,    -1,    -1,    -1,    23,    24,    -1,    -1,
-      -1,    28,    61,    30,    31,    32,    -1,    -1,    -1,    68,
-      -1,    -1,    -1,    -1,    -1,    42,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    54,    -1,    -1,
-      -1,    -1,    -1,    60,    61,    -1,    -1,    64,    65,    -1,
-      67,    -1,    69,     4,     5,     6,     7,     8,     9,    -1,
+      28,    -1,    30,    31,    32,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    42,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    54,    -1,    -1,    -1,
+      -1,    -1,    60,    61,    -1,    -1,    64,    -1,    -1,    67,
+       1,    69,    -1,     4,     5,     6,     7,     8,     9,    -1,
       -1,    -1,    -1,    -1,    15,    -1,    -1,    -1,    19,    -1,
       -1,    -1,    23,    24,    -1,    -1,    -1,    28,    -1,    30,
-      31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      31,    32,    -1,    -1,    -1,    -1,    11,    12,    -1,    -1,
       -1,    42,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    54,    -1,    -1,    -1,    -1,    -1,    -1,
-      61,    -1,    -1,    64,    65,    66,    67,    -1,    69,     4,
-       5,     6,     7,     8,     9,    -1,    -1,    -1,    -1,    -1,
-      15,    -1,    -1,    -1,    19,    -1,    -1,    -1,    23,    24,
-      -1,    -1,    -1,    28,    -1,    30,    31,    32,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    54,
-      -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,    -1,    64,
-      65,    66,    67,    -1,    69,     4,     5,     6,     7,     8,
-       9,    -1,    -1,    -1,    -1,    -1,    15,    -1,    -1,    -1,
-      19,    -1,    -1,    -1,    23,    24,    -1,    -1,    -1,    28,
-      -1,    30,    31,    32,    -1,    -1,     4,     5,     6,     7,
-       8,     9,    -1,    42,    11,    12,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    54,    -1,    -1,    -1,    26,
-      -1,    -1,    61,    31,    32,    64,    65,    -1,    67,    -1,
-      69,    -1,    39,    40,    42,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    51,    52,    53,    54,    55,    56,
-      57,    -1,    59,    61,    -1,     1,    64,    65,     4,    67,
-       6,    69,     8,    -1,    -1,    -1,    -1,    -1,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    42,    10,    11,    12,
-      13,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    26,    27,    61,    -1,    -1,    -1,    -1,
-      33,    34,    35,    36,    37,    38,    39,    40,    -1,    -1,
-      -1,    10,    11,    12,    13,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    -1,    59,    26,    27,    -1,
-      63,    -1,    -1,    66,    33,    34,    35,    36,    37,    38,
-      39,    40,    -1,    -1,    -1,    10,    11,    12,    13,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    -1,
-      59,    26,    27,    -1,    -1,    -1,    -1,    66,    33,    34,
-      35,    36,    37,    38,    39,    40,    -1,    -1,    -1,    10,
-      11,    12,    13,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    -1,    59,    26,    27,    -1,    -1,    -1,
-      -1,    66,    33,    34,    35,    36,    37,    38,    39,    40,
-      -1,    -1,    -1,    10,    11,    12,    13,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    -1,    59,    26,
-      27,    -1,    -1,    -1,    -1,    66,    33,    34,    35,    36,
-      37,    38,    39,    40,    -1,    -1,    -1,    10,    11,    12,
-      13,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    -1,    59,    26,    27,    -1,    -1,    -1,    -1,    66,
-      33,    34,    35,    36,    37,    38,    39,    40,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    -1,    59,    60,    -1,    62,
-      10,    11,    12,    13,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    26,    27,    -1,    -1,
-      -1,    -1,    -1,    33,    34,    35,    36,    37,    38,    39,
-      40,    -1,    -1,    -1,    10,    11,    12,    13,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    -1,    59,
-      26,    27,    62,    -1,    -1,    -1,    -1,    33,    34,    35,
-      36,    37,    38,    39,    40,    -1,    -1,    -1,    10,    11,
-      12,    13,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    -1,    59,    26,    27,    62,    -1,    -1,    -1,
-      -1,    33,    34,    35,    36,    37,    38,    39,    40,    -1,
-      -1,    -1,    10,    11,    12,    13,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    -1,    59,    26,    27,
-      62,    -1,    -1,    -1,    -1,    33,    34,    35,    36,    37,
-      38,    39,    40,    -1,    -1,    -1,    10,    11,    12,    13,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      -1,    59,    26,    27,    62,    -1,    -1,    -1,    -1,    33,
-      34,    35,    36,    37,    38,    39,    40,    -1,    -1,    -1,
-      10,    11,    12,    13,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    -1,    59,    26,    27,    62,    -1,
-      -1,    -1,    -1,    33,    34,    35,    36,    37,    38,    39,
-      40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    -1,    59,
-      60,    10,    11,    12,    13,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    26,    27,    -1,
-      -1,    -1,    -1,    -1,    33,    34,    35,    36,    37,    38,
-      39,    40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    -1,
-      59,    60,    10,    11,    12,    13,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    26,    27,
-      -1,    -1,    -1,    -1,    -1,    33,    34,    35,    36,    37,
-      38,    39,    40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      -1,    59,    60,    10,    11,    12,    13,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    26,
-      27,    -1,    -1,    -1,    -1,    -1,    33,    34,    35,    36,
-      37,    38,    39,    40,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    -1,    59,    60,    10,    11,    12,    13,    -1,    -1,
+      -1,    -1,    -1,    54,    -1,    -1,    -1,    -1,    -1,    60,
+      61,    -1,    -1,    64,    39,    40,    67,     1,    69,    -1,
+       4,     5,     6,     7,     8,     9,    51,    52,    53,    54,
+      55,    56,    57,    -1,    -1,    19,    -1,    -1,    -1,    23,
+      24,    -1,    -1,    -1,    28,    -1,    -1,    31,    32,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      26,    27,    -1,    -1,    -1,    -1,    -1,    33,    34,    35,
-      36,    37,    38,    39,    40,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    -1,    59,    60,    10,    11,    12,    13,    -1,
+      54,    -1,    -1,    -1,    -1,    -1,    60,    61,    -1,     1,
+      64,    -1,     4,    67,     6,    69,     8,    11,    12,    -1,
+      -1,    -1,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    -1,    -1,    -1,    -1,    39,    40,    -1,    -1,    -1,
+      42,    -1,    -1,    -1,    -1,    -1,    -1,    51,    52,    53,
+      54,    55,    56,    57,     1,    -1,    -1,     4,    -1,     6,
+      -1,     8,    64,    -1,    -1,    -1,    68,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,     4,     5,     6,     7,
+       8,     9,    -1,    -1,    -1,    42,    -1,    15,    -1,    -1,
+      -1,    19,    -1,    -1,    -1,    23,    24,    -1,    -1,    -1,
+      28,    -1,    30,    31,    32,    -1,    -1,    64,    -1,    -1,
+      -1,    68,    -1,    -1,    42,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    54,    -1,    -1,    -1,
+      -1,    -1,    60,    61,    62,    -1,    64,    -1,    -1,    67,
+      -1,    69,     4,     5,     6,     7,     8,     9,    -1,    -1,
+      -1,    -1,    -1,    15,    -1,    -1,    -1,    19,    -1,    -1,
+      -1,    23,    24,    -1,    -1,    -1,    28,    -1,    30,    31,
+      32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      42,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    54,    -1,    -1,    -1,    -1,    -1,    60,    61,
+      -1,    -1,    64,    -1,    66,    67,    -1,    69,     4,     5,
+       6,     7,     8,     9,    -1,    -1,    -1,    -1,    -1,    15,
+      -1,    -1,    -1,    19,    -1,    -1,    -1,    23,    24,    -1,
+      -1,    -1,    28,    -1,    30,    31,    32,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    42,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    54,    -1,
+      -1,    -1,    -1,    -1,    60,    61,    -1,    -1,    64,    -1,
+      66,    67,    -1,    69,     4,     5,     6,     7,     8,     9,
+      -1,    -1,    -1,    -1,    -1,    15,    -1,    -1,    -1,    19,
+      -1,    -1,    -1,    23,    24,    -1,    -1,    -1,    28,    -1,
+      30,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    42,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    54,    -1,    -1,    -1,    -1,    -1,
+      60,    61,    -1,    -1,    64,    -1,    -1,    67,    -1,    69,
+       4,     5,     6,     7,     8,     9,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    19,    -1,    -1,    -1,    23,
+      24,    -1,    -1,    -1,    28,    -1,    -1,    31,    32,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    26,    27,    -1,    -1,    -1,    -1,    -1,    33,    34,
-      35,    36,    37,    38,    39,    40,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    -1,    59,    60,    10,    11,    12,    13,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    21,    22,    -1,
-      -1,    25,    26,    27,    -1,    -1,    -1,    -1,    -1,    33,
-      34,    35,    36,    37,    38,    39,    40,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    -1,    59,    10,    11,    12,    13,
-      -1,    -1,    -1,    -1,    -1,    -1,    20,    -1,    -1,    -1,
-      -1,    -1,    26,    27,    -1,    -1,    -1,    -1,    -1,    33,
-      34,    35,    36,    37,    38,    39,    40,    -1,    -1,    -1,
-      10,    11,    12,    13,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    -1,    59,    26,    27,    -1,    -1,
+      54,    -1,    -1,    -1,    -1,    -1,    60,    61,    -1,     1,
+      64,    -1,     4,    67,     6,    69,     8,    -1,    -1,    -1,
+      -1,    -1,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      10,    11,    12,    13,    14,    -1,    -1,    -1,    -1,    -1,
+      42,    -1,    -1,    -1,    -1,    -1,    26,    27,    -1,    -1,
       -1,    -1,    -1,    33,    34,    35,    36,    37,    38,    39,
-      40,    -1,    -1,    -1,    -1,    45,    -1,    -1,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    -1,    59,
-      10,    11,    12,    13,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    25,    26,    27,    -1,    -1,
-      -1,    -1,    -1,    33,    34,    35,    36,    37,    38,    39,
-      40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    -1,    59,
-      10,    11,    12,    13,    -1,    -1,    -1,    -1,    -1,    -1,
-      20,    -1,    -1,    -1,    -1,    -1,    26,    27,    -1,    -1,
-      -1,    -1,    -1,    33,    34,    35,    36,    37,    38,    39,
-      40,    -1,    -1,    -1,    10,    11,    12,    13,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    -1,    59,
-      26,    27,    -1,    -1,    -1,    -1,    -1,    33,    34,    35,
-      36,    37,    38,    39,    40,    -1,    -1,    -1,    10,    11,
-      12,    13,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    -1,    59,    26,    27,    -1,    -1,    -1,    -1,
-      -1,    33,    34,    35,    36,    37,    38,    39,    40,    -1,
-      -1,    -1,    10,    11,    12,    -1,    -1,    -1,    50,    51,
-      52,    53,    54,    55,    56,    57,    -1,    59,    26,    27,
-      -1,    -1,    -1,    -1,    -1,    33,    34,    35,    36,    37,
-      38,    39,    40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    50,    51,    52,    53,    54,    55,    56,    57,
-      -1,    59
+      40,    -1,    64,    10,    11,    12,    13,    14,    -1,    -1,
+      50,    51,    52,    53,    54,    55,    56,    57,    -1,    26,
+      27,    -1,    -1,    -1,    -1,    -1,    33,    34,    35,    36,
+      37,    38,    39,    40,    -1,    10,    11,    12,    13,    14,
+      -1,    -1,    -1,    50,    51,    52,    53,    54,    55,    56,
+      57,    26,    27,    -1,    -1,    -1,    -1,    -1,    33,    34,
+      35,    36,    37,    38,    39,    40,    -1,    10,    11,    12,
+      13,    -1,    -1,    -1,    -1,    50,    51,    52,    53,    54,
+      55,    56,    57,    26,    27,    -1,    -1,    -1,    -1,    -1,
+      33,    34,    35,    36,    37,    38,    39,    40,    -1,    10,
+      11,    12,    -1,    -1,    -1,    -1,    -1,    50,    51,    52,
+      53,    54,    55,    56,    57,    26,    27,    -1,    -1,    -1,
+      -1,    -1,    33,    34,    35,    36,    37,    38,    39,    40,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,
+      51,    52,    53,    54,    55,    56,    57
 };
 
 /* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
@@ -1529,80 +1357,80 @@ static const yytype_int8 yystos[] =
 {
        0,    16,    71,    72,     4,     5,     6,     7,     8,     9,
       15,    19,    23,    24,    28,    30,    31,    32,    42,    54,
-      61,    64,    65,    67,    69,    75,    79,    82,    83,    87,
-       0,    17,    18,    73,    76,    77,    61,    59,    42,     4,
-      75,    87,    87,    75,     6,     1,     6,    75,     1,    75,
-       1,     4,     8,    83,     1,    66,    75,     1,     4,     6,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    61,
-      83,    96,    97,    98,    69,    10,    11,    12,    13,    26,
-      27,    33,    34,    35,    36,    37,    38,    39,    40,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    59,
-      60,    75,    84,     5,    14,    64,    65,    78,    83,    78,
-      74,    75,    79,    73,    60,    75,    75,    88,    89,    61,
-      63,    20,    14,    14,    29,    48,    62,    62,     1,    59,
-      66,    66,    49,    63,    68,    63,    63,    75,    63,    63,
-      68,    49,    69,    75,    75,    75,    75,    75,    75,    75,
-      75,    75,    75,    75,    75,    75,    75,    75,    75,    75,
-      75,    75,    75,    75,    75,    75,    75,    43,    44,    46,
-      59,     6,    65,    67,    90,    91,    92,    65,    83,     1,
-      63,    66,    75,    14,    74,    60,    60,    62,     4,     6,
-      80,    81,    75,     1,    75,    91,    91,     1,    75,    75,
-       1,    97,    54,    86,    87,    86,    86,    62,    86,    86,
-      97,     6,    75,    92,    93,     1,     4,     6,    61,    83,
-      94,    95,    96,    41,    48,    66,    75,    59,    66,    75,
-      59,    63,    66,     4,     6,    89,    60,    62,    60,    21,
-      22,    25,    85,    61,    61,    86,    48,    63,    45,    49,
-      66,    63,    63,    63,    75,    63,    49,    68,    63,    92,
-      75,    59,    66,    66,    66,    75,    59,    81,    63,    75,
-      75,    75,    75,    86,    86,    92,    92,    92,    92,    62,
-      92,    95,    92,    59,    59,    59,    66,    75,    25,    20,
-      60,    60,    63,    59,    60,    75,    75,    75,    92,    85,
-      62,    60,    62,    75,    62
+      60,    61,    64,    67,    69,    75,    76,    80,    83,    84,
+      87,     0,    17,    18,    73,    77,    78,    64,    59,    42,
+       4,    75,    76,    76,    76,     6,     1,     6,    87,     1,
+       4,     8,    84,     1,    66,    75,     1,    75,     1,     4,
+       6,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      64,    84,    96,    97,    98,    69,    48,    49,    62,    10,
+      11,    12,    13,    14,    26,    27,    33,    34,    35,    36,
+      37,    38,    39,    40,    50,    51,    52,    53,    54,    55,
+      56,    57,    75,    85,     5,    59,    60,    61,    79,    84,
+      79,    74,    75,    80,    73,    62,    75,    75,    88,    89,
+      63,    64,    20,    14,    14,    29,    48,     1,    59,    66,
+      66,    65,    65,    63,    68,    63,    63,    75,    63,    63,
+      68,    49,    69,    75,    75,    76,    76,    76,    76,     6,
+      61,    67,    90,    91,    92,    76,    76,    76,    76,    76,
+      76,    76,    76,    76,    76,    76,    76,    76,    76,    76,
+      76,    76,    76,    43,    44,    46,    59,    61,    84,     1,
+      63,    66,    75,    14,    74,    62,    62,    65,    75,     4,
+       6,    81,    82,     1,    75,    91,    91,     1,    76,    75,
+      76,    99,    99,    99,    65,    99,    99,     1,    97,     6,
+      92,    93,     1,     4,     6,    64,    84,    94,    95,    96,
+      41,    48,    75,    66,    75,    59,    66,    75,    59,    63,
+      66,     4,     6,    89,    62,    62,    65,    21,    22,    25,
+      86,    64,    64,    48,    63,    49,    66,    63,    63,    63,
+      75,    63,    49,    68,    63,    92,    75,    45,    59,    66,
+      66,    66,    75,    59,    82,    63,    75,    75,    75,    75,
+      99,    99,    92,    92,    92,    92,    65,    92,    95,    92,
+      59,    59,    59,    66,    75,    25,    20,    62,    62,    63,
+      59,    62,    75,    75,    75,    92,    86,    65,    62,    65,
+      75,    65
 };
 
 /* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
 static const yytype_int8 yyr1[] =
 {
        0,    70,    71,    71,    72,    72,    73,    73,    74,    74,
-      75,    75,    75,    75,    75,    75,    75,    75,    75,    75,
-      75,    75,    75,    75,    75,    75,    75,    75,    75,    75,
-      75,    75,    75,    75,    75,    75,    75,    75,    75,    75,
-      75,    75,    75,    75,    75,    75,    75,    75,    76,    76,
-      77,    77,    77,    78,    79,    79,    80,    80,    81,    81,
-      82,    82,    83,    84,    84,    84,    85,    85,    85,    86,
-      86,    86,    87,    87,    87,    87,    87,    87,    87,    87,
+      75,    75,    75,    75,    75,    75,    76,    76,    76,    76,
+      76,    76,    76,    76,    76,    76,    76,    76,    76,    76,
+      76,    76,    76,    76,    76,    76,    76,    76,    76,    77,
+      77,    78,    78,    78,    79,    80,    80,    81,    81,    82,
+      82,    83,    83,    84,    85,    85,    85,    86,    86,    86,
+      87,    87,    87,    87,    87,    87,    87,    87,    87,    87,
       87,    87,    87,    87,    87,    87,    87,    87,    87,    87,
       87,    87,    87,    87,    87,    87,    87,    87,    87,    87,
       87,    87,    87,    87,    87,    87,    87,    87,    87,    87,
-      87,    87,    87,    87,    87,    87,    88,    88,    89,    90,
-      90,    91,    91,    92,    92,    92,    93,    93,    94,    94,
-      95,    95,    95,    95,    95,    95,    95,    96,    96,    96,
+      87,    87,    87,    87,    87,    87,    87,    87,    87,    87,
+      87,    87,    87,    87,    88,    88,    89,    90,    90,    91,
+      91,    92,    92,    92,    93,    93,    94,    94,    95,    95,
+      95,    95,    95,    95,    95,    96,    96,    96,    96,    96,
       96,    96,    96,    96,    96,    96,    96,    96,    96,    96,
-      96,    96,    96,    96,    96,    97,    97,    97,    97,    98,
-      98,    98,    98,    98,    98,    98,    98,    98,    98,    98
+      96,    96,    96,    97,    97,    97,    98,    98,    98,    98,
+      98,    98,    98,    98,    98,    98,    98,    99,    99
 };
 
 /* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
 static const yytype_int8 yyr2[] =
 {
        0,     2,     3,     3,     0,     3,     0,     2,     0,     2,
-       2,     5,     9,    11,     9,     5,     4,     4,     2,     4,
-       4,     2,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     2,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     1,     2,     3,
-       4,     4,     2,     1,     5,     8,     1,     3,     1,     1,
-       2,     1,     3,     0,     2,     4,     5,     3,     1,     3,
-       2,     1,     1,     1,     2,     2,     3,     2,     4,     3,
-       2,     1,     3,     2,     2,     3,     5,     4,     6,     5,
-       4,     3,     5,     4,     7,     6,     6,     6,     5,     5,
-       1,     1,     1,     3,     3,     2,     3,     4,     1,     1,
-       1,     4,     3,     3,     4,     3,     1,     3,     1,     3,
-       1,     3,     1,     1,     3,     3,     1,     3,     1,     3,
-       1,     3,     3,     3,     3,     5,     3,     1,     1,     1,
+       2,     5,     4,     3,     3,     1,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     1,     2,
+       3,     4,     4,     2,     1,     5,     8,     1,     3,     1,
+       1,     2,     1,     3,     0,     2,     4,     5,     3,     1,
+       1,     1,     2,     2,     3,     2,     4,     3,     2,     1,
+       3,     2,     2,     3,     5,     4,     6,     5,     4,     3,
+       5,     4,     7,     6,     6,     6,     5,     5,     2,     1,
+       1,     1,     2,     3,     3,     2,     3,     9,    11,     9,
+       5,     4,     4,     4,     2,     4,     1,     1,     1,     4,
+       3,     3,     4,     3,     1,     3,     1,     3,     1,     3,
+       1,     1,     3,     3,     1,     3,     1,     3,     1,     3,
+       3,     3,     3,     5,     3,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     1,     3,     3,     3,
-       3,     3,     1,     3,     1,     1,     1,     1,     5,     3
+       1,     1,     1,     0,     1,     3,     3,     3,     3,     1,
+       3,     1,     1,     1,     1,     5,     3,     3,     1
 };
 
 
@@ -2172,199 +2000,205 @@ yydestruct (const char *yymsg,
     case YYSYMBOL_IDENT: /* IDENT  */
 #line 37 "src/parser.y"
             { jv_free(((*yyvaluep).literal)); }
-#line 2176 "src/parser.c"
+#line 2004 "src/parser.c"
         break;
 
     case YYSYMBOL_FIELD: /* FIELD  */
 #line 37 "src/parser.y"
             { jv_free(((*yyvaluep).literal)); }
-#line 2182 "src/parser.c"
+#line 2010 "src/parser.c"
         break;
 
     case YYSYMBOL_BINDING: /* BINDING  */
 #line 37 "src/parser.y"
             { jv_free(((*yyvaluep).literal)); }
-#line 2188 "src/parser.c"
+#line 2016 "src/parser.c"
         break;
 
     case YYSYMBOL_LITERAL: /* LITERAL  */
 #line 37 "src/parser.y"
             { jv_free(((*yyvaluep).literal)); }
-#line 2194 "src/parser.c"
+#line 2022 "src/parser.c"
         break;
 
     case YYSYMBOL_FORMAT: /* FORMAT  */
 #line 37 "src/parser.y"
             { jv_free(((*yyvaluep).literal)); }
-#line 2200 "src/parser.c"
+#line 2028 "src/parser.c"
         break;
 
     case YYSYMBOL_QQSTRING_TEXT: /* QQSTRING_TEXT  */
 #line 37 "src/parser.y"
             { jv_free(((*yyvaluep).literal)); }
-#line 2206 "src/parser.c"
+#line 2034 "src/parser.c"
         break;
 
     case YYSYMBOL_Module: /* Module  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2212 "src/parser.c"
+#line 2040 "src/parser.c"
         break;
 
     case YYSYMBOL_Imports: /* Imports  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2218 "src/parser.c"
+#line 2046 "src/parser.c"
         break;
 
     case YYSYMBOL_FuncDefs: /* FuncDefs  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2224 "src/parser.c"
+#line 2052 "src/parser.c"
         break;
 
-    case YYSYMBOL_Exp: /* Exp  */
+    case YYSYMBOL_Query: /* Query  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2230 "src/parser.c"
+#line 2058 "src/parser.c"
+        break;
+
+    case YYSYMBOL_Expr: /* Expr  */
+#line 38 "src/parser.y"
+            { block_free(((*yyvaluep).blk)); }
+#line 2064 "src/parser.c"
         break;
 
     case YYSYMBOL_Import: /* Import  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2236 "src/parser.c"
+#line 2070 "src/parser.c"
         break;
 
     case YYSYMBOL_ImportWhat: /* ImportWhat  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2242 "src/parser.c"
+#line 2076 "src/parser.c"
         break;
 
     case YYSYMBOL_ImportFrom: /* ImportFrom  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2248 "src/parser.c"
+#line 2082 "src/parser.c"
         break;
 
     case YYSYMBOL_FuncDef: /* FuncDef  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2254 "src/parser.c"
+#line 2088 "src/parser.c"
         break;
 
     case YYSYMBOL_Params: /* Params  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2260 "src/parser.c"
+#line 2094 "src/parser.c"
         break;
 
     case YYSYMBOL_Param: /* Param  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2266 "src/parser.c"
+#line 2100 "src/parser.c"
         break;
 
     case YYSYMBOL_StringStart: /* StringStart  */
 #line 37 "src/parser.y"
             { jv_free(((*yyvaluep).literal)); }
-#line 2272 "src/parser.c"
+#line 2106 "src/parser.c"
         break;
 
     case YYSYMBOL_String: /* String  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2278 "src/parser.c"
+#line 2112 "src/parser.c"
         break;
 
     case YYSYMBOL_QQString: /* QQString  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2284 "src/parser.c"
+#line 2118 "src/parser.c"
         break;
 
     case YYSYMBOL_ElseBody: /* ElseBody  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2290 "src/parser.c"
-        break;
-
-    case YYSYMBOL_ExpD: /* ExpD  */
-#line 38 "src/parser.y"
-            { block_free(((*yyvaluep).blk)); }
-#line 2296 "src/parser.c"
+#line 2124 "src/parser.c"
         break;
 
     case YYSYMBOL_Term: /* Term  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2302 "src/parser.c"
+#line 2130 "src/parser.c"
         break;
 
     case YYSYMBOL_Args: /* Args  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2308 "src/parser.c"
+#line 2136 "src/parser.c"
         break;
 
     case YYSYMBOL_Arg: /* Arg  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2314 "src/parser.c"
+#line 2142 "src/parser.c"
         break;
 
     case YYSYMBOL_RepPatterns: /* RepPatterns  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2320 "src/parser.c"
+#line 2148 "src/parser.c"
         break;
 
     case YYSYMBOL_Patterns: /* Patterns  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2326 "src/parser.c"
+#line 2154 "src/parser.c"
         break;
 
     case YYSYMBOL_Pattern: /* Pattern  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2332 "src/parser.c"
+#line 2160 "src/parser.c"
         break;
 
     case YYSYMBOL_ArrayPats: /* ArrayPats  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2338 "src/parser.c"
+#line 2166 "src/parser.c"
         break;
 
     case YYSYMBOL_ObjPats: /* ObjPats  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2344 "src/parser.c"
+#line 2172 "src/parser.c"
         break;
 
     case YYSYMBOL_ObjPat: /* ObjPat  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2350 "src/parser.c"
+#line 2178 "src/parser.c"
         break;
 
     case YYSYMBOL_Keyword: /* Keyword  */
 #line 37 "src/parser.y"
             { jv_free(((*yyvaluep).literal)); }
-#line 2356 "src/parser.c"
+#line 2184 "src/parser.c"
         break;
 
-    case YYSYMBOL_MkDict: /* MkDict  */
+    case YYSYMBOL_DictPairs: /* DictPairs  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2362 "src/parser.c"
+#line 2190 "src/parser.c"
         break;
 
-    case YYSYMBOL_MkDictPair: /* MkDictPair  */
+    case YYSYMBOL_DictPair: /* DictPair  */
 #line 38 "src/parser.y"
             { block_free(((*yyvaluep).blk)); }
-#line 2368 "src/parser.c"
+#line 2196 "src/parser.c"
+        break;
+
+    case YYSYMBOL_DictExpr: /* DictExpr  */
+#line 38 "src/parser.y"
+            { block_free(((*yyvaluep).blk)); }
+#line 2202 "src/parser.c"
         break;
 
       default:
@@ -2667,407 +2501,333 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-  case 2: /* TopLevel: Module Imports Exp  */
-#line 290 "src/parser.y"
-                   {
+  case 2: /* TopLevel: Module Imports Query  */
+#line 282 "src/parser.y"
+                     {
   *answer = BLOCK((yyvsp[-2].blk), (yyvsp[-1].blk), gen_op_simple(TOP), (yyvsp[0].blk));
 }
-#line 2676 "src/parser.c"
+#line 2510 "src/parser.c"
     break;
 
   case 3: /* TopLevel: Module Imports FuncDefs  */
-#line 293 "src/parser.y"
+#line 285 "src/parser.y"
                         {
   *answer = BLOCK((yyvsp[-2].blk), (yyvsp[-1].blk), (yyvsp[0].blk));
 }
-#line 2684 "src/parser.c"
+#line 2518 "src/parser.c"
     break;
 
   case 4: /* Module: %empty  */
-#line 298 "src/parser.y"
+#line 290 "src/parser.y"
        {
   (yyval.blk) = gen_noop();
 }
-#line 2692 "src/parser.c"
+#line 2526 "src/parser.c"
     break;
 
-  case 5: /* Module: "module" Exp ';'  */
-#line 301 "src/parser.y"
-                 {
+  case 5: /* Module: "module" Query ';'  */
+#line 293 "src/parser.y"
+                   {
   if (!block_is_const((yyvsp[-1].blk))) {
-    FAIL((yyloc), "Module metadata must be constant");
+    FAIL((yylsp[-1]), "Module metadata must be constant");
     (yyval.blk) = gen_noop();
     block_free((yyvsp[-1].blk));
   } else if (block_const_kind((yyvsp[-1].blk)) != JV_KIND_OBJECT) {
-    FAIL((yyloc), "Module metadata must be an object");
+    FAIL((yylsp[-1]), "Module metadata must be an object");
     (yyval.blk) = gen_noop();
     block_free((yyvsp[-1].blk));
   } else {
     (yyval.blk) = gen_module((yyvsp[-1].blk));
   }
 }
-#line 2710 "src/parser.c"
+#line 2544 "src/parser.c"
     break;
 
   case 6: /* Imports: %empty  */
-#line 316 "src/parser.y"
+#line 308 "src/parser.y"
        {
   (yyval.blk) = gen_noop();
 }
-#line 2718 "src/parser.c"
+#line 2552 "src/parser.c"
     break;
 
   case 7: /* Imports: Import Imports  */
-#line 319 "src/parser.y"
+#line 311 "src/parser.y"
                {
   (yyval.blk) = BLOCK((yyvsp[-1].blk), (yyvsp[0].blk));
 }
-#line 2726 "src/parser.c"
+#line 2560 "src/parser.c"
     break;
 
   case 8: /* FuncDefs: %empty  */
-#line 324 "src/parser.y"
+#line 316 "src/parser.y"
        {
   (yyval.blk) = gen_noop();
 }
-#line 2734 "src/parser.c"
+#line 2568 "src/parser.c"
     break;
 
   case 9: /* FuncDefs: FuncDef FuncDefs  */
-#line 327 "src/parser.y"
+#line 319 "src/parser.y"
                  {
   (yyval.blk) = block_join((yyvsp[-1].blk), (yyvsp[0].blk));
 }
-#line 2742 "src/parser.c"
+#line 2576 "src/parser.c"
     break;
 
-  case 10: /* Exp: FuncDef Exp  */
-#line 332 "src/parser.y"
-                          {
+  case 10: /* Query: FuncDef Query  */
+#line 325 "src/parser.y"
+                            {
   (yyval.blk) = block_bind_referenced((yyvsp[-1].blk), (yyvsp[0].blk), OP_IS_CALL_PSEUDO);
 }
-#line 2750 "src/parser.c"
-    break;
-
-  case 11: /* Exp: Term "as" Patterns '|' Exp  */
-#line 336 "src/parser.y"
-                           {
-  (yyval.blk) = gen_destructure((yyvsp[-4].blk), (yyvsp[-2].blk), (yyvsp[0].blk));
-}
-#line 2758 "src/parser.c"
-    break;
-
-  case 12: /* Exp: "reduce" Term "as" Patterns '(' Exp ';' Exp ')'  */
-#line 339 "src/parser.y"
-                                                {
-  (yyval.blk) = gen_reduce((yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk));
-}
-#line 2766 "src/parser.c"
+#line 2584 "src/parser.c"
     break;
 
-  case 13: /* Exp: "foreach" Term "as" Patterns '(' Exp ';' Exp ';' Exp ')'  */
-#line 343 "src/parser.y"
-                                                         {
-  (yyval.blk) = gen_foreach((yyvsp[-9].blk), (yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk));
-}
-#line 2774 "src/parser.c"
-    break;
-
-  case 14: /* Exp: "foreach" Term "as" Patterns '(' Exp ';' Exp ')'  */
-#line 347 "src/parser.y"
-                                                 {
-  (yyval.blk) = gen_foreach((yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk), gen_noop());
-}
-#line 2782 "src/parser.c"
-    break;
-
-  case 15: /* Exp: "if" Exp "then" Exp ElseBody  */
-#line 351 "src/parser.y"
+  case 11: /* Query: Expr "as" Patterns '|' Query  */
+#line 328 "src/parser.y"
                              {
-  (yyval.blk) = gen_cond((yyvsp[-3].blk), (yyvsp[-1].blk), (yyvsp[0].blk));
-}
-#line 2790 "src/parser.c"
-    break;
-
-  case 16: /* Exp: "if" Exp "then" error  */
-#line 354 "src/parser.y"
-                      {
-  FAIL((yyloc), "Possibly unterminated 'if' statement");
-  (yyval.blk) = (yyvsp[-2].blk);
+  (yyval.blk) = gen_destructure((yyvsp[-4].blk), (yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 2799 "src/parser.c"
+#line 2592 "src/parser.c"
     break;
 
-  case 17: /* Exp: "try" Exp "catch" Exp  */
-#line 359 "src/parser.y"
-                      {
-  (yyval.blk) = gen_try((yyvsp[-2].blk), (yyvsp[0].blk));
+  case 12: /* Query: "label" BINDING '|' Query  */
+#line 331 "src/parser.y"
+                          {
+  jv v = jv_string_fmt("*label-%s", jv_string_value((yyvsp[-2].literal)));
+  (yyval.blk) = gen_location((yyloc), locations, gen_label(jv_string_value(v), (yyvsp[0].blk)));
+  jv_free((yyvsp[-2].literal));
+  jv_free(v);
 }
-#line 2807 "src/parser.c"
+#line 2603 "src/parser.c"
     break;
 
-  case 18: /* Exp: "try" Exp  */
-#line 362 "src/parser.y"
-          {
-  (yyval.blk) = gen_try((yyvsp[0].blk), gen_op_simple(BACKTRACK));
+  case 13: /* Query: Query '|' Query  */
+#line 337 "src/parser.y"
+                {
+  (yyval.blk) = block_join((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 2815 "src/parser.c"
+#line 2611 "src/parser.c"
     break;
 
-  case 19: /* Exp: "try" Exp "catch" error  */
-#line 365 "src/parser.y"
-                        {
-  FAIL((yyloc), "Possibly unterminated 'try' statement");
-  (yyval.blk) = (yyvsp[-2].blk);
+  case 14: /* Query: Query ',' Query  */
+#line 340 "src/parser.y"
+                {
+  (yyval.blk) = gen_both((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 2824 "src/parser.c"
+#line 2619 "src/parser.c"
     break;
 
-  case 20: /* Exp: "label" BINDING '|' Exp  */
-#line 370 "src/parser.y"
-                        {
-  jv v = jv_string_fmt("*label-%s", jv_string_value((yyvsp[-2].literal)));
-  (yyval.blk) = gen_location((yyloc), locations, gen_label(jv_string_value(v), (yyvsp[0].blk)));
-  jv_free((yyvsp[-2].literal));
-  jv_free(v);
+  case 15: /* Query: Expr  */
+#line 343 "src/parser.y"
+     {
+  (yyval.blk) = (yyvsp[0].blk);
 }
-#line 2835 "src/parser.c"
+#line 2627 "src/parser.c"
     break;
 
-  case 21: /* Exp: Exp '?'  */
-#line 377 "src/parser.y"
-        {
-  (yyval.blk) = gen_try((yyvsp[-1].blk), gen_op_simple(BACKTRACK));
+  case 16: /* Expr: Expr "//" Expr  */
+#line 349 "src/parser.y"
+               {
+  (yyval.blk) = gen_definedor((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 2843 "src/parser.c"
+#line 2635 "src/parser.c"
     break;
 
-  case 22: /* Exp: Exp '=' Exp  */
-#line 381 "src/parser.y"
-            {
+  case 17: /* Expr: Expr '=' Expr  */
+#line 352 "src/parser.y"
+              {
   (yyval.blk) = gen_call("_assign", BLOCK(gen_lambda((yyvsp[-2].blk)), gen_lambda((yyvsp[0].blk))));
 }
-#line 2851 "src/parser.c"
+#line 2643 "src/parser.c"
     break;
 
-  case 23: /* Exp: Exp "or" Exp  */
-#line 385 "src/parser.y"
-             {
+  case 18: /* Expr: Expr "or" Expr  */
+#line 355 "src/parser.y"
+               {
   (yyval.blk) = gen_or((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 2859 "src/parser.c"
+#line 2651 "src/parser.c"
     break;
 
-  case 24: /* Exp: Exp "and" Exp  */
-#line 389 "src/parser.y"
-              {
+  case 19: /* Expr: Expr "and" Expr  */
+#line 358 "src/parser.y"
+                {
   (yyval.blk) = gen_and((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 2867 "src/parser.c"
+#line 2659 "src/parser.c"
     break;
 
-  case 25: /* Exp: Exp "//" Exp  */
-#line 393 "src/parser.y"
-             {
-  (yyval.blk) = gen_definedor((yyvsp[-2].blk), (yyvsp[0].blk));
-}
-#line 2875 "src/parser.c"
-    break;
-
-  case 26: /* Exp: Exp "//=" Exp  */
-#line 397 "src/parser.y"
-              {
+  case 20: /* Expr: Expr "//=" Expr  */
+#line 361 "src/parser.y"
+                {
   (yyval.blk) = gen_definedor_assign((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 2883 "src/parser.c"
+#line 2667 "src/parser.c"
     break;
 
-  case 27: /* Exp: Exp "|=" Exp  */
-#line 401 "src/parser.y"
-             {
+  case 21: /* Expr: Expr "|=" Expr  */
+#line 364 "src/parser.y"
+               {
   (yyval.blk) = gen_call("_modify", BLOCK(gen_lambda((yyvsp[-2].blk)), gen_lambda((yyvsp[0].blk))));
 }
-#line 2891 "src/parser.c"
-    break;
-
-  case 28: /* Exp: Exp '|' Exp  */
-#line 405 "src/parser.y"
-            {
-  (yyval.blk) = block_join((yyvsp[-2].blk), (yyvsp[0].blk));
-}
-#line 2899 "src/parser.c"
-    break;
-
-  case 29: /* Exp: Exp ',' Exp  */
-#line 409 "src/parser.y"
-            {
-  (yyval.blk) = gen_both((yyvsp[-2].blk), (yyvsp[0].blk));
-}
-#line 2907 "src/parser.c"
+#line 2675 "src/parser.c"
     break;
 
-  case 30: /* Exp: Exp '+' Exp  */
-#line 413 "src/parser.y"
-            {
+  case 22: /* Expr: Expr '+' Expr  */
+#line 367 "src/parser.y"
+              {
   (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '+');
 }
-#line 2915 "src/parser.c"
+#line 2683 "src/parser.c"
     break;
 
-  case 31: /* Exp: Exp "+=" Exp  */
-#line 417 "src/parser.y"
-             {
+  case 23: /* Expr: Expr "+=" Expr  */
+#line 370 "src/parser.y"
+               {
   (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '+');
 }
-#line 2923 "src/parser.c"
-    break;
-
-  case 32: /* Exp: '-' Exp  */
-#line 421 "src/parser.y"
-        {
-  (yyval.blk) = BLOCK((yyvsp[0].blk), gen_call("_negate", gen_noop()));
-}
-#line 2931 "src/parser.c"
+#line 2691 "src/parser.c"
     break;
 
-  case 33: /* Exp: Exp '-' Exp  */
-#line 425 "src/parser.y"
-            {
+  case 24: /* Expr: Expr '-' Expr  */
+#line 373 "src/parser.y"
+              {
   (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '-');
 }
-#line 2939 "src/parser.c"
+#line 2699 "src/parser.c"
     break;
 
-  case 34: /* Exp: Exp "-=" Exp  */
-#line 429 "src/parser.y"
-             {
+  case 25: /* Expr: Expr "-=" Expr  */
+#line 376 "src/parser.y"
+               {
   (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '-');
 }
-#line 2947 "src/parser.c"
+#line 2707 "src/parser.c"
     break;
 
-  case 35: /* Exp: Exp '*' Exp  */
-#line 433 "src/parser.y"
-            {
+  case 26: /* Expr: Expr '*' Expr  */
+#line 379 "src/parser.y"
+              {
   (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '*');
 }
-#line 2955 "src/parser.c"
+#line 2715 "src/parser.c"
     break;
 
-  case 36: /* Exp: Exp "*=" Exp  */
-#line 437 "src/parser.y"
-             {
+  case 27: /* Expr: Expr "*=" Expr  */
+#line 382 "src/parser.y"
+               {
   (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '*');
 }
-#line 2963 "src/parser.c"
+#line 2723 "src/parser.c"
     break;
 
-  case 37: /* Exp: Exp '/' Exp  */
-#line 441 "src/parser.y"
-            {
+  case 28: /* Expr: Expr '/' Expr  */
+#line 385 "src/parser.y"
+              {
   (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '/');
 }
-#line 2971 "src/parser.c"
+#line 2731 "src/parser.c"
     break;
 
-  case 38: /* Exp: Exp '%' Exp  */
-#line 445 "src/parser.y"
-            {
+  case 29: /* Expr: Expr '%' Expr  */
+#line 388 "src/parser.y"
+              {
   (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '%');
 }
-#line 2979 "src/parser.c"
+#line 2739 "src/parser.c"
     break;
 
-  case 39: /* Exp: Exp "/=" Exp  */
-#line 449 "src/parser.y"
-             {
+  case 30: /* Expr: Expr "/=" Expr  */
+#line 391 "src/parser.y"
+               {
   (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '/');
 }
-#line 2987 "src/parser.c"
+#line 2747 "src/parser.c"
     break;
 
-  case 40: /* Exp: Exp "%=" Exp  */
-#line 453 "src/parser.y"
-               {
+  case 31: /* Expr: Expr "%=" Expr  */
+#line 394 "src/parser.y"
+                 {
   (yyval.blk) = gen_update((yyvsp[-2].blk), (yyvsp[0].blk), '%');
 }
-#line 2995 "src/parser.c"
+#line 2755 "src/parser.c"
     break;
 
-  case 41: /* Exp: Exp "==" Exp  */
-#line 457 "src/parser.y"
-             {
+  case 32: /* Expr: Expr "==" Expr  */
+#line 397 "src/parser.y"
+               {
   (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), EQ);
 }
-#line 3003 "src/parser.c"
+#line 2763 "src/parser.c"
     break;
 
-  case 42: /* Exp: Exp "!=" Exp  */
-#line 461 "src/parser.y"
-             {
+  case 33: /* Expr: Expr "!=" Expr  */
+#line 400 "src/parser.y"
+               {
   (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), NEQ);
 }
-#line 3011 "src/parser.c"
+#line 2771 "src/parser.c"
     break;
 
-  case 43: /* Exp: Exp '<' Exp  */
-#line 465 "src/parser.y"
-            {
+  case 34: /* Expr: Expr '<' Expr  */
+#line 403 "src/parser.y"
+              {
   (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '<');
 }
-#line 3019 "src/parser.c"
+#line 2779 "src/parser.c"
     break;
 
-  case 44: /* Exp: Exp '>' Exp  */
-#line 469 "src/parser.y"
-            {
+  case 35: /* Expr: Expr '>' Expr  */
+#line 406 "src/parser.y"
+              {
   (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), '>');
 }
-#line 3027 "src/parser.c"
+#line 2787 "src/parser.c"
     break;
 
-  case 45: /* Exp: Exp "<=" Exp  */
-#line 473 "src/parser.y"
-             {
+  case 36: /* Expr: Expr "<=" Expr  */
+#line 409 "src/parser.y"
+               {
   (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), LESSEQ);
 }
-#line 3035 "src/parser.c"
+#line 2795 "src/parser.c"
     break;
 
-  case 46: /* Exp: Exp ">=" Exp  */
-#line 477 "src/parser.y"
-             {
+  case 37: /* Expr: Expr ">=" Expr  */
+#line 412 "src/parser.y"
+               {
   (yyval.blk) = gen_binop((yyvsp[-2].blk), (yyvsp[0].blk), GREATEREQ);
 }
-#line 3043 "src/parser.c"
+#line 2803 "src/parser.c"
     break;
 
-  case 47: /* Exp: Term  */
-#line 481 "src/parser.y"
-     {
+  case 38: /* Expr: Term  */
+#line 415 "src/parser.y"
+                  {
   (yyval.blk) = (yyvsp[0].blk);
 }
-#line 3051 "src/parser.c"
+#line 2811 "src/parser.c"
     break;
 
-  case 48: /* Import: ImportWhat ';'  */
-#line 486 "src/parser.y"
+  case 39: /* Import: ImportWhat ';'  */
+#line 421 "src/parser.y"
                {
   (yyval.blk) = (yyvsp[-1].blk);
 }
-#line 3059 "src/parser.c"
+#line 2819 "src/parser.c"
     break;
 
-  case 49: /* Import: ImportWhat Exp ';'  */
-#line 489 "src/parser.y"
-                   {
+  case 40: /* Import: ImportWhat Query ';'  */
+#line 424 "src/parser.y"
+                     {
   if (!block_is_const((yyvsp[-1].blk))) {
-    FAIL((yyloc), "Module metadata must be constant");
+    FAIL((yylsp[-1]), "Module metadata must be constant");
     (yyval.blk) = gen_noop();
     block_free((yyvsp[-2].blk));
     block_free((yyvsp[-1].blk));
   } else if (block_const_kind((yyvsp[-1].blk)) != JV_KIND_OBJECT) {
-    FAIL((yyloc), "Module metadata must be an object");
+    FAIL((yylsp[-1]), "Module metadata must be an object");
     (yyval.blk) = gen_noop();
     block_free((yyvsp[-2].blk));
     block_free((yyvsp[-1].blk));
@@ -3075,11 +2835,11 @@ yyreduce:
     (yyval.blk) = gen_import_meta((yyvsp[-2].blk), (yyvsp[-1].blk));
   }
 }
-#line 3079 "src/parser.c"
+#line 2839 "src/parser.c"
     break;
 
-  case 50: /* ImportWhat: "import" ImportFrom "as" BINDING  */
-#line 506 "src/parser.y"
+  case 41: /* ImportWhat: "import" ImportFrom "as" BINDING  */
+#line 441 "src/parser.y"
                                  {
   jv v = block_const((yyvsp[-2].blk));
   // XXX Make gen_import take only blocks and the int is_data so we
@@ -3089,11 +2849,11 @@ yyreduce:
   jv_free((yyvsp[0].literal));
   jv_free(v);
 }
-#line 3093 "src/parser.c"
+#line 2853 "src/parser.c"
     break;
 
-  case 51: /* ImportWhat: "import" ImportFrom "as" IDENT  */
-#line 515 "src/parser.y"
+  case 42: /* ImportWhat: "import" ImportFrom "as" IDENT  */
+#line 450 "src/parser.y"
                                {
   jv v = block_const((yyvsp[-2].blk));
   (yyval.blk) = gen_import(jv_string_value(v), jv_string_value((yyvsp[0].literal)), 0);
@@ -3101,201 +2861,177 @@ yyreduce:
   jv_free((yyvsp[0].literal));
   jv_free(v);
 }
-#line 3105 "src/parser.c"
+#line 2865 "src/parser.c"
     break;
 
-  case 52: /* ImportWhat: "include" ImportFrom  */
-#line 522 "src/parser.y"
+  case 43: /* ImportWhat: "include" ImportFrom  */
+#line 457 "src/parser.y"
                      {
   jv v = block_const((yyvsp[0].blk));
   (yyval.blk) = gen_import(jv_string_value(v), NULL, 0);
   block_free((yyvsp[0].blk));
   jv_free(v);
 }
-#line 3116 "src/parser.c"
+#line 2876 "src/parser.c"
     break;
 
-  case 53: /* ImportFrom: String  */
-#line 530 "src/parser.y"
+  case 44: /* ImportFrom: String  */
+#line 465 "src/parser.y"
        {
   if (!block_is_const((yyvsp[0].blk))) {
-    FAIL((yyloc), "Import path must be constant");
+    FAIL((yylsp[0]), "Import path must be constant");
     (yyval.blk) = gen_const(jv_string(""));
     block_free((yyvsp[0].blk));
   } else {
     (yyval.blk) = (yyvsp[0].blk);
   }
 }
-#line 3130 "src/parser.c"
+#line 2890 "src/parser.c"
     break;
 
-  case 54: /* FuncDef: "def" IDENT ':' Exp ';'  */
-#line 541 "src/parser.y"
-                        {
+  case 45: /* FuncDef: "def" IDENT ':' Query ';'  */
+#line 476 "src/parser.y"
+                          {
   (yyval.blk) = gen_function(jv_string_value((yyvsp[-3].literal)), gen_noop(), (yyvsp[-1].blk));
   jv_free((yyvsp[-3].literal));
 }
-#line 3139 "src/parser.c"
+#line 2899 "src/parser.c"
     break;
 
-  case 55: /* FuncDef: "def" IDENT '(' Params ')' ':' Exp ';'  */
-#line 546 "src/parser.y"
-                                       {
+  case 46: /* FuncDef: "def" IDENT '(' Params ')' ':' Query ';'  */
+#line 481 "src/parser.y"
+                                         {
   (yyval.blk) = gen_function(jv_string_value((yyvsp[-6].literal)), (yyvsp[-4].blk), (yyvsp[-1].blk));
   jv_free((yyvsp[-6].literal));
 }
-#line 3148 "src/parser.c"
+#line 2908 "src/parser.c"
     break;
 
-  case 56: /* Params: Param  */
-#line 552 "src/parser.y"
+  case 47: /* Params: Param  */
+#line 487 "src/parser.y"
       {
   (yyval.blk) = (yyvsp[0].blk);
 }
-#line 3156 "src/parser.c"
+#line 2916 "src/parser.c"
     break;
 
-  case 57: /* Params: Params ';' Param  */
-#line 555 "src/parser.y"
+  case 48: /* Params: Params ';' Param  */
+#line 490 "src/parser.y"
                  {
   (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 3164 "src/parser.c"
+#line 2924 "src/parser.c"
     break;
 
-  case 58: /* Param: BINDING  */
-#line 560 "src/parser.y"
+  case 49: /* Param: BINDING  */
+#line 495 "src/parser.y"
         {
   (yyval.blk) = gen_param_regular(jv_string_value((yyvsp[0].literal)));
   jv_free((yyvsp[0].literal));
 }
-#line 3173 "src/parser.c"
+#line 2933 "src/parser.c"
     break;
 
-  case 59: /* Param: IDENT  */
-#line 564 "src/parser.y"
+  case 50: /* Param: IDENT  */
+#line 499 "src/parser.y"
       {
   (yyval.blk) = gen_param(jv_string_value((yyvsp[0].literal)));
   jv_free((yyvsp[0].literal));
 }
-#line 3182 "src/parser.c"
+#line 2942 "src/parser.c"
     break;
 
-  case 60: /* StringStart: FORMAT QQSTRING_START  */
-#line 571 "src/parser.y"
+  case 51: /* StringStart: FORMAT QQSTRING_START  */
+#line 506 "src/parser.y"
                       {
   (yyval.literal) = (yyvsp[-1].literal);
 }
-#line 3190 "src/parser.c"
+#line 2950 "src/parser.c"
     break;
 
-  case 61: /* StringStart: QQSTRING_START  */
-#line 574 "src/parser.y"
+  case 52: /* StringStart: QQSTRING_START  */
+#line 509 "src/parser.y"
                {
   (yyval.literal) = jv_string("text");
 }
-#line 3198 "src/parser.c"
+#line 2958 "src/parser.c"
     break;
 
-  case 62: /* String: StringStart QQString QQSTRING_END  */
-#line 580 "src/parser.y"
+  case 53: /* String: StringStart QQString QQSTRING_END  */
+#line 515 "src/parser.y"
                                   {
   (yyval.blk) = (yyvsp[-1].blk);
   jv_free((yyvsp[-2].literal));
 }
-#line 3207 "src/parser.c"
+#line 2967 "src/parser.c"
     break;
 
-  case 63: /* QQString: %empty  */
-#line 587 "src/parser.y"
+  case 54: /* QQString: %empty  */
+#line 522 "src/parser.y"
        {
   (yyval.blk) = gen_const(jv_string(""));
 }
-#line 3215 "src/parser.c"
+#line 2975 "src/parser.c"
     break;
 
-  case 64: /* QQString: QQString QQSTRING_TEXT  */
-#line 590 "src/parser.y"
+  case 55: /* QQString: QQString QQSTRING_TEXT  */
+#line 525 "src/parser.y"
                        {
   (yyval.blk) = gen_binop((yyvsp[-1].blk), gen_const((yyvsp[0].literal)), '+');
 }
-#line 3223 "src/parser.c"
+#line 2983 "src/parser.c"
     break;
 
-  case 65: /* QQString: QQString QQSTRING_INTERP_START Exp QQSTRING_INTERP_END  */
-#line 593 "src/parser.y"
-                                                       {
+  case 56: /* QQString: QQString QQSTRING_INTERP_START Query QQSTRING_INTERP_END  */
+#line 528 "src/parser.y"
+                                                         {
   (yyval.blk) = gen_binop((yyvsp[-3].blk), gen_format((yyvsp[-1].blk), jv_copy((yyvsp[-4].literal))), '+');
 }
-#line 3231 "src/parser.c"
+#line 2991 "src/parser.c"
     break;
 
-  case 66: /* ElseBody: "elif" Exp "then" Exp ElseBody  */
-#line 599 "src/parser.y"
-                               {
+  case 57: /* ElseBody: "elif" Query "then" Query ElseBody  */
+#line 534 "src/parser.y"
+                                   {
   (yyval.blk) = gen_cond((yyvsp[-3].blk), (yyvsp[-1].blk), (yyvsp[0].blk));
 }
-#line 3239 "src/parser.c"
+#line 2999 "src/parser.c"
     break;
 
-  case 67: /* ElseBody: "else" Exp "end"  */
-#line 602 "src/parser.y"
-                 {
+  case 58: /* ElseBody: "else" Query "end"  */
+#line 537 "src/parser.y"
+                   {
   (yyval.blk) = (yyvsp[-1].blk);
 }
-#line 3247 "src/parser.c"
+#line 3007 "src/parser.c"
     break;
 
-  case 68: /* ElseBody: "end"  */
-#line 605 "src/parser.y"
+  case 59: /* ElseBody: "end"  */
+#line 540 "src/parser.y"
       {
   (yyval.blk) = gen_noop();
 }
-#line 3255 "src/parser.c"
-    break;
-
-  case 69: /* ExpD: ExpD '|' ExpD  */
-#line 610 "src/parser.y"
-              {
-  (yyval.blk) = block_join((yyvsp[-2].blk), (yyvsp[0].blk));
-}
-#line 3263 "src/parser.c"
+#line 3015 "src/parser.c"
     break;
 
-  case 70: /* ExpD: '-' ExpD  */
-#line 613 "src/parser.y"
-         {
-  (yyval.blk) = BLOCK((yyvsp[0].blk), gen_call("_negate", gen_noop()));
-}
-#line 3271 "src/parser.c"
-    break;
-
-  case 71: /* ExpD: Term  */
-#line 616 "src/parser.y"
-     {
-  (yyval.blk) = (yyvsp[0].blk);
-}
-#line 3279 "src/parser.c"
-    break;
-
-  case 72: /* Term: '.'  */
-#line 622 "src/parser.y"
+  case 60: /* Term: '.'  */
+#line 546 "src/parser.y"
     {
   (yyval.blk) = gen_noop();
 }
-#line 3287 "src/parser.c"
+#line 3023 "src/parser.c"
     break;
 
-  case 73: /* Term: ".."  */
-#line 625 "src/parser.y"
+  case 61: /* Term: ".."  */
+#line 549 "src/parser.y"
     {
   (yyval.blk) = gen_call("recurse", gen_noop());
 }
-#line 3295 "src/parser.c"
+#line 3031 "src/parser.c"
     break;
 
-  case 74: /* Term: "break" BINDING  */
-#line 628 "src/parser.y"
+  case 62: /* Term: "break" BINDING  */
+#line 552 "src/parser.y"
               {
   jv v = jv_string_fmt("*label-%s", jv_string_value((yyvsp[0].literal)));     // impossible symbol
   (yyval.blk) = gen_location((yyloc), locations,
@@ -3304,301 +3040,383 @@ yyreduce:
   jv_free(v);
   jv_free((yyvsp[0].literal));
 }
-#line 3308 "src/parser.c"
+#line 3044 "src/parser.c"
     break;
 
-  case 75: /* Term: "break" error  */
-#line 636 "src/parser.y"
+  case 63: /* Term: "break" error  */
+#line 560 "src/parser.y"
             {
   FAIL((yyloc), "break requires a label to break to");
   (yyval.blk) = gen_noop();
 }
-#line 3317 "src/parser.c"
+#line 3053 "src/parser.c"
     break;
 
-  case 76: /* Term: Term FIELD '?'  */
-#line 640 "src/parser.y"
+  case 64: /* Term: Term FIELD '?'  */
+#line 564 "src/parser.y"
                {
   (yyval.blk) = gen_index_opt((yyvsp[-2].blk), gen_const((yyvsp[-1].literal)));
 }
-#line 3325 "src/parser.c"
+#line 3061 "src/parser.c"
     break;
 
-  case 77: /* Term: FIELD '?'  */
-#line 643 "src/parser.y"
+  case 65: /* Term: FIELD '?'  */
+#line 567 "src/parser.y"
           {
   (yyval.blk) = gen_index_opt(gen_noop(), gen_const((yyvsp[-1].literal)));
 }
-#line 3333 "src/parser.c"
+#line 3069 "src/parser.c"
     break;
 
-  case 78: /* Term: Term '.' String '?'  */
-#line 646 "src/parser.y"
+  case 66: /* Term: Term '.' String '?'  */
+#line 570 "src/parser.y"
                     {
   (yyval.blk) = gen_index_opt((yyvsp[-3].blk), (yyvsp[-1].blk));
 }
-#line 3341 "src/parser.c"
+#line 3077 "src/parser.c"
     break;
 
-  case 79: /* Term: '.' String '?'  */
-#line 649 "src/parser.y"
+  case 67: /* Term: '.' String '?'  */
+#line 573 "src/parser.y"
                {
   (yyval.blk) = gen_index_opt(gen_noop(), (yyvsp[-1].blk));
 }
-#line 3349 "src/parser.c"
+#line 3085 "src/parser.c"
     break;
 
-  case 80: /* Term: Term FIELD  */
-#line 652 "src/parser.y"
+  case 68: /* Term: Term FIELD  */
+#line 576 "src/parser.y"
                         {
   (yyval.blk) = gen_index((yyvsp[-1].blk), gen_const((yyvsp[0].literal)));
 }
-#line 3357 "src/parser.c"
+#line 3093 "src/parser.c"
     break;
 
-  case 81: /* Term: FIELD  */
-#line 655 "src/parser.y"
+  case 69: /* Term: FIELD  */
+#line 579 "src/parser.y"
                    {
   (yyval.blk) = gen_index(gen_noop(), gen_const((yyvsp[0].literal)));
 }
-#line 3365 "src/parser.c"
+#line 3101 "src/parser.c"
     break;
 
-  case 82: /* Term: Term '.' String  */
-#line 658 "src/parser.y"
+  case 70: /* Term: Term '.' String  */
+#line 582 "src/parser.y"
                              {
   (yyval.blk) = gen_index((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 3373 "src/parser.c"
+#line 3109 "src/parser.c"
     break;
 
-  case 83: /* Term: '.' String  */
-#line 661 "src/parser.y"
+  case 71: /* Term: '.' String  */
+#line 585 "src/parser.y"
                         {
   (yyval.blk) = gen_index(gen_noop(), (yyvsp[0].blk));
 }
-#line 3381 "src/parser.c"
+#line 3117 "src/parser.c"
     break;
 
-  case 84: /* Term: '.' error  */
-#line 664 "src/parser.y"
+  case 72: /* Term: '.' error  */
+#line 588 "src/parser.y"
           {
   FAIL((yyloc), "try .[\"field\"] instead of .field for unusually named fields");
   (yyval.blk) = gen_noop();
 }
-#line 3390 "src/parser.c"
+#line 3126 "src/parser.c"
     break;
 
-  case 85: /* Term: '.' IDENT error  */
-#line 668 "src/parser.y"
+  case 73: /* Term: '.' IDENT error  */
+#line 592 "src/parser.y"
                 {
   jv_free((yyvsp[-1].literal));
   FAIL((yyloc), "try .[\"field\"] instead of .field for unusually named fields");
   (yyval.blk) = gen_noop();
 }
-#line 3400 "src/parser.c"
+#line 3136 "src/parser.c"
     break;
 
-  case 86: /* Term: Term '[' Exp ']' '?'  */
-#line 674 "src/parser.y"
-                     {
+  case 74: /* Term: Term '[' Query ']' '?'  */
+#line 598 "src/parser.y"
+                       {
   (yyval.blk) = gen_index_opt((yyvsp[-4].blk), (yyvsp[-2].blk));
 }
-#line 3408 "src/parser.c"
+#line 3144 "src/parser.c"
     break;
 
-  case 87: /* Term: Term '[' Exp ']'  */
-#line 677 "src/parser.y"
-                              {
+  case 75: /* Term: Term '[' Query ']'  */
+#line 601 "src/parser.y"
+                                {
   (yyval.blk) = gen_index((yyvsp[-3].blk), (yyvsp[-1].blk));
 }
-#line 3416 "src/parser.c"
+#line 3152 "src/parser.c"
     break;
 
-  case 88: /* Term: Term '.' '[' Exp ']' '?'  */
-#line 680 "src/parser.y"
-                         {
+  case 76: /* Term: Term '.' '[' Query ']' '?'  */
+#line 604 "src/parser.y"
+                           {
   (yyval.blk) = gen_index_opt((yyvsp[-5].blk), (yyvsp[-2].blk));
 }
-#line 3424 "src/parser.c"
+#line 3160 "src/parser.c"
     break;
 
-  case 89: /* Term: Term '.' '[' Exp ']'  */
-#line 683 "src/parser.y"
-                                  {
+  case 77: /* Term: Term '.' '[' Query ']'  */
+#line 607 "src/parser.y"
+                                    {
   (yyval.blk) = gen_index((yyvsp[-4].blk), (yyvsp[-1].blk));
 }
-#line 3432 "src/parser.c"
+#line 3168 "src/parser.c"
     break;
 
-  case 90: /* Term: Term '[' ']' '?'  */
-#line 686 "src/parser.y"
+  case 78: /* Term: Term '[' ']' '?'  */
+#line 610 "src/parser.y"
                  {
   (yyval.blk) = block_join((yyvsp[-3].blk), gen_op_simple(EACH_OPT));
 }
-#line 3440 "src/parser.c"
+#line 3176 "src/parser.c"
     break;
 
-  case 91: /* Term: Term '[' ']'  */
-#line 689 "src/parser.y"
+  case 79: /* Term: Term '[' ']'  */
+#line 613 "src/parser.y"
                           {
   (yyval.blk) = block_join((yyvsp[-2].blk), gen_op_simple(EACH));
 }
-#line 3448 "src/parser.c"
+#line 3184 "src/parser.c"
     break;
 
-  case 92: /* Term: Term '.' '[' ']' '?'  */
-#line 692 "src/parser.y"
+  case 80: /* Term: Term '.' '[' ']' '?'  */
+#line 616 "src/parser.y"
                      {
   (yyval.blk) = block_join((yyvsp[-4].blk), gen_op_simple(EACH_OPT));
 }
-#line 3456 "src/parser.c"
+#line 3192 "src/parser.c"
     break;
 
-  case 93: /* Term: Term '.' '[' ']'  */
-#line 695 "src/parser.y"
+  case 81: /* Term: Term '.' '[' ']'  */
+#line 619 "src/parser.y"
                               {
   (yyval.blk) = block_join((yyvsp[-3].blk), gen_op_simple(EACH));
 }
-#line 3464 "src/parser.c"
+#line 3200 "src/parser.c"
     break;
 
-  case 94: /* Term: Term '[' Exp ':' Exp ']' '?'  */
-#line 698 "src/parser.y"
-                             {
+  case 82: /* Term: Term '[' Query ':' Query ']' '?'  */
+#line 622 "src/parser.y"
+                                 {
   (yyval.blk) = gen_slice_index((yyvsp[-6].blk), (yyvsp[-4].blk), (yyvsp[-2].blk), INDEX_OPT);
 }
-#line 3472 "src/parser.c"
+#line 3208 "src/parser.c"
     break;
 
-  case 95: /* Term: Term '[' Exp ':' ']' '?'  */
-#line 701 "src/parser.y"
-                         {
+  case 83: /* Term: Term '[' Query ':' ']' '?'  */
+#line 625 "src/parser.y"
+                           {
   (yyval.blk) = gen_slice_index((yyvsp[-5].blk), (yyvsp[-3].blk), gen_const(jv_null()), INDEX_OPT);
 }
-#line 3480 "src/parser.c"
+#line 3216 "src/parser.c"
     break;
 
-  case 96: /* Term: Term '[' ':' Exp ']' '?'  */
-#line 704 "src/parser.y"
-                         {
+  case 84: /* Term: Term '[' ':' Query ']' '?'  */
+#line 628 "src/parser.y"
+                           {
   (yyval.blk) = gen_slice_index((yyvsp[-5].blk), gen_const(jv_null()), (yyvsp[-2].blk), INDEX_OPT);
 }
-#line 3488 "src/parser.c"
+#line 3224 "src/parser.c"
     break;
 
-  case 97: /* Term: Term '[' Exp ':' Exp ']'  */
-#line 707 "src/parser.y"
-                                      {
+  case 85: /* Term: Term '[' Query ':' Query ']'  */
+#line 631 "src/parser.y"
+                                          {
   (yyval.blk) = gen_slice_index((yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk), INDEX);
 }
-#line 3496 "src/parser.c"
+#line 3232 "src/parser.c"
     break;
 
-  case 98: /* Term: Term '[' Exp ':' ']'  */
-#line 710 "src/parser.y"
-                                  {
+  case 86: /* Term: Term '[' Query ':' ']'  */
+#line 634 "src/parser.y"
+                                    {
   (yyval.blk) = gen_slice_index((yyvsp[-4].blk), (yyvsp[-2].blk), gen_const(jv_null()), INDEX);
 }
-#line 3504 "src/parser.c"
+#line 3240 "src/parser.c"
     break;
 
-  case 99: /* Term: Term '[' ':' Exp ']'  */
-#line 713 "src/parser.y"
-                                  {
+  case 87: /* Term: Term '[' ':' Query ']'  */
+#line 637 "src/parser.y"
+                                    {
   (yyval.blk) = gen_slice_index((yyvsp[-4].blk), gen_const(jv_null()), (yyvsp[-1].blk), INDEX);
 }
-#line 3512 "src/parser.c"
+#line 3248 "src/parser.c"
     break;
 
-  case 100: /* Term: LITERAL  */
-#line 716 "src/parser.y"
+  case 88: /* Term: Term '?'  */
+#line 640 "src/parser.y"
+         {
+  (yyval.blk) = gen_try((yyvsp[-1].blk), gen_op_simple(BACKTRACK));
+}
+#line 3256 "src/parser.c"
+    break;
+
+  case 89: /* Term: LITERAL  */
+#line 643 "src/parser.y"
         {
   (yyval.blk) = gen_const((yyvsp[0].literal));
 }
-#line 3520 "src/parser.c"
+#line 3264 "src/parser.c"
     break;
 
-  case 101: /* Term: String  */
-#line 719 "src/parser.y"
+  case 90: /* Term: String  */
+#line 646 "src/parser.y"
        {
   (yyval.blk) = (yyvsp[0].blk);
 }
-#line 3528 "src/parser.c"
+#line 3272 "src/parser.c"
     break;
 
-  case 102: /* Term: FORMAT  */
-#line 722 "src/parser.y"
+  case 91: /* Term: FORMAT  */
+#line 649 "src/parser.y"
        {
   (yyval.blk) = gen_format(gen_noop(), (yyvsp[0].literal));
 }
-#line 3536 "src/parser.c"
+#line 3280 "src/parser.c"
     break;
 
-  case 103: /* Term: '(' Exp ')'  */
-#line 725 "src/parser.y"
-            {
+  case 92: /* Term: '-' Term  */
+#line 652 "src/parser.y"
+         {
+  (yyval.blk) = BLOCK((yyvsp[0].blk), gen_call("_negate", gen_noop()));
+}
+#line 3288 "src/parser.c"
+    break;
+
+  case 93: /* Term: '(' Query ')'  */
+#line 655 "src/parser.y"
+              {
   (yyval.blk) = (yyvsp[-1].blk);
 }
-#line 3544 "src/parser.c"
+#line 3296 "src/parser.c"
     break;
 
-  case 104: /* Term: '[' Exp ']'  */
-#line 728 "src/parser.y"
-            {
+  case 94: /* Term: '[' Query ']'  */
+#line 658 "src/parser.y"
+              {
   (yyval.blk) = gen_collect((yyvsp[-1].blk));
 }
-#line 3552 "src/parser.c"
+#line 3304 "src/parser.c"
     break;
 
-  case 105: /* Term: '[' ']'  */
-#line 731 "src/parser.y"
+  case 95: /* Term: '[' ']'  */
+#line 661 "src/parser.y"
         {
   (yyval.blk) = gen_const(jv_array());
 }
-#line 3560 "src/parser.c"
+#line 3312 "src/parser.c"
     break;
 
-  case 106: /* Term: '{' MkDict '}'  */
-#line 734 "src/parser.y"
-               {
+  case 96: /* Term: '{' DictPairs '}'  */
+#line 664 "src/parser.y"
+                  {
   block o = gen_const_object((yyvsp[-1].blk));
   if (o.first != NULL)
     (yyval.blk) = o;
   else
     (yyval.blk) = BLOCK(gen_subexp(gen_const(jv_object())), (yyvsp[-1].blk), gen_op_simple(POP));
 }
-#line 3572 "src/parser.c"
+#line 3324 "src/parser.c"
+    break;
+
+  case 97: /* Term: "reduce" Expr "as" Patterns '(' Query ';' Query ')'  */
+#line 671 "src/parser.y"
+                                                    {
+  (yyval.blk) = gen_reduce((yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk));
+}
+#line 3332 "src/parser.c"
+    break;
+
+  case 98: /* Term: "foreach" Expr "as" Patterns '(' Query ';' Query ';' Query ')'  */
+#line 674 "src/parser.y"
+                                                               {
+  (yyval.blk) = gen_foreach((yyvsp[-9].blk), (yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk));
+}
+#line 3340 "src/parser.c"
+    break;
+
+  case 99: /* Term: "foreach" Expr "as" Patterns '(' Query ';' Query ')'  */
+#line 677 "src/parser.y"
+                                                     {
+  (yyval.blk) = gen_foreach((yyvsp[-7].blk), (yyvsp[-5].blk), (yyvsp[-3].blk), (yyvsp[-1].blk), gen_noop());
+}
+#line 3348 "src/parser.c"
+    break;
+
+  case 100: /* Term: "if" Query "then" Query ElseBody  */
+#line 680 "src/parser.y"
+                                 {
+  (yyval.blk) = gen_cond((yyvsp[-3].blk), (yyvsp[-1].blk), (yyvsp[0].blk));
+}
+#line 3356 "src/parser.c"
+    break;
+
+  case 101: /* Term: "if" Query "then" error  */
+#line 683 "src/parser.y"
+                        {
+  FAIL((yyloc), "Possibly unterminated 'if' statement");
+  (yyval.blk) = (yyvsp[-2].blk);
+}
+#line 3365 "src/parser.c"
+    break;
+
+  case 102: /* Term: "try" Expr "catch" Expr  */
+#line 687 "src/parser.y"
+                        {
+  (yyval.blk) = gen_try((yyvsp[-2].blk), (yyvsp[0].blk));
+}
+#line 3373 "src/parser.c"
+    break;
+
+  case 103: /* Term: "try" Expr "catch" error  */
+#line 690 "src/parser.y"
+                         {
+  FAIL((yyloc), "Possibly unterminated 'try' statement");
+  (yyval.blk) = (yyvsp[-2].blk);
+}
+#line 3382 "src/parser.c"
     break;
 
-  case 107: /* Term: '$' '$' '$' BINDING  */
-#line 756 "src/parser.y"
+  case 104: /* Term: "try" Expr  */
+#line 694 "src/parser.y"
+           {
+  (yyval.blk) = gen_try((yyvsp[0].blk), gen_op_simple(BACKTRACK));
+}
+#line 3390 "src/parser.c"
+    break;
+
+  case 105: /* Term: '$' '$' '$' BINDING  */
+#line 712 "src/parser.y"
                     {
   (yyval.blk) = gen_location((yyloc), locations, gen_op_unbound(LOADVN, jv_string_value((yyvsp[0].literal))));
   jv_free((yyvsp[0].literal));
 }
-#line 3581 "src/parser.c"
+#line 3399 "src/parser.c"
     break;
 
-  case 108: /* Term: BINDING  */
-#line 760 "src/parser.y"
+  case 106: /* Term: BINDING  */
+#line 716 "src/parser.y"
         {
   (yyval.blk) = gen_location((yyloc), locations, gen_op_unbound(LOADV, jv_string_value((yyvsp[0].literal))));
   jv_free((yyvsp[0].literal));
 }
-#line 3590 "src/parser.c"
+#line 3408 "src/parser.c"
     break;
 
-  case 109: /* Term: "$__loc__"  */
-#line 764 "src/parser.y"
+  case 107: /* Term: "$__loc__"  */
+#line 720 "src/parser.y"
            {
   (yyval.blk) = gen_loc_object(&(yyloc), locations);
 }
-#line 3598 "src/parser.c"
+#line 3416 "src/parser.c"
     break;
 
-  case 110: /* Term: IDENT  */
-#line 767 "src/parser.y"
+  case 108: /* Term: IDENT  */
+#line 723 "src/parser.y"
       {
   const char *s = jv_string_value((yyvsp[0].literal));
   if (strcmp(s, "false") == 0)
@@ -3611,491 +3429,505 @@ yyreduce:
     (yyval.blk) = gen_location((yyloc), locations, gen_call(s, gen_noop()));
   jv_free((yyvsp[0].literal));
 }
-#line 3615 "src/parser.c"
+#line 3433 "src/parser.c"
     break;
 
-  case 111: /* Term: IDENT '(' Args ')'  */
-#line 779 "src/parser.y"
+  case 109: /* Term: IDENT '(' Args ')'  */
+#line 735 "src/parser.y"
                    {
   (yyval.blk) = gen_call(jv_string_value((yyvsp[-3].literal)), (yyvsp[-1].blk));
   (yyval.blk) = gen_location((yylsp[-3]), locations, (yyval.blk));
   jv_free((yyvsp[-3].literal));
 }
-#line 3625 "src/parser.c"
+#line 3443 "src/parser.c"
     break;
 
-  case 112: /* Term: '(' error ')'  */
-#line 784 "src/parser.y"
+  case 110: /* Term: '(' error ')'  */
+#line 740 "src/parser.y"
               { (yyval.blk) = gen_noop(); }
-#line 3631 "src/parser.c"
+#line 3449 "src/parser.c"
     break;
 
-  case 113: /* Term: '[' error ']'  */
-#line 785 "src/parser.y"
+  case 111: /* Term: '[' error ']'  */
+#line 741 "src/parser.y"
               { (yyval.blk) = gen_noop(); }
-#line 3637 "src/parser.c"
+#line 3455 "src/parser.c"
     break;
 
-  case 114: /* Term: Term '[' error ']'  */
-#line 786 "src/parser.y"
+  case 112: /* Term: Term '[' error ']'  */
+#line 742 "src/parser.y"
                    { (yyval.blk) = (yyvsp[-3].blk); }
-#line 3643 "src/parser.c"
+#line 3461 "src/parser.c"
     break;
 
-  case 115: /* Term: '{' error '}'  */
-#line 787 "src/parser.y"
+  case 113: /* Term: '{' error '}'  */
+#line 743 "src/parser.y"
               { (yyval.blk) = gen_noop(); }
-#line 3649 "src/parser.c"
+#line 3467 "src/parser.c"
     break;
 
-  case 116: /* Args: Arg  */
-#line 790 "src/parser.y"
+  case 114: /* Args: Arg  */
+#line 746 "src/parser.y"
     {
   (yyval.blk) = (yyvsp[0].blk);
 }
-#line 3657 "src/parser.c"
+#line 3475 "src/parser.c"
     break;
 
-  case 117: /* Args: Args ';' Arg  */
-#line 793 "src/parser.y"
+  case 115: /* Args: Args ';' Arg  */
+#line 749 "src/parser.y"
              {
   (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 3665 "src/parser.c"
+#line 3483 "src/parser.c"
     break;
 
-  case 118: /* Arg: Exp  */
-#line 798 "src/parser.y"
-    {
+  case 116: /* Arg: Query  */
+#line 754 "src/parser.y"
+      {
   (yyval.blk) = gen_lambda((yyvsp[0].blk));
 }
-#line 3673 "src/parser.c"
+#line 3491 "src/parser.c"
     break;
 
-  case 119: /* RepPatterns: RepPatterns "?//" Pattern  */
-#line 803 "src/parser.y"
+  case 117: /* RepPatterns: RepPatterns "?//" Pattern  */
+#line 759 "src/parser.y"
                           {
   (yyval.blk) = BLOCK((yyvsp[-2].blk), gen_destructure_alt((yyvsp[0].blk)));
 }
-#line 3681 "src/parser.c"
+#line 3499 "src/parser.c"
     break;
 
-  case 120: /* RepPatterns: Pattern  */
-#line 806 "src/parser.y"
+  case 118: /* RepPatterns: Pattern  */
+#line 762 "src/parser.y"
         {
   (yyval.blk) = gen_destructure_alt((yyvsp[0].blk));
 }
-#line 3689 "src/parser.c"
+#line 3507 "src/parser.c"
     break;
 
-  case 121: /* Patterns: RepPatterns "?//" Pattern  */
-#line 811 "src/parser.y"
+  case 119: /* Patterns: RepPatterns "?//" Pattern  */
+#line 767 "src/parser.y"
                           {
   (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 3697 "src/parser.c"
+#line 3515 "src/parser.c"
     break;
 
-  case 122: /* Patterns: Pattern  */
-#line 814 "src/parser.y"
+  case 120: /* Patterns: Pattern  */
+#line 770 "src/parser.y"
         {
   (yyval.blk) = (yyvsp[0].blk);
 }
-#line 3705 "src/parser.c"
+#line 3523 "src/parser.c"
     break;
 
-  case 123: /* Pattern: BINDING  */
-#line 819 "src/parser.y"
+  case 121: /* Pattern: BINDING  */
+#line 775 "src/parser.y"
         {
   (yyval.blk) = gen_op_unbound(STOREV, jv_string_value((yyvsp[0].literal)));
   jv_free((yyvsp[0].literal));
 }
-#line 3714 "src/parser.c"
+#line 3532 "src/parser.c"
     break;
 
-  case 124: /* Pattern: '[' ArrayPats ']'  */
-#line 823 "src/parser.y"
+  case 122: /* Pattern: '[' ArrayPats ']'  */
+#line 779 "src/parser.y"
                   {
   (yyval.blk) = BLOCK((yyvsp[-1].blk), gen_op_simple(POP));
 }
-#line 3722 "src/parser.c"
+#line 3540 "src/parser.c"
     break;
 
-  case 125: /* Pattern: '{' ObjPats '}'  */
-#line 826 "src/parser.y"
+  case 123: /* Pattern: '{' ObjPats '}'  */
+#line 782 "src/parser.y"
                 {
   (yyval.blk) = BLOCK((yyvsp[-1].blk), gen_op_simple(POP));
 }
-#line 3730 "src/parser.c"
+#line 3548 "src/parser.c"
     break;
 
-  case 126: /* ArrayPats: Pattern  */
-#line 831 "src/parser.y"
+  case 124: /* ArrayPats: Pattern  */
+#line 787 "src/parser.y"
         {
   (yyval.blk) = gen_array_matcher(gen_noop(), (yyvsp[0].blk));
 }
-#line 3738 "src/parser.c"
+#line 3556 "src/parser.c"
     break;
 
-  case 127: /* ArrayPats: ArrayPats ',' Pattern  */
-#line 834 "src/parser.y"
+  case 125: /* ArrayPats: ArrayPats ',' Pattern  */
+#line 790 "src/parser.y"
                       {
   (yyval.blk) = gen_array_matcher((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 3746 "src/parser.c"
+#line 3564 "src/parser.c"
     break;
 
-  case 128: /* ObjPats: ObjPat  */
-#line 839 "src/parser.y"
+  case 126: /* ObjPats: ObjPat  */
+#line 795 "src/parser.y"
        {
   (yyval.blk) = (yyvsp[0].blk);
 }
-#line 3754 "src/parser.c"
+#line 3572 "src/parser.c"
     break;
 
-  case 129: /* ObjPats: ObjPats ',' ObjPat  */
-#line 842 "src/parser.y"
+  case 127: /* ObjPats: ObjPats ',' ObjPat  */
+#line 798 "src/parser.y"
                    {
   (yyval.blk) = BLOCK((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 3762 "src/parser.c"
+#line 3580 "src/parser.c"
     break;
 
-  case 130: /* ObjPat: BINDING  */
-#line 847 "src/parser.y"
+  case 128: /* ObjPat: BINDING  */
+#line 803 "src/parser.y"
         {
   (yyval.blk) = gen_object_matcher(gen_const((yyvsp[0].literal)), gen_op_unbound(STOREV, jv_string_value((yyvsp[0].literal))));
 }
-#line 3770 "src/parser.c"
+#line 3588 "src/parser.c"
     break;
 
-  case 131: /* ObjPat: BINDING ':' Pattern  */
-#line 850 "src/parser.y"
+  case 129: /* ObjPat: BINDING ':' Pattern  */
+#line 806 "src/parser.y"
                     {
   (yyval.blk) = gen_object_matcher(gen_const((yyvsp[-2].literal)), BLOCK(gen_op_simple(DUP), gen_op_unbound(STOREV, jv_string_value((yyvsp[-2].literal))), (yyvsp[0].blk)));
 }
-#line 3778 "src/parser.c"
+#line 3596 "src/parser.c"
     break;
 
-  case 132: /* ObjPat: IDENT ':' Pattern  */
-#line 853 "src/parser.y"
+  case 130: /* ObjPat: IDENT ':' Pattern  */
+#line 809 "src/parser.y"
                   {
   (yyval.blk) = gen_object_matcher(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk));
 }
-#line 3786 "src/parser.c"
+#line 3604 "src/parser.c"
     break;
 
-  case 133: /* ObjPat: Keyword ':' Pattern  */
-#line 856 "src/parser.y"
+  case 131: /* ObjPat: Keyword ':' Pattern  */
+#line 812 "src/parser.y"
                     {
   (yyval.blk) = gen_object_matcher(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk));
 }
-#line 3794 "src/parser.c"
+#line 3612 "src/parser.c"
     break;
 
-  case 134: /* ObjPat: String ':' Pattern  */
-#line 859 "src/parser.y"
+  case 132: /* ObjPat: String ':' Pattern  */
+#line 815 "src/parser.y"
                    {
   (yyval.blk) = gen_object_matcher((yyvsp[-2].blk), (yyvsp[0].blk));
 }
-#line 3802 "src/parser.c"
+#line 3620 "src/parser.c"
     break;
 
-  case 135: /* ObjPat: '(' Exp ')' ':' Pattern  */
-#line 862 "src/parser.y"
-                        {
+  case 133: /* ObjPat: '(' Query ')' ':' Pattern  */
+#line 818 "src/parser.y"
+                          {
   jv msg = check_object_key((yyvsp[-3].blk));
   if (jv_is_valid(msg)) {
-    FAIL((yyloc), jv_string_value(msg));
+    FAIL((yylsp[-3]), jv_string_value(msg));
   }
   jv_free(msg);
   (yyval.blk) = gen_object_matcher((yyvsp[-3].blk), (yyvsp[0].blk));
 }
-#line 3815 "src/parser.c"
+#line 3633 "src/parser.c"
     break;
 
-  case 136: /* ObjPat: error ':' Pattern  */
-#line 870 "src/parser.y"
+  case 134: /* ObjPat: error ':' Pattern  */
+#line 826 "src/parser.y"
                   {
   FAIL((yyloc), "May need parentheses around object key expression");
   (yyval.blk) = (yyvsp[0].blk);
 }
-#line 3824 "src/parser.c"
+#line 3642 "src/parser.c"
     break;
 
-  case 137: /* Keyword: "as"  */
-#line 876 "src/parser.y"
+  case 135: /* Keyword: "as"  */
+#line 832 "src/parser.y"
      {
   (yyval.literal) = jv_string("as");
 }
-#line 3832 "src/parser.c"
+#line 3650 "src/parser.c"
     break;
 
-  case 138: /* Keyword: "def"  */
-#line 879 "src/parser.y"
+  case 136: /* Keyword: "def"  */
+#line 835 "src/parser.y"
       {
   (yyval.literal) = jv_string("def");
 }
-#line 3840 "src/parser.c"
+#line 3658 "src/parser.c"
     break;
 
-  case 139: /* Keyword: "module"  */
-#line 882 "src/parser.y"
+  case 137: /* Keyword: "module"  */
+#line 838 "src/parser.y"
          {
   (yyval.literal) = jv_string("module");
 }
-#line 3848 "src/parser.c"
+#line 3666 "src/parser.c"
     break;
 
-  case 140: /* Keyword: "import"  */
-#line 885 "src/parser.y"
+  case 138: /* Keyword: "import"  */
+#line 841 "src/parser.y"
          {
   (yyval.literal) = jv_string("import");
 }
-#line 3856 "src/parser.c"
+#line 3674 "src/parser.c"
     break;
 
-  case 141: /* Keyword: "include"  */
-#line 888 "src/parser.y"
+  case 139: /* Keyword: "include"  */
+#line 844 "src/parser.y"
           {
   (yyval.literal) = jv_string("include");
 }
-#line 3864 "src/parser.c"
+#line 3682 "src/parser.c"
     break;
 
-  case 142: /* Keyword: "if"  */
-#line 891 "src/parser.y"
+  case 140: /* Keyword: "if"  */
+#line 847 "src/parser.y"
      {
   (yyval.literal) = jv_string("if");
 }
-#line 3872 "src/parser.c"
+#line 3690 "src/parser.c"
     break;
 
-  case 143: /* Keyword: "then"  */
-#line 894 "src/parser.y"
+  case 141: /* Keyword: "then"  */
+#line 850 "src/parser.y"
        {
   (yyval.literal) = jv_string("then");
 }
-#line 3880 "src/parser.c"
+#line 3698 "src/parser.c"
     break;
 
-  case 144: /* Keyword: "else"  */
-#line 897 "src/parser.y"
+  case 142: /* Keyword: "else"  */
+#line 853 "src/parser.y"
        {
   (yyval.literal) = jv_string("else");
 }
-#line 3888 "src/parser.c"
+#line 3706 "src/parser.c"
     break;
 
-  case 145: /* Keyword: "elif"  */
-#line 900 "src/parser.y"
+  case 143: /* Keyword: "elif"  */
+#line 856 "src/parser.y"
        {
   (yyval.literal) = jv_string("elif");
 }
-#line 3896 "src/parser.c"
+#line 3714 "src/parser.c"
     break;
 
-  case 146: /* Keyword: "reduce"  */
-#line 903 "src/parser.y"
+  case 144: /* Keyword: "reduce"  */
+#line 859 "src/parser.y"
          {
   (yyval.literal) = jv_string("reduce");
 }
-#line 3904 "src/parser.c"
+#line 3722 "src/parser.c"
     break;
 
-  case 147: /* Keyword: "foreach"  */
-#line 906 "src/parser.y"
+  case 145: /* Keyword: "foreach"  */
+#line 862 "src/parser.y"
           {
   (yyval.literal) = jv_string("foreach");
 }
-#line 3912 "src/parser.c"
+#line 3730 "src/parser.c"
     break;
 
-  case 148: /* Keyword: "end"  */
-#line 909 "src/parser.y"
+  case 146: /* Keyword: "end"  */
+#line 865 "src/parser.y"
       {
   (yyval.literal) = jv_string("end");
 }
-#line 3920 "src/parser.c"
+#line 3738 "src/parser.c"
     break;
 
-  case 149: /* Keyword: "and"  */
-#line 912 "src/parser.y"
+  case 147: /* Keyword: "and"  */
+#line 868 "src/parser.y"
       {
   (yyval.literal) = jv_string("and");
 }
-#line 3928 "src/parser.c"
+#line 3746 "src/parser.c"
     break;
 
-  case 150: /* Keyword: "or"  */
-#line 915 "src/parser.y"
+  case 148: /* Keyword: "or"  */
+#line 871 "src/parser.y"
      {
   (yyval.literal) = jv_string("or");
 }
-#line 3936 "src/parser.c"
+#line 3754 "src/parser.c"
     break;
 
-  case 151: /* Keyword: "try"  */
-#line 918 "src/parser.y"
+  case 149: /* Keyword: "try"  */
+#line 874 "src/parser.y"
       {
   (yyval.literal) = jv_string("try");
 }
-#line 3944 "src/parser.c"
+#line 3762 "src/parser.c"
     break;
 
-  case 152: /* Keyword: "catch"  */
-#line 921 "src/parser.y"
+  case 150: /* Keyword: "catch"  */
+#line 877 "src/parser.y"
         {
   (yyval.literal) = jv_string("catch");
 }
-#line 3952 "src/parser.c"
+#line 3770 "src/parser.c"
     break;
 
-  case 153: /* Keyword: "label"  */
-#line 924 "src/parser.y"
+  case 151: /* Keyword: "label"  */
+#line 880 "src/parser.y"
         {
   (yyval.literal) = jv_string("label");
 }
-#line 3960 "src/parser.c"
+#line 3778 "src/parser.c"
     break;
 
-  case 154: /* Keyword: "break"  */
-#line 927 "src/parser.y"
+  case 152: /* Keyword: "break"  */
+#line 883 "src/parser.y"
         {
   (yyval.literal) = jv_string("break");
 }
-#line 3968 "src/parser.c"
+#line 3786 "src/parser.c"
     break;
 
-  case 155: /* MkDict: %empty  */
-#line 932 "src/parser.y"
+  case 153: /* DictPairs: %empty  */
+#line 889 "src/parser.y"
        {
-  (yyval.blk)=gen_noop();
+  (yyval.blk) = gen_noop();
 }
-#line 3976 "src/parser.c"
-    break;
-
-  case 156: /* MkDict: MkDictPair  */
-#line 935 "src/parser.y"
-            { (yyval.blk) = (yyvsp[0].blk); }
-#line 3982 "src/parser.c"
+#line 3794 "src/parser.c"
     break;
 
-  case 157: /* MkDict: MkDictPair ',' MkDict  */
-#line 936 "src/parser.y"
-                        { (yyval.blk)=block_join((yyvsp[-2].blk), (yyvsp[0].blk)); }
-#line 3988 "src/parser.c"
+  case 154: /* DictPairs: DictPair  */
+#line 892 "src/parser.y"
+         {
+  (yyval.blk) = (yyvsp[0].blk);
+}
+#line 3802 "src/parser.c"
     break;
 
-  case 158: /* MkDict: error ',' MkDict  */
-#line 937 "src/parser.y"
-                   { (yyval.blk) = (yyvsp[0].blk); }
-#line 3994 "src/parser.c"
+  case 155: /* DictPairs: DictPair ',' DictPairs  */
+#line 895 "src/parser.y"
+                       {
+  (yyval.blk) = block_join((yyvsp[-2].blk), (yyvsp[0].blk));
+}
+#line 3810 "src/parser.c"
     break;
 
-  case 159: /* MkDictPair: IDENT ':' ExpD  */
-#line 940 "src/parser.y"
-               {
+  case 156: /* DictPair: IDENT ':' DictExpr  */
+#line 900 "src/parser.y"
+                   {
   (yyval.blk) = gen_dictpair(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk));
- }
-#line 4002 "src/parser.c"
+}
+#line 3818 "src/parser.c"
     break;
 
-  case 160: /* MkDictPair: Keyword ':' ExpD  */
-#line 943 "src/parser.y"
-                   {
+  case 157: /* DictPair: Keyword ':' DictExpr  */
+#line 903 "src/parser.y"
+                     {
   (yyval.blk) = gen_dictpair(gen_const((yyvsp[-2].literal)), (yyvsp[0].blk));
-  }
-#line 4010 "src/parser.c"
+}
+#line 3826 "src/parser.c"
     break;
 
-  case 161: /* MkDictPair: String ':' ExpD  */
-#line 946 "src/parser.y"
-                  {
+  case 158: /* DictPair: String ':' DictExpr  */
+#line 906 "src/parser.y"
+                    {
   (yyval.blk) = gen_dictpair((yyvsp[-2].blk), (yyvsp[0].blk));
-  }
-#line 4018 "src/parser.c"
+}
+#line 3834 "src/parser.c"
     break;
 
-  case 162: /* MkDictPair: String  */
-#line 949 "src/parser.y"
-         {
+  case 159: /* DictPair: String  */
+#line 909 "src/parser.y"
+       {
   (yyval.blk) = gen_dictpair((yyvsp[0].blk), BLOCK(gen_op_simple(POP), gen_op_simple(DUP2),
                               gen_op_simple(DUP2), gen_op_simple(INDEX)));
-  }
-#line 4027 "src/parser.c"
+}
+#line 3843 "src/parser.c"
     break;
 
-  case 163: /* MkDictPair: BINDING ':' ExpD  */
-#line 953 "src/parser.y"
-                   {
+  case 160: /* DictPair: BINDING ':' DictExpr  */
+#line 913 "src/parser.y"
+                     {
   (yyval.blk) = gen_dictpair(gen_location((yyloc), locations, gen_op_unbound(LOADV, jv_string_value((yyvsp[-2].literal)))),
                     (yyvsp[0].blk));
   jv_free((yyvsp[-2].literal));
-  }
-#line 4037 "src/parser.c"
+}
+#line 3853 "src/parser.c"
     break;
 
-  case 164: /* MkDictPair: BINDING  */
-#line 958 "src/parser.y"
-          {
+  case 161: /* DictPair: BINDING  */
+#line 918 "src/parser.y"
+        {
   (yyval.blk) = gen_dictpair(gen_const((yyvsp[0].literal)),
                     gen_location((yyloc), locations, gen_op_unbound(LOADV, jv_string_value((yyvsp[0].literal)))));
-  }
-#line 4046 "src/parser.c"
+}
+#line 3862 "src/parser.c"
     break;
 
-  case 165: /* MkDictPair: IDENT  */
-#line 962 "src/parser.y"
-        {
+  case 162: /* DictPair: IDENT  */
+#line 922 "src/parser.y"
+      {
   (yyval.blk) = gen_dictpair(gen_const(jv_copy((yyvsp[0].literal))),
                     gen_index(gen_noop(), gen_const((yyvsp[0].literal))));
-  }
-#line 4055 "src/parser.c"
+}
+#line 3871 "src/parser.c"
     break;
 
-  case 166: /* MkDictPair: "$__loc__"  */
-#line 966 "src/parser.y"
-             {
+  case 163: /* DictPair: "$__loc__"  */
+#line 926 "src/parser.y"
+           {
   (yyval.blk) = gen_dictpair(gen_const(jv_string("__loc__")),
                     gen_loc_object(&(yyloc), locations));
-  }
-#line 4064 "src/parser.c"
+}
+#line 3880 "src/parser.c"
     break;
 
-  case 167: /* MkDictPair: Keyword  */
-#line 970 "src/parser.y"
-          {
+  case 164: /* DictPair: Keyword  */
+#line 930 "src/parser.y"
+        {
   (yyval.blk) = gen_dictpair(gen_const(jv_copy((yyvsp[0].literal))),
                     gen_index(gen_noop(), gen_const((yyvsp[0].literal))));
-  }
-#line 4073 "src/parser.c"
+}
+#line 3889 "src/parser.c"
     break;
 
-  case 168: /* MkDictPair: '(' Exp ')' ':' ExpD  */
-#line 974 "src/parser.y"
-                       {
+  case 165: /* DictPair: '(' Query ')' ':' DictExpr  */
+#line 934 "src/parser.y"
+                           {
   jv msg = check_object_key((yyvsp[-3].blk));
   if (jv_is_valid(msg)) {
-    FAIL((yyloc), jv_string_value(msg));
+    FAIL((yylsp[-3]), jv_string_value(msg));
   }
   jv_free(msg);
   (yyval.blk) = gen_dictpair((yyvsp[-3].blk), (yyvsp[0].blk));
-  }
-#line 4086 "src/parser.c"
+}
+#line 3902 "src/parser.c"
     break;
 
-  case 169: /* MkDictPair: error ':' ExpD  */
-#line 982 "src/parser.y"
-                 {
-  FAIL((yyloc), "May need parentheses around object key expression");
+  case 166: /* DictPair: error ':' DictExpr  */
+#line 942 "src/parser.y"
+                   {
+  FAIL((yylsp[-2]), "May need parentheses around object key expression");
   (yyval.blk) = (yyvsp[0].blk);
-  }
-#line 4095 "src/parser.c"
+}
+#line 3911 "src/parser.c"
+    break;
+
+  case 167: /* DictExpr: DictExpr '|' DictExpr  */
+#line 948 "src/parser.y"
+                      {
+  (yyval.blk) = block_join((yyvsp[-2].blk), (yyvsp[0].blk));
+}
+#line 3919 "src/parser.c"
+    break;
+
+  case 168: /* DictExpr: Expr  */
+#line 951 "src/parser.y"
+     {
+  (yyval.blk) = (yyvsp[0].blk);
+}
+#line 3927 "src/parser.c"
     break;
 
 
-#line 4099 "src/parser.c"
+#line 3931 "src/parser.c"
 
       default: break;
     }
@@ -4324,7 +4156,7 @@ yyreturnlab:
   return yyresult;
 }
 
-#line 986 "src/parser.y"
+#line 954 "src/parser.y"
 
 
 int jq_parse(struct locfile* locations, block* answer) {