ndtypes 0.2.0dev5 → 0.2.0dev6

data/ext/ruby_ndtypes/ndtypes/libndtypes/equal.c

@@ -122,7 +122,27 @@ record_fields_equal(const ndt_t *t, const ndt_t *u, int64_t shape)
 }
 
 static int
-categorical_equal(ndt_value_t *t, ndt_value_t *u, int64_t shape)
+union_fields_equal(const ndt_t *t, const ndt_t *u, int64_t ntags)
+{
+    int64_t i;
+
+    assert(t->tag == Union && u->tag == Union);
+
+    for (i = 0; i < ntags; i++) {
+        if (strcmp(t->Union.tags[i], u->Union.tags[i]) != 0) {
+            return 0;
+        }
+
+        if (!ndt_equal(t->Union.types[i], u->Union.types[i])) {
+            return 0;
+        }
+    }
+
+    return 1;
+}
+
+static int
+categorical_equal(const ndt_value_t *t, const ndt_value_t *u, int64_t shape)
 {
     int64_t i;
 
@@ -135,6 +155,24 @@ categorical_equal(ndt_value_t *t, ndt_value_t *u, int64_t shape)
     return 1;
 }
 
+static int
+offsets_equal(const ndt_offsets_t *x, const ndt_offsets_t *y)
+{
+    if (x == NULL) {
+        return y == NULL;
+    }
+    if (y == NULL) {
+        return x == NULL;
+    }
+
+    if (x->n != y->n) {
+        return 0;
+    }
+
+    return memcmp(x->v, y->v, x->n * (sizeof *x->v)) == 0;
+}
+
+
 int
 ndt_equal(const ndt_t *t, const ndt_t *u)
 {
@@ -166,20 +204,26 @@ ndt_equal(const ndt_t *t, const ndt_t *u)
                ndt_equal(t->FixedDim.type, u->FixedDim.type);
     }
 
+    case VarDimElem:
+        if (t->VarDimElem.index != u->VarDimElem.index) {
+            return 0;
+        }
+        /* fall through */
     case VarDim: {
         if (t->Concrete.VarDim.itemsize != u->Concrete.VarDim.itemsize ||
-            t->Concrete.VarDim.noffsets != u->Concrete.VarDim.noffsets ||
             t->Concrete.VarDim.nslices != u->Concrete.VarDim.nslices) {
             return 0;
         }
 
-        if (memcmp(t->Concrete.VarDim.offsets, u->Concrete.VarDim.offsets,
-                   t->Concrete.VarDim.noffsets * (sizeof *t->Concrete.VarDim.offsets)) ||
-            memcmp(t->Concrete.VarDim.slices, u->Concrete.VarDim.slices,
+        if (memcmp(t->Concrete.VarDim.slices, u->Concrete.VarDim.slices,
                    t->Concrete.VarDim.nslices * (sizeof *t->Concrete.VarDim.slices))) {
             return 0;
         }
 
+        if (!offsets_equal(t->Concrete.VarDim.offsets, u->Concrete.VarDim.offsets)) {
+            return 0;
+        }
+
         return ndt_equal(t->VarDim.type, u->VarDim.type);
     }
 
@@ -206,6 +250,14 @@ ndt_equal(const ndt_t *t, const ndt_t *u)
         return ndt_equal(t->EllipsisDim.type, u->EllipsisDim.type);
     }
 
+    case Array: {
+        if (t->Array.itemsize != u->Array.itemsize) {
+            return 0;
+        }
+
+        return ndt_equal(t->Array.type, u->Array.type);
+    }
+
     case Tuple: {
         if (t->Tuple.flag != u->Tuple.flag ||
             t->Tuple.shape != u->Tuple.shape) {
@@ -224,6 +276,14 @@ ndt_equal(const ndt_t *t, const ndt_t *u)
         return record_fields_equal(t, u, t->Record.shape);
     }
 
+    case Union: {
+        if (t->Union.ntags != u->Union.ntags) {
+            return 0;
+        }
+
+        return union_fields_equal(t, u, t->Union.ntags);
+    }
+
     case Ref: {
         return ndt_equal(t->Ref.type, u->Ref.type);
     }
@@ -277,8 +337,8 @@ ndt_equal(const ndt_t *t, const ndt_t *u)
     case Bool:
     case Int8: case Int16: case Int32: case Int64:
     case Uint8: case Uint16: case Uint32: case Uint64:
-    case Float16: case Float32: case Float64:
-    case Complex32: case Complex64: case Complex128:
+    case BFloat16: case Float16: case Float32: case Float64:
+    case BComplex32: case Complex32: case Complex64: case Complex128:
     case String:
         return 1;
     }

data/ext/ruby_ndtypes/ndtypes/libndtypes/grammar.c

@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
+/* A Bison parser, made by GNU Bison 3.3.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -40,11 +41,14 @@
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
+/* Undocumented macros, especially those whose name start with YY_,
+   are private implementation details.  Do not rely on them.  */
+
 /* Identify Bison output.  */
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.4"
+#define YYBISON_VERSION "3.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -67,8 +71,8 @@
 #define yynerrs         ndt_yynerrs
 
 
-/* Copy the first part of user declarations.  */
-#line 1 "grammar.y" /* yacc.c:339  */
+/* First part of user prologue.  */
+#line 1 "grammar.y" /* yacc.c:337  */
 
 /*
  * BSD 3-Clause License
@@ -107,12 +111,11 @@
 
 
 void
-yyerror(YYLTYPE *loc, yyscan_t scanner, ndt_t **ast, ndt_meta_t *meta,
-        ndt_context_t *ctx, const char *msg)
+yyerror(YYLTYPE *loc, yyscan_t scanner, const ndt_t **ast, ndt_context_t *ctx,
+        const char *msg)
 {
     (void)scanner;
     (void)ast;
-    (void)meta;
 
     ndt_err_format(ctx, NDT_ParseError, "%d:%d: %s", loc->first_line,
                    loc->first_column, msg);
@@ -124,13 +127,16 @@ yylex(YYSTYPE *val, YYLTYPE *loc, yyscan_t scanner, ndt_context_t *ctx)
     return ndt_yylexfunc(val, loc, scanner, ctx);
 }
 
-#line 128 "grammar.c" /* yacc.c:339  */
-
+#line 131 "grammar.c" /* yacc.c:337  */
 # ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
+#  if defined __cplusplus
+#   if 201103L <= __cplusplus
+#    define YY_NULLPTR nullptr
+#   else
+#    define YY_NULLPTR 0
+#   endif
 #  else
-#   define YY_NULLPTR 0
+#   define YY_NULLPTR ((void*)0)
 #  endif
 # endif
 
@@ -154,7 +160,7 @@ yylex(YYSTYPE *val, YYLTYPE *loc, yyscan_t scanner, ndt_context_t *ctx)
 extern int ndt_yydebug;
 #endif
 /* "%code requires" blocks.  */
-#line 57 "grammar.y" /* yacc.c:355  */
+#line 56 "grammar.y" /* yacc.c:352  */
 
   #include "ndtypes.h"
   #include "seq.h"
@@ -163,7 +169,7 @@ extern int ndt_yydebug;
   #define YY_TYPEDEF_YY_SCANNER_T
   typedef void * yyscan_t;
 
-#line 167 "grammar.c" /* yacc.c:355  */
+#line 173 "grammar.c" /* yacc.c:352  */
 
 /* Token type.  */
 #ifndef YYTOKENTYPE
@@ -186,53 +192,58 @@ extern int ndt_yydebug;
     UINT32 = 270,
     UINT64 = 271,
     FLOAT_KIND = 272,
-    FLOAT16 = 273,
-    FLOAT32 = 274,
-    FLOAT64 = 275,
-    COMPLEX_KIND = 276,
-    COMPLEX32 = 277,
-    COMPLEX64 = 278,
-    COMPLEX128 = 279,
-    CATEGORICAL = 280,
-    NA = 281,
-    INTPTR = 282,
-    UINTPTR = 283,
-    SIZE = 284,
-    CHAR = 285,
-    STRING = 286,
-    FIXED_STRING_KIND = 287,
-    FIXED_STRING = 288,
-    BYTES = 289,
-    FIXED_BYTES_KIND = 290,
-    FIXED_BYTES = 291,
-    REF = 292,
-    FIXED = 293,
-    VAR = 294,
-    COMMA = 295,
-    COLON = 296,
-    LPAREN = 297,
-    RPAREN = 298,
-    LBRACE = 299,
-    RBRACE = 300,
-    LBRACK = 301,
-    RBRACK = 302,
-    STAR = 303,
-    ELLIPSIS = 304,
-    RARROW = 305,
-    EQUAL = 306,
-    LESS = 307,
-    GREATER = 308,
-    QUESTIONMARK = 309,
-    BANG = 310,
-    AMPERSAND = 311,
-    BAR = 312,
-    ERRTOKEN = 313,
-    INTEGER = 314,
-    FLOATNUMBER = 315,
-    STRINGLIT = 316,
-    NAME_LOWER = 317,
-    NAME_UPPER = 318,
-    NAME_OTHER = 319
+    BFLOAT16 = 273,
+    FLOAT16 = 274,
+    FLOAT32 = 275,
+    FLOAT64 = 276,
+    COMPLEX_KIND = 277,
+    BCOMPLEX32 = 278,
+    COMPLEX32 = 279,
+    COMPLEX64 = 280,
+    COMPLEX128 = 281,
+    CATEGORICAL = 282,
+    NA = 283,
+    INTPTR = 284,
+    UINTPTR = 285,
+    SIZE = 286,
+    CHAR = 287,
+    STRING = 288,
+    FIXED_STRING_KIND = 289,
+    FIXED_STRING = 290,
+    BYTES = 291,
+    FIXED_BYTES_KIND = 292,
+    FIXED_BYTES = 293,
+    REF = 294,
+    FIXED = 295,
+    VAR = 296,
+    ARRAY = 297,
+    OF = 298,
+    COMMA = 299,
+    COLON = 300,
+    LPAREN = 301,
+    RPAREN = 302,
+    LBRACE = 303,
+    RBRACE = 304,
+    LBRACK = 305,
+    RBRACK = 306,
+    STAR = 307,
+    ELLIPSIS = 308,
+    RARROW = 309,
+    EQUAL = 310,
+    LESS = 311,
+    GREATER = 312,
+    QUESTIONMARK = 313,
+    BANG = 314,
+    AMPERSAND = 315,
+    BAR = 316,
+    ERRTOKEN = 317,
+    INTEGER = 318,
+    FLOATNUMBER = 319,
+    STRINGLIT = 320,
+    NAME_LOWER = 321,
+    NAME_UPPER = 322,
+    NAME_OTHER = 323,
+    BELOW_BAR = 324
   };
 #endif
 
@@ -241,9 +252,11 @@ extern int ndt_yydebug;
 
 union YYSTYPE
 {
-#line 86 "grammar.y" /* yacc.c:355  */
+#line 85 "grammar.y" /* yacc.c:352  */
 
-    ndt_t *ndt;
+    const ndt_t *ndt;
+    enum ndt tag;
+    enum ndt_alias alias;
     ndt_field_t *field;
     ndt_field_seq_t *field_seq;
     ndt_value_t *typed_value;
@@ -257,7 +270,7 @@ union YYSTYPE
     ndt_string_seq_t *string_seq;
     ndt_type_seq_t *type_seq;
 
-#line 261 "grammar.c" /* yacc.c:355  */
+#line 274 "grammar.c" /* yacc.c:352  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -281,21 +294,19 @@ struct YYLTYPE
 
 
 
-int ndt_yyparse (yyscan_t scanner, ndt_t **ast, ndt_meta_t *meta, ndt_context_t *ctx);
+int ndt_yyparse (yyscan_t scanner, const ndt_t **ast, ndt_context_t *ctx);
 /* "%code provides" blocks.  */
-#line 66 "grammar.y" /* yacc.c:355  */
+#line 65 "grammar.y" /* yacc.c:352  */
 
   #define YY_DECL extern int ndt_yylexfunc(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner, ndt_context_t *ctx)
   extern int ndt_yylexfunc(YYSTYPE *, YYLTYPE *, yyscan_t, ndt_context_t *);
-  void yyerror(YYLTYPE *loc, yyscan_t scanner, ndt_t **ast, ndt_meta_t *meta, ndt_context_t *ctx, const char *msg);
+  void yyerror(YYLTYPE *loc, yyscan_t scanner, const ndt_t **ast, ndt_context_t *ctx, const char *msg);
 
-#line 293 "grammar.c" /* yacc.c:355  */
+#line 306 "grammar.c" /* yacc.c:352  */
 
 #endif /* !YY_NDT_YY_GRAMMAR_H_INCLUDED  */
 
-/* Copy the second part of user declarations.  */
 
-#line 299 "grammar.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -316,13 +327,13 @@ typedef signed char yytype_int8;
 #ifdef YYTYPE_UINT16
 typedef YYTYPE_UINT16 yytype_uint16;
 #else
-typedef unsigned short int yytype_uint16;
+typedef unsigned short yytype_uint16;
 #endif
 
 #ifdef YYTYPE_INT16
 typedef YYTYPE_INT16 yytype_int16;
 #else
-typedef short int yytype_int16;
+typedef short yytype_int16;
 #endif
 
 #ifndef YYSIZE_T
@@ -334,7 +345,7 @@ typedef short int yytype_int16;
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
-#  define YYSIZE_T unsigned int
+#  define YYSIZE_T unsigned
 # endif
 #endif
 
@@ -370,15 +381,6 @@ typedef short int yytype_int16;
 # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
 #endif
 
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
-#endif
-
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
 # define YYUSE(E) ((void) (E))
@@ -386,7 +388,7 @@ typedef short int yytype_int16;
 # define YYUSE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
 # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
     _Pragma ("GCC diagnostic push") \
@@ -537,29 +539,29 @@ union yyalloc
 #endif /* !YYCOPY_NEEDED */
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  97
+#define YYFINAL  79
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   743
+#define YYLAST   462
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  65
+#define YYNTOKENS  70
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  44
+#define YYNNTS  51
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  132
+#define YYNRULES  154
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  220
+#define YYNSTATES  269
 
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   319
+#define YYMAXUTOK   324
 
+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, with out-of-bounds checking.  */
 #define YYTRANSLATE(YYX)                                                \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
+   as returned by yylex.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -593,27 +595,30 @@ static const yytype_uint8 yytranslate[] =
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69
 };
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   198,   198,   202,   203,   204,   208,   209,   210,   211,
-     212,   215,   216,   219,   220,   221,   224,   225,   226,   227,
-     230,   231,   232,   233,   236,   237,   238,   241,   242,   243,
-     244,   245,   246,   247,   248,   251,   254,   255,   256,   257,
-     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
-     268,   269,   270,   271,   272,   275,   276,   277,   278,   281,
-     282,   283,   284,   287,   288,   289,   292,   293,   294,   298,
-     299,   300,   303,   304,   307,   310,   311,   314,   315,   316,
-     317,   318,   321,   324,   327,   330,   331,   334,   337,   338,
-     341,   342,   343,   344,   347,   348,   351,   352,   353,   356,
-     357,   358,   361,   362,   365,   366,   369,   370,   371,   374,
-     375,   378,   379,   382,   383,   384,   387,   388,   391,   392,
-     395,   396,   399,   400,   403,   404,   405,   406,   409,   412,
-     413,   416,   417
+       0,   214,   214,   218,   219,   220,   224,   225,   226,   227,
+     228,   231,   232,   235,   236,   239,   240,   241,   244,   245,
+     246,   247,   248,   252,   253,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   265,   266,   269,   270,   271,   272,
+     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,   286,   287,   288,   289,   292,   293,   294,
+     295,   298,   299,   300,   301,   304,   305,   306,   309,   310,
+     311,   315,   316,   317,   320,   321,   324,   327,   328,   331,
+     334,   335,   338,   339,   340,   341,   342,   345,   348,   351,
+     352,   353,   356,   357,   360,   363,   364,   367,   370,   371,
+     374,   375,   376,   377,   380,   381,   384,   385,   386,   389,
+     390,   391,   392,   393,   394,   397,   398,   401,   402,   405,
+     406,   407,   408,   409,   410,   413,   414,   417,   418,   421,
+     422,   423,   426,   427,   428,   429,   432,   433,   436,   439,
+     440,   443,   444,   447,   448,   451,   452,   455,   456,   457,
+     460,   463,   464,   467,   468
 };
 #endif
 
@@ -625,24 +630,27 @@ static const char *const yytname[] =
   "\"end of file\"", "error", "$undefined", "ANY_KIND", "SCALAR_KIND",
   "VOID", "BOOL", "SIGNED_KIND", "INT8", "INT16", "INT32", "INT64",
   "UNSIGNED_KIND", "UINT8", "UINT16", "UINT32", "UINT64", "FLOAT_KIND",
-  "FLOAT16", "FLOAT32", "FLOAT64", "COMPLEX_KIND", "COMPLEX32",
-  "COMPLEX64", "COMPLEX128", "CATEGORICAL", "NA", "INTPTR", "UINTPTR",
-  "SIZE", "CHAR", "STRING", "FIXED_STRING_KIND", "FIXED_STRING", "BYTES",
-  "FIXED_BYTES_KIND", "FIXED_BYTES", "REF", "FIXED", "VAR", "COMMA",
-  "COLON", "LPAREN", "RPAREN", "LBRACE", "RBRACE", "LBRACK", "RBRACK",
-  "STAR", "ELLIPSIS", "RARROW", "EQUAL", "LESS", "GREATER", "QUESTIONMARK",
-  "BANG", "AMPERSAND", "BAR", "ERRTOKEN", "INTEGER", "FLOATNUMBER",
-  "STRINGLIT", "NAME_LOWER", "NAME_UPPER", "NAME_OTHER", "$accept",
-  "input", "datashape_or_module", "datashape_with_ellipsis",
-  "fixed_ellipsis", "datashape", "dimensions", "dimensions_nooption",
-  "dimensions_tail", "dtype", "scalar", "signed", "unsigned", "ieee_float",
-  "ieee_complex", "alias", "character", "string", "fixed_string",
-  "endian_opt", "encoding", "bytes", "fixed_bytes", "ref", "categorical",
-  "typed_value_seq", "typed_value", "variadic_flag", "comma_variadic_flag",
-  "tuple_type", "tuple_field_seq", "tuple_field", "record_type",
-  "record_field_seq", "record_field", "record_field_name", "arguments_opt",
-  "attribute_seq", "attribute", "untyped_value_seq", "untyped_value",
-  "function_type", "type_seq_or_void", "type_seq", YY_NULLPTR
+  "BFLOAT16", "FLOAT16", "FLOAT32", "FLOAT64", "COMPLEX_KIND",
+  "BCOMPLEX32", "COMPLEX32", "COMPLEX64", "COMPLEX128", "CATEGORICAL",
+  "NA", "INTPTR", "UINTPTR", "SIZE", "CHAR", "STRING", "FIXED_STRING_KIND",
+  "FIXED_STRING", "BYTES", "FIXED_BYTES_KIND", "FIXED_BYTES", "REF",
+  "FIXED", "VAR", "ARRAY", "OF", "COMMA", "COLON", "LPAREN", "RPAREN",
+  "LBRACE", "RBRACE", "LBRACK", "RBRACK", "STAR", "ELLIPSIS", "RARROW",
+  "EQUAL", "LESS", "GREATER", "QUESTIONMARK", "BANG", "AMPERSAND", "BAR",
+  "ERRTOKEN", "INTEGER", "FLOATNUMBER", "STRINGLIT", "NAME_LOWER",
+  "NAME_UPPER", "NAME_OTHER", "BELOW_BAR", "$accept", "input",
+  "datashape_or_module", "datashape_with_ellipsis", "fixed_ellipsis",
+  "datashape", "dimensions", "dimensions_nooption", "dimensions_tail",
+  "dtype", "scalar", "signed", "unsigned", "ieee_float", "ieee_complex",
+  "alias", "character", "string", "fixed_string", "flags_opt",
+  "option_opt", "endian_opt", "encoding", "bytes", "array_dimensions",
+  "array", "fixed_bytes", "ref", "categorical", "typed_value_seq",
+  "typed_value", "variadic_flag", "comma_variadic_flag", "tuple_type",
+  "tuple_field_seq", "tuple_field", "record_type", "record_field_seq",
+  "record_field", "field_name_or_tag", "union_type", "union_member_seq",
+  "union_member", "arguments_opt", "attribute_seq", "attribute",
+  "untyped_value_seq", "untyped_value", "function_type",
+  "type_seq_or_void", "type_seq", YY_NULLPTR
 };
 #endif
 
@@ -657,16 +665,16 @@ static const yytype_uint16 yytoknum[] =
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324
 };
 # endif
 
-#define YYPACT_NINF -192
+#define YYPACT_NINF -215
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-192)))
+  (!!((Yystate) == (-215)))
 
-#define YYTABLE_NINF -98
+#define YYTABLE_NINF -131
 
 #define yytable_value_is_error(Yytable_value) \
   0
@@ -675,28 +683,33 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-     134,  -192,  -192,  -192,  -192,  -192,  -192,  -192,   -16,     5,
-    -192,  -192,    14,    23,  -192,    27,    32,    36,   -22,   191,
-      52,    34,  -192,  -192,  -192,   594,    -9,   423,  -192,    39,
-    -192,   -27,    96,   100,   111,  -192,  -192,  -192,  -192,  -192,
-    -192,  -192,  -192,  -192,  -192,  -192,  -192,  -192,  -192,    75,
-    -192,  -192,  -192,  -192,  -192,  -192,  -192,    67,    79,   -20,
-      63,    76,    64,  -192,    64,   423,    64,    80,    92,    23,
-    -192,    81,    90,   110,   122,  -192,  -192,  -192,  -192,   129,
-     135,  -192,   136,   480,    25,  -192,  -192,   -15,   -11,  -192,
-    -192,   480,   138,   537,   -21,   480,   144,  -192,  -192,  -192,
-    -192,  -192,  -192,  -192,  -192,  -192,  -192,  -192,  -192,  -192,
-    -192,  -192,  -192,  -192,  -192,  -192,  -192,   252,   366,  -192,
-    -192,  -192,  -192,   109,  -192,  -192,   157,   118,   154,   120,
-    -192,   141,   164,   159,   637,   480,    -9,    64,  -192,   309,
-     167,  -192,    69,   168,   423,   594,  -192,  -192,  -192,   163,
-    -192,   366,   154,   171,   161,   108,   170,   172,  -192,   480,
-      13,  -192,  -192,  -192,   -20,  -192,  -192,    63,  -192,    46,
-      64,  -192,  -192,  -192,   183,   680,   173,  -192,  -192,    -8,
-    -192,  -192,   166,  -192,   154,  -192,   -29,  -192,   175,  -192,
-    -192,  -192,  -192,  -192,  -192,  -192,  -192,   177,    83,  -192,
-    -192,  -192,  -192,  -192,  -192,   480,  -192,  -192,  -192,  -192,
-      64,  -192,    17,  -192,  -192,    -4,    83,  -192,  -192,  -192
+      51,  -215,   -20,     2,   272,   -31,   153,    -9,    -8,   116,
+      17,     4,   392,  -215,    79,    96,   102,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,   397,   204,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,     8,  -215,    55,  -215,
+    -215,    58,    77,    61,    61,    76,    86,    97,  -215,    38,
+      81,   254,   103,   108,  -215,  -215,  -215,   114,   129,  -215,
+     145,   -22,   334,    97,   272,   -31,   153,     4,   132,    55,
+     148,    35,  -215,   334,   158,   334,    95,   334,   141,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,   151,   160,  -215,  -215,   164,    97,  -215,   165,
+     172,   -12,  -215,  -215,  -215,   334,  -215,  -215,   334,   153,
+     146,   320,   170,   -17,  -215,     5,   383,   334,   116,    61,
+    -215,   296,   180,  -215,    27,   183,   334,  -215,  -215,  -215,
+    -215,   177,   186,   190,   198,   191,     3,   334,  -215,   320,
+     201,    72,   199,   200,  -215,   334,   -19,   184,   189,  -215,
+      61,   334,   334,   210,  -215,  -215,  -215,   409,  -215,  -215,
+    -215,   152,    61,   202,  -215,    99,    43,  -215,  -215,   -33,
+    -215,   -23,  -215,    90,  -215,   170,  -215,    64,  -215,   194,
+     334,  -215,   296,   209,  -215,    27,   213,  -215,   216,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,   124,  -215,
+    -215,   219,   133,   138,   220,  -215,   241,  -215,   334,   159,
+    -215,  -215,  -215,  -215,  -215,   334,  -215,  -215,  -215,    61,
+    -215,   144,  -215,    71,  -215,  -215,   -19,  -215,  -215,   184,
+    -215,  -215,  -215,   226,  -215,  -215,    19,  -215,  -215,   -27,
+    -215,  -215,  -215,   223,   159,  -215,  -215,  -215,  -215
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -704,48 +717,55 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-      77,    27,    28,   130,    37,    39,    41,    43,     0,    72,
-      74,    48,     0,   116,    51,     0,     0,     0,   116,    77,
-      94,     0,    78,    79,    80,    77,     0,    77,    81,     0,
-      32,    35,     0,     0,   131,     7,     6,    13,    16,    14,
-      29,    38,    40,    42,    44,    45,    46,    47,    49,     0,
-      50,    52,    54,    53,    30,    31,     4,     0,   129,     0,
-       0,     0,     0,    83,     0,    77,     0,     0,     0,   116,
-      95,    35,   104,     0,    96,   102,   113,   114,   115,     0,
-      96,   109,     0,    77,    35,    17,    15,     0,     0,    19,
-      86,    77,     0,    77,     0,    77,     0,     1,     2,    36,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    77,    77,    93,
-      90,    91,    92,     0,    88,    82,     0,     0,     0,     0,
-     118,     0,     0,     0,    77,    77,     0,     0,    99,    77,
-       0,   106,    97,     0,    77,    77,    26,    11,    24,     0,
-      20,    77,    32,     0,     0,     0,     0,     0,    22,    77,
-      35,   131,   128,   132,     0,    87,    73,     0,    75,     0,
-       0,   117,    84,    85,     0,    77,    35,     9,    23,     0,
-      98,   103,     0,   100,   113,   110,     0,   107,   111,    25,
-       5,    33,    34,     8,    18,    12,    89,     0,     0,   125,
-     126,   127,   124,   120,   119,    77,    10,   105,   101,   108,
-       0,    76,     0,   122,    21,     0,     0,   121,   112,   123
+      80,   152,     0,   139,    80,   104,     0,     0,    81,     0,
+       0,    31,    35,   131,     0,     0,   153,     7,     6,    13,
+      15,    14,    27,    48,    49,    51,     0,    82,    52,    10,
+      89,    54,    56,    55,    28,    29,     0,    30,   132,   136,
+       4,     0,   151,     0,     0,     0,     0,   139,   105,    35,
+     117,    82,     0,   106,   115,   129,   130,     0,   106,   125,
+       0,     0,    80,   139,    80,   104,     0,    32,   130,   134,
+       0,     0,    17,    80,     0,    80,     0,    80,     0,     1,
+       2,    36,    37,    57,    58,    59,    60,    39,    61,    62,
+      63,    64,    41,    42,    65,    66,    67,    44,    45,    68,
+      69,    70,    71,    72,    73,    38,    40,    43,    46,    47,
+      25,    26,     0,    74,    76,    50,     0,   139,    53,     0,
+       0,     0,    83,    84,    85,    80,    86,    79,    80,     0,
+      80,    80,     0,     0,   141,     0,    80,    80,     0,     0,
+     109,    80,     0,   119,   107,     0,    80,   133,    24,    11,
+      23,     0,     0,   106,     0,   106,     0,    80,    18,    80,
+       0,     0,     0,     0,    20,    80,     0,     0,     0,    88,
+       0,    80,    80,     0,    96,   138,   137,    35,   153,   150,
+     154,     0,     0,     0,   140,    81,    35,     9,    21,     0,
+     108,    31,   116,     0,   110,   129,   126,     0,   120,   127,
+      80,   112,    80,     0,   122,   107,     0,   135,     0,     5,
+      33,     8,    16,    12,   103,   100,   101,   102,     0,    98,
+      87,     0,     0,     0,     0,    92,    82,    93,    80,     0,
+     147,   148,   149,   143,   142,    80,   118,   111,   121,     0,
+      22,     0,   113,     0,   123,    34,     0,    97,    75,     0,
+      77,    94,    95,     0,    90,    91,     0,   145,    19,     0,
+     114,   124,    99,     0,     0,   144,   128,    78,   146
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -192,  -192,  -192,  -108,   124,   -14,   -23,   -24,   -83,   -25,
-    -192,  -192,  -192,  -192,  -192,  -192,  -192,  -192,  -192,  -192,
-      70,  -192,  -192,  -192,  -192,  -192,    72,   218,   169,  -192,
-    -192,   102,  -192,  -192,    97,  -192,   238,   -62,    82,  -192,
-    -191,  -192,   143,  -192
+    -215,  -215,  -215,  -106,   195,    -2,    -5,  -215,   -59,   -54,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+       0,  -215,    23,  -215,  -215,  -151,  -215,  -215,  -215,  -215,
+      36,    11,   -48,  -215,   221,  -135,  -215,   229,  -131,    -4,
+    -215,    -1,   155,   -51,   -41,   113,  -215,  -214,  -215,   169,
+    -215
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,    32,    33,    34,    35,    36,    37,    38,   147,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-     126,    50,    51,    52,    53,   123,   124,    73,   140,    54,
-      74,    75,    55,    80,    81,    82,    68,   129,   130,   212,
-     203,    56,    57,    58
+      -1,    14,    15,    16,    17,    18,    19,    20,   149,    21,
+      22,   105,   106,   107,   108,   109,    23,    24,    25,    26,
+      51,   127,   221,    28,    29,    30,    31,    32,    33,   218,
+     219,    52,   142,    34,    53,    54,    35,    58,    59,    36,
+      37,    38,    39,    46,   133,   134,   256,   233,    40,    41,
+      42
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -753,226 +773,179 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      86,    85,   131,    89,   133,    72,   119,   213,   150,   161,
-     163,   170,   158,    90,    92,    93,   209,    17,    69,    94,
-      62,    95,    96,    17,    69,   219,    59,    67,    21,    17,
-      69,   154,   170,    87,    26,   136,   170,    95,    29,   120,
-     121,   122,   155,   190,    29,    87,    26,    60,   149,   207,
-      29,   132,   178,   218,    88,    93,    61,   216,   148,    94,
-     146,    95,    96,    85,   217,    62,   148,    93,   146,    64,
-     148,   157,   146,    95,    65,   179,   195,   182,    66,   153,
-     186,    99,    83,   100,   101,   102,   103,    91,   104,   105,
-     106,   107,   198,   108,   109,   110,    97,   111,   112,   113,
-      98,    70,   114,   115,   116,   199,   200,   201,   202,   177,
-     148,    -3,   146,   157,    76,    77,    78,   117,   180,   118,
-     189,    85,   214,    93,   125,    72,   128,   136,   134,    95,
-     188,   184,    77,    78,   148,   127,   146,     1,     2,     3,
-     135,     4,   199,   200,   201,   202,     5,   137,   215,   164,
-     206,     6,   165,   138,   136,     7,    95,    96,   167,     8,
-     170,   168,   139,   171,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,   141,   142,    19,   144,    20,   151,
-     148,   170,   146,    21,   172,    22,    23,    24,    25,    26,
-      27,    28,   159,    29,     1,     2,    30,    31,     4,   170,
-     166,   170,   174,     5,   192,   169,   170,   173,     6,   208,
-     183,    95,     7,   187,   191,    93,     8,   193,   156,   194,
-     211,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      69,   205,   210,    19,   -94,    20,   196,   197,    79,   185,
-      70,   181,    22,    23,    24,    25,    26,    27,    28,   143,
-      29,    63,   204,    30,    71,     1,     2,     3,     0,     4,
-     162,     0,     0,     0,     5,     0,     0,     0,     0,     6,
-       0,     0,     0,     7,     0,     0,     0,     8,     0,     0,
-       0,     0,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,     0,     0,    19,     0,    20,     0,     0,     0,
-       0,    21,     0,    22,    23,    24,    25,    26,    27,    28,
-       0,    29,     1,     2,    30,   160,     4,     0,     0,     0,
-       0,     5,     0,     0,     0,     0,     6,     0,     0,     0,
-       7,     0,     0,     0,     8,     0,     0,     0,     0,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    69,     0,
-       0,    19,   -97,    20,     0,     0,     0,     0,   180,     0,
-      22,    23,    24,    25,    26,    27,    28,     0,    29,     1,
-       2,   152,    71,     4,     0,     0,     0,     0,     5,     0,
-       0,     0,     0,     6,     0,     0,     0,     7,     0,     0,
-       0,     8,     0,     0,     0,     0,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,     0,     0,    19,     0,
-      20,     0,     0,     0,     0,    21,     0,    22,    23,    24,
-      25,    26,    27,    28,     0,    29,     1,     2,    30,   160,
-       4,     0,     0,     0,     0,     5,     0,     0,     0,     0,
-       6,     0,     0,     0,     7,     0,     0,     0,     8,     0,
-       0,     0,     0,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    69,     0,     0,    19,     0,    20,     0,     0,
-       0,     0,     0,     0,    22,    23,    24,    25,    26,    27,
-      28,     0,    29,     1,     2,    30,    71,     4,     0,     0,
-       0,     0,     5,     0,     0,     0,     0,     6,     0,     0,
-       0,     7,     0,     0,     0,     8,     0,     0,     0,     0,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    69,
-       0,     0,    19,     0,    20,     0,     0,     0,     0,     0,
-       0,    22,    23,    24,   145,    26,    27,    28,     0,    29,
-       1,     2,    30,    71,     4,     0,     0,     0,     0,     5,
-       0,     0,     0,     0,     6,     0,     0,     0,     7,     0,
-       0,     0,     8,     0,     0,     0,     0,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    69,     0,     0,    19,
-       0,    20,     0,     0,     0,     0,     0,     0,    22,    23,
-      24,    25,    26,    27,    28,     0,    29,     1,     2,   152,
-      71,     4,     0,     0,     0,     0,     5,     0,     0,     0,
-       0,     6,     0,     0,     0,     7,     0,     0,     0,     8,
-       0,     0,     0,     0,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    69,     0,     0,    19,     0,    20,     0,
-       1,     2,     0,     0,     4,    22,    23,    24,     0,     5,
-      27,    28,     0,    29,     6,     0,    30,    84,     7,     0,
-       0,     0,     8,     0,     0,     0,     0,     9,    10,    11,
-      12,    13,    14,    15,    16,     0,     0,     0,     0,    19,
-       0,    20,     0,     1,     2,     0,     0,     4,    22,    23,
-      24,   175,     5,    27,    28,     0,     0,     6,     0,    30,
-     176,     7,     0,     0,     0,     8,     0,     0,     0,     0,
-       9,    10,    11,    12,    13,    14,    15,    16,     0,     0,
-       0,     0,    19,     0,    20,     0,     0,     0,     0,     0,
-       0,    22,    23,    24,     0,     0,    27,    28,     0,     0,
-       0,     0,    30,   176
+      27,    60,    50,   135,    72,    61,   192,    69,   150,   214,
+     145,   182,   151,   196,   158,   257,    57,   182,   164,   150,
+    -129,   227,    48,   150,   178,   180,    43,   182,   236,   147,
+     183,   172,   181,    63,   266,    55,    56,    13,    64,   129,
+      65,   173,    66,    62,   215,   216,   217,  -129,    44,   182,
+     268,   128,   184,   209,   207,    45,     1,   148,    67,    68,
+      13,    60,    50,   264,   129,   156,   169,   192,   148,    73,
+     265,   163,   148,   160,   196,   152,   154,   255,   188,    79,
+     190,  -130,   187,   150,    75,   138,  -130,    77,   138,    75,
+      77,     2,     3,   195,    56,    13,    80,     4,   189,     5,
+     193,     6,    -3,   197,     7,   203,   213,   206,   182,     8,
+       9,   150,   130,   238,    10,   182,   129,    11,    12,    13,
+     261,   131,   138,   174,    77,    78,   175,   132,   136,   223,
+      27,    27,   148,   163,   182,     2,    47,   237,   137,    50,
+      60,   240,   139,    44,   199,    64,   150,    65,     7,    66,
+     140,     1,   141,    70,     9,   208,     2,    47,    10,    27,
+     148,   241,   161,   143,   243,    67,    68,    13,   246,   224,
+     225,   247,   226,   144,    70,     9,   258,   249,   157,    10,
+     250,   150,   182,    71,    69,   251,     2,     3,   182,    63,
+     146,   260,     4,   165,     5,   148,     6,   166,   259,     7,
+      50,    60,   229,   159,     8,     9,   167,   110,   111,    10,
+     168,   170,    11,   177,    13,   230,   231,   232,   171,    55,
+      56,    13,   230,   231,   232,   181,   254,   194,   226,   200,
+     148,   112,   198,   201,   202,   205,   113,   114,   115,   116,
+     117,   118,   119,   120,   110,   111,   121,   204,   210,   220,
+     211,   212,   222,   228,   235,   239,   242,   110,   111,   122,
+     123,   124,   244,   245,   125,   126,   248,   252,   112,   172,
+     267,   162,   263,   113,   114,   115,   116,   117,   118,   119,
+     120,   112,   262,   253,   176,   153,   113,   114,   115,   116,
+     117,   118,   119,   120,   155,   234,   122,   123,   124,   179,
+       0,   125,   126,     0,     0,     0,     0,     0,     0,   122,
+     123,   124,     2,    47,   125,   126,     0,     0,     4,  -104,
+       5,     0,     6,     0,     0,    48,     0,     0,     0,     0,
+       8,     9,     0,     0,     0,    10,     2,    47,    11,    49,
+      13,     0,     4,  -107,     5,     0,     6,     0,     0,   190,
+       0,     0,     0,     0,     8,     9,     0,     0,     0,    10,
+       2,     3,   191,    49,    13,     0,     4,     0,     5,     0,
+       6,     0,     0,     7,     2,    47,     0,     0,     8,     9,
+       4,     0,     5,    10,     6,     0,    11,   177,    13,     0,
+       0,     0,     8,     9,     0,     0,     0,    10,     0,     0,
+      11,    49,    13,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,     0,     0,   102,   103,   104,     4,
+       0,     5,     0,     6,     0,  -130,     0,    74,    75,     0,
+       0,   185,    76,     0,    77,    78,     0,     0,     0,    11,
+     186,    13,  -130,     0,     0,    75,     0,     0,     0,    76,
+       0,    77,    78
 };
 
 static const yytype_int16 yycheck[] =
 {
-      25,    25,    64,    26,    66,    19,    26,   198,    91,   117,
-     118,    40,    95,    27,    41,    42,    45,    38,    39,    46,
-      42,    48,    49,    38,    39,   216,    42,    49,    49,    38,
-      39,    93,    40,    54,    55,    46,    40,    48,    59,    59,
-      60,    61,    63,   151,    59,    54,    55,    42,    63,    57,
-      59,    65,   135,    57,    63,    42,    42,    40,    83,    46,
-      83,    48,    49,    87,    47,    42,    91,    42,    91,    42,
-      95,    94,    95,    48,    42,   137,   159,   139,    42,    93,
-     142,     6,    48,     8,     9,    10,    11,    48,    13,    14,
-      15,    16,    46,    18,    19,    20,     0,    22,    23,    24,
-       0,    49,    27,    28,    29,    59,    60,    61,    62,   134,
-     135,     0,   135,   136,    62,    63,    64,    50,    49,    40,
-     145,   145,   205,    42,    61,   139,    62,    46,    48,    48,
-     144,    62,    63,    64,   159,    59,   159,     3,     4,     5,
-      48,     7,    59,    60,    61,    62,    12,    57,   210,    40,
-     175,    17,    43,    43,    46,    21,    48,    49,    40,    25,
-      40,    43,    40,    43,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    45,    40,    42,    41,    44,    41,
-     205,    40,   205,    49,    43,    51,    52,    53,    54,    55,
-      56,    57,    48,    59,     3,     4,    62,    63,     7,    40,
-      43,    40,    43,    12,    43,    51,    40,    43,    17,    43,
-      43,    48,    21,    45,    43,    42,    25,    47,    94,    47,
-      43,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    48,    57,    42,    43,    44,   164,   167,    20,   142,
-      49,   139,    51,    52,    53,    54,    55,    56,    57,    80,
-      59,    13,   170,    62,    63,     3,     4,     5,    -1,     7,
-     117,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
-      -1,    -1,    -1,    21,    -1,    -1,    -1,    25,    -1,    -1,
-      -1,    -1,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    -1,    -1,    42,    -1,    44,    -1,    -1,    -1,
-      -1,    49,    -1,    51,    52,    53,    54,    55,    56,    57,
-      -1,    59,     3,     4,    62,    63,     7,    -1,    -1,    -1,
-      -1,    12,    -1,    -1,    -1,    -1,    17,    -1,    -1,    -1,
-      21,    -1,    -1,    -1,    25,    -1,    -1,    -1,    -1,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
-      -1,    42,    43,    44,    -1,    -1,    -1,    -1,    49,    -1,
-      51,    52,    53,    54,    55,    56,    57,    -1,    59,     3,
-       4,    62,    63,     7,    -1,    -1,    -1,    -1,    12,    -1,
-      -1,    -1,    -1,    17,    -1,    -1,    -1,    21,    -1,    -1,
-      -1,    25,    -1,    -1,    -1,    -1,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    -1,    -1,    42,    -1,
-      44,    -1,    -1,    -1,    -1,    49,    -1,    51,    52,    53,
-      54,    55,    56,    57,    -1,    59,     3,     4,    62,    63,
-       7,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,
-      17,    -1,    -1,    -1,    21,    -1,    -1,    -1,    25,    -1,
-      -1,    -1,    -1,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    -1,    -1,    42,    -1,    44,    -1,    -1,
-      -1,    -1,    -1,    -1,    51,    52,    53,    54,    55,    56,
-      57,    -1,    59,     3,     4,    62,    63,     7,    -1,    -1,
-      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    -1,    -1,
-      -1,    21,    -1,    -1,    -1,    25,    -1,    -1,    -1,    -1,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      -1,    -1,    42,    -1,    44,    -1,    -1,    -1,    -1,    -1,
-      -1,    51,    52,    53,    54,    55,    56,    57,    -1,    59,
-       3,     4,    62,    63,     7,    -1,    -1,    -1,    -1,    12,
-      -1,    -1,    -1,    -1,    17,    -1,    -1,    -1,    21,    -1,
-      -1,    -1,    25,    -1,    -1,    -1,    -1,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    -1,    -1,    42,
-      -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    51,    52,
-      53,    54,    55,    56,    57,    -1,    59,     3,     4,    62,
-      63,     7,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    -1,    -1,    -1,    21,    -1,    -1,    -1,    25,
-      -1,    -1,    -1,    -1,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    -1,    -1,    42,    -1,    44,    -1,
-       3,     4,    -1,    -1,     7,    51,    52,    53,    -1,    12,
-      56,    57,    -1,    59,    17,    -1,    62,    63,    21,    -1,
-      -1,    -1,    25,    -1,    -1,    -1,    -1,    30,    31,    32,
-      33,    34,    35,    36,    37,    -1,    -1,    -1,    -1,    42,
-      -1,    44,    -1,     3,     4,    -1,    -1,     7,    51,    52,
-      53,    54,    12,    56,    57,    -1,    -1,    17,    -1,    62,
-      63,    21,    -1,    -1,    -1,    25,    -1,    -1,    -1,    -1,
-      30,    31,    32,    33,    34,    35,    36,    37,    -1,    -1,
-      -1,    -1,    42,    -1,    44,    -1,    -1,    -1,    -1,    -1,
-      -1,    51,    52,    53,    -1,    -1,    56,    57,    -1,    -1,
-      -1,    -1,    62,    63
+       0,     5,     4,    44,     9,     6,   141,     8,    62,    28,
+      58,    44,    63,   144,    73,   229,     5,    44,    77,    73,
+      43,   172,    53,    77,   130,   131,    46,    44,    61,    51,
+      47,    43,    55,    41,    61,    66,    67,    68,    46,    61,
+      48,    53,    50,    52,    63,    64,    65,    43,    46,    44,
+     264,    43,    47,   159,    51,    53,     5,    62,    66,    67,
+      68,    65,    64,    44,    61,    66,   117,   202,    73,    52,
+      51,    76,    77,    75,   205,    64,    65,   228,   137,     0,
+      53,    43,   136,   137,    46,    50,    43,    52,    50,    46,
+      52,    40,    41,    66,    67,    68,     0,    46,   139,    48,
+     141,    50,     0,   144,    53,   153,   165,   155,    44,    58,
+      59,   165,    54,    49,    63,    44,    61,    66,    67,    68,
+      49,    44,    50,   125,    52,    53,   128,    66,    52,   170,
+     130,   131,   137,   138,    44,    40,    41,    47,    52,   141,
+     144,   200,    61,    46,   146,    46,   200,    48,    53,    50,
+      47,     5,    44,    58,    59,   157,    40,    41,    63,   159,
+     165,   202,    67,    49,   205,    66,    67,    68,    44,   171,
+     172,    47,   172,    44,    58,    59,   235,    44,    46,    63,
+      47,   235,    44,    67,   185,    47,    40,    41,    44,    41,
+      45,    47,    46,    52,    48,   200,    50,    46,   239,    53,
+     202,   205,    50,    45,    58,    59,    46,     3,     4,    63,
+      46,    46,    66,    67,    68,    63,    64,    65,    46,    66,
+      67,    68,    63,    64,    65,    55,   228,    47,   228,    52,
+     235,    27,    49,    47,    44,    44,    32,    33,    34,    35,
+      36,    37,    38,    39,     3,     4,    42,    49,    47,    65,
+      51,    51,    63,    43,    52,    61,    47,     3,     4,    55,
+      56,    57,    49,    47,    60,    61,    47,    47,    27,    43,
+      47,    76,   249,    32,    33,    34,    35,    36,    37,    38,
+      39,    27,   246,    42,   129,    64,    32,    33,    34,    35,
+      36,    37,    38,    39,    65,   182,    55,    56,    57,   130,
+      -1,    60,    61,    -1,    -1,    -1,    -1,    -1,    -1,    55,
+      56,    57,    40,    41,    60,    61,    -1,    -1,    46,    47,
+      48,    -1,    50,    -1,    -1,    53,    -1,    -1,    -1,    -1,
+      58,    59,    -1,    -1,    -1,    63,    40,    41,    66,    67,
+      68,    -1,    46,    47,    48,    -1,    50,    -1,    -1,    53,
+      -1,    -1,    -1,    -1,    58,    59,    -1,    -1,    -1,    63,
+      40,    41,    66,    67,    68,    -1,    46,    -1,    48,    -1,
+      50,    -1,    -1,    53,    40,    41,    -1,    -1,    58,    59,
+      46,    -1,    48,    63,    50,    -1,    66,    67,    68,    -1,
+      -1,    -1,    58,    59,    -1,    -1,    -1,    63,    -1,    -1,
+      66,    67,    68,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    -1,    -1,    29,    30,    31,    46,
+      -1,    48,    -1,    50,    -1,    43,    -1,    45,    46,    -1,
+      -1,    58,    50,    -1,    52,    53,    -1,    -1,    -1,    66,
+      67,    68,    43,    -1,    -1,    46,    -1,    -1,    -1,    50,
+      -1,    52,    53
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,     3,     4,     5,     7,    12,    17,    21,    25,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    42,
-      44,    49,    51,    52,    53,    54,    55,    56,    57,    59,
-      62,    63,    66,    67,    68,    69,    70,    71,    72,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      86,    87,    88,    89,    94,    97,   106,   107,   108,    42,
-      42,    42,    42,   101,    42,    42,    42,    49,   101,    39,
-      49,    63,    70,    92,    95,    96,    62,    63,    64,    92,
-      98,    99,   100,    48,    63,    72,    74,    54,    63,    71,
-      70,    48,    41,    42,    46,    48,    49,     0,     0,     6,
-       8,     9,    10,    11,    13,    14,    15,    16,    18,    19,
-      20,    22,    23,    24,    27,    28,    29,    50,    40,    26,
-      59,    60,    61,    90,    91,    61,    85,    59,    62,   102,
-     103,   102,    70,   102,    48,    48,    46,    57,    43,    40,
-      93,    45,    40,    93,    41,    54,    71,    73,    74,    63,
-      73,    41,    62,    70,   102,    63,    69,    71,    73,    48,
-      63,    68,   107,    68,    40,    43,    43,    40,    43,    51,
-      40,    43,    43,    43,    43,    54,    63,    74,    73,   102,
-      49,    96,   102,    43,    62,    99,   102,    45,    70,    74,
-      68,    43,    43,    47,    47,    73,    91,    85,    46,    59,
-      60,    61,    62,   105,   103,    48,    74,    57,    43,    45,
-      57,    43,   104,   105,    73,   102,    40,    47,    57,   105
+       0,     5,    40,    41,    46,    48,    50,    53,    58,    59,
+      63,    66,    67,    68,    71,    72,    73,    74,    75,    76,
+      77,    79,    80,    86,    87,    88,    89,    90,    93,    94,
+      95,    96,    97,    98,   103,   106,   109,   110,   111,   112,
+     118,   119,   120,    46,    46,    53,   113,    41,    53,    67,
+      75,    90,   101,   104,   105,    66,    67,   101,   107,   108,
+     109,   111,    52,    41,    46,    48,    50,    66,    67,   111,
+      58,    67,    76,    52,    45,    46,    50,    52,    53,     0,
+       0,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    29,    30,    31,    81,    82,    83,    84,    85,
+       3,     4,    27,    32,    33,    34,    35,    36,    37,    38,
+      39,    42,    55,    56,    57,    60,    61,    91,    43,    61,
+      54,    44,    66,   114,   115,   114,    52,    52,    50,    61,
+      47,    44,   102,    49,    44,   102,    45,    51,    76,    78,
+      79,   113,   101,   104,   101,   107,   111,    46,    78,    45,
+      75,    67,    74,    76,    78,    52,    46,    46,    46,   113,
+      46,    46,    43,    53,    75,    75,   112,    67,    73,   119,
+      73,    55,    44,    47,    47,    58,    67,    79,    78,   114,
+      53,    66,   105,   114,    47,    66,   108,   114,    49,    75,
+      52,    47,    44,   102,    49,    44,   102,    51,    75,    73,
+      47,    51,    51,    78,    28,    63,    64,    65,    99,   100,
+      65,    92,    63,   114,    75,    75,    90,    95,    43,    50,
+      63,    64,    65,   117,   115,    52,    61,    47,    49,    61,
+      78,   114,    47,   114,    49,    47,    44,    47,    47,    44,
+      47,    47,    47,    42,    75,    95,   116,   117,    78,   114,
+      47,    49,   100,    92,    44,    51,    61,    47,   117
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    65,    66,    67,    67,    67,    68,    68,    68,    68,
-      68,    69,    69,    70,    70,    70,    71,    71,    71,    71,
-      72,    72,    72,    72,    73,    73,    73,    74,    74,    74,
-      74,    74,    74,    74,    74,    74,    75,    75,    75,    75,
-      75,    75,    75,    75,    75,    75,    75,    75,    75,    75,
-      75,    75,    75,    75,    75,    76,    76,    76,    76,    77,
-      77,    77,    77,    78,    78,    78,    79,    79,    79,    80,
-      80,    80,    81,    81,    82,    83,    83,    84,    84,    84,
-      84,    84,    85,    86,    87,    88,    88,    89,    90,    90,
-      91,    91,    91,    91,    92,    92,    93,    93,    93,    94,
-      94,    94,    95,    95,    96,    96,    97,    97,    97,    98,
-      98,    99,    99,   100,   100,   100,   101,   101,   102,   102,
-     103,   103,   104,   104,   105,   105,   105,   105,   106,   107,
-     107,   108,   108
+       0,    70,    71,    72,    72,    72,    73,    73,    73,    73,
+      73,    74,    74,    75,    75,    76,    76,    76,    77,    77,
+      77,    77,    77,    78,    78,    79,    79,    79,    79,    79,
+      79,    79,    79,    79,    79,    79,    80,    80,    80,    80,
+      80,    80,    80,    80,    80,    80,    80,    80,    80,    80,
+      80,    80,    80,    80,    80,    80,    80,    81,    81,    81,
+      81,    82,    82,    82,    82,    83,    83,    83,    84,    84,
+      84,    85,    85,    85,    86,    86,    87,    88,    88,    89,
+      90,    90,    91,    91,    91,    91,    91,    92,    93,    94,
+      94,    94,    95,    95,    96,    97,    97,    98,    99,    99,
+     100,   100,   100,   100,   101,   101,   102,   102,   102,   103,
+     103,   103,   103,   103,   103,   104,   104,   105,   105,   106,
+     106,   106,   106,   106,   106,   107,   107,   108,   108,   109,
+     109,   109,   110,   110,   110,   110,   111,   111,   112,   113,
+     113,   114,   114,   115,   115,   116,   116,   117,   117,   117,
+     118,   119,   119,   120,   120
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     2,     1,     1,     4,     1,     1,     4,     4,
-       5,     3,     4,     1,     1,     2,     1,     2,     4,     2,
-       3,     6,     3,     4,     1,     2,     1,     1,     1,     1,
-       1,     1,     1,     4,     4,     1,     2,     1,     1,     1,
+       1,     3,     4,     1,     1,     1,     4,     2,     3,     6,
+       3,     4,     5,     1,     1,     2,     2,     1,     1,     1,
+       1,     1,     2,     4,     5,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     1,     1,
+       2,     1,     1,     2,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     1,     4,     1,     4,     6,     0,     1,     1,
-       1,     1,     1,     2,     4,     4,     2,     4,     1,     3,
+       1,     1,     1,     1,     2,     5,     2,     5,     7,     2,
+       0,     1,     0,     1,     1,     1,     1,     1,     3,     1,
+       5,     5,     4,     4,     5,     5,     3,     5,     1,     3,
        1,     1,     1,     1,     0,     1,     0,     1,     2,     3,
-       4,     5,     1,     3,     1,     4,     3,     4,     5,     1,
-       3,     3,     6,     1,     1,     1,     0,     3,     1,     3,
-       3,     5,     1,     3,     1,     1,     1,     1,     3,     1,
-       1,     1,     3
+       4,     5,     4,     5,     6,     1,     3,     1,     4,     3,
+       4,     5,     4,     5,     6,     1,     3,     3,     6,     1,
+       1,     1,     1,     3,     2,     4,     1,     3,     3,     0,
+       3,     1,     3,     3,     5,     1,     3,     1,     1,     1,
+       3,     1,     1,     1,     3
 };
 
 
@@ -988,22 +961,22 @@ static const yytype_uint8 yyr2[] =
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
-      yyerror (&yylloc, scanner, ast, meta, ctx, YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (0)
+#define YYBACKUP(Token, Value)                                    \
+  do                                                              \
+    if (yychar == YYEMPTY)                                        \
+      {                                                           \
+        yychar = (Token);                                         \
+        yylval = (Value);                                         \
+        YYPOPSTACK (yylen);                                       \
+        yystate = *yyssp;                                         \
+        goto yybackup;                                            \
+      }                                                           \
+    else                                                          \
+      {                                                           \
+        yyerror (&yylloc, scanner, ast, ctx, YY_("syntax error: cannot back up")); \
+        YYERROR;                                                  \
+      }                                                           \
+  while (0)
 
 /* Error token number */
 #define YYTERROR        1
@@ -1062,10 +1035,10 @@ do {                                            \
 /* Print *YYLOCP on YYO.  Private, do not rely on its existence. */
 
 YY_ATTRIBUTE_UNUSED
-static unsigned
+static int
 yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
 {
-  unsigned res = 0;
+  int res = 0;
   int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0;
   if (0 <= yylocp->first_line)
     {
@@ -1102,50 +1075,49 @@ do {                                                                      \
     {                                                                     \
       YYFPRINTF (stderr, "%s ", Title);                                   \
       yy_symbol_print (stderr,                                            \
-                  Type, Value, Location, scanner, ast, meta, ctx); \
+                  Type, Value, Location, scanner, ast, ctx); \
       YYFPRINTF (stderr, "\n");                                           \
     }                                                                     \
 } while (0)
 
 
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT.  |
-`----------------------------------------*/
+/*-----------------------------------.
+| Print this symbol's value on YYO.  |
+`-----------------------------------*/
 
 static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, yyscan_t scanner, ndt_t **ast, ndt_meta_t *meta, ndt_context_t *ctx)
+yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, yyscan_t scanner, const ndt_t **ast, ndt_context_t *ctx)
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
+  FILE *yyoutput = yyo;
+  YYUSE (yyoutput);
   YYUSE (yylocationp);
   YYUSE (scanner);
   YYUSE (ast);
-  YYUSE (meta);
   YYUSE (ctx);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+    YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
 # endif
   YYUSE (yytype);
 }
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+/*---------------------------.
+| Print this symbol on YYO.  |
+`---------------------------*/
 
 static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, yyscan_t scanner, ndt_t **ast, ndt_meta_t *meta, ndt_context_t *ctx)
+yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, yyscan_t scanner, const ndt_t **ast, ndt_context_t *ctx)
 {
-  YYFPRINTF (yyoutput, "%s %s (",
+  YYFPRINTF (yyo, "%s %s (",
              yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
-  YY_LOCATION_PRINT (yyoutput, *yylocationp);
-  YYFPRINTF (yyoutput, ": ");
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, scanner, ast, meta, ctx);
-  YYFPRINTF (yyoutput, ")");
+  YY_LOCATION_PRINT (yyo, *yylocationp);
+  YYFPRINTF (yyo, ": ");
+  yy_symbol_value_print (yyo, yytype, yyvaluep, yylocationp, scanner, ast, ctx);
+  YYFPRINTF (yyo, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -1177,9 +1149,9 @@ do {                                                            \
 `------------------------------------------------*/
 
 static void
-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, yyscan_t scanner, ndt_t **ast, ndt_meta_t *meta, ndt_context_t *ctx)
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, yyscan_t scanner, const ndt_t **ast, ndt_context_t *ctx)
 {
-  unsigned long int yylno = yyrline[yyrule];
+  unsigned long yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
@@ -1190,8 +1162,8 @@ yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr,
                        yystos[yyssp[yyi + 1 - yynrhs]],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                       , &(yylsp[(yyi + 1) - (yynrhs)])                       , scanner, ast, meta, ctx);
+                       &yyvsp[(yyi + 1) - (yynrhs)]
+                       , &(yylsp[(yyi + 1) - (yynrhs)])                       , scanner, ast, ctx);
       YYFPRINTF (stderr, "\n");
     }
 }
@@ -1199,7 +1171,7 @@ yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule
 # define YY_REDUCE_PRINT(Rule)          \
 do {                                    \
   if (yydebug)                          \
-    yy_reduce_print (yyssp, yyvsp, yylsp, Rule, scanner, ast, meta, ctx); \
+    yy_reduce_print (yyssp, yyvsp, yylsp, Rule, scanner, ast, ctx); \
 } while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
@@ -1294,7 +1266,10 @@ yytnamerr (char *yyres, const char *yystr)
           case '\\':
             if (*++yyp != '\\')
               goto do_not_strip_quotes;
-            /* Fall through.  */
+            else
+              goto append;
+
+          append:
           default:
             if (yyres)
               yyres[yyn] = *yyp;
@@ -1312,7 +1287,7 @@ yytnamerr (char *yyres, const char *yystr)
   if (! yyres)
     return yystrlen (yystr);
 
-  return yystpcpy (yyres, yystr) - yyres;
+  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
 }
 # endif
 
@@ -1390,10 +1365,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                 yyarg[yycount++] = yytname[yyx];
                 {
                   YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                  if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+                    yysize = yysize1;
+                  else
                     return 2;
-                  yysize = yysize1;
                 }
               }
         }
@@ -1405,6 +1380,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
       case N:                               \
         yyformat = S;                       \
       break
+    default: /* Avoid compiler warnings. */
       YYCASE_(0, YY_("syntax error"));
       YYCASE_(1, YY_("syntax error, unexpected %s"));
       YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
@@ -1416,9 +1392,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 
   {
     YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+      yysize = yysize1;
+    else
       return 2;
-    yysize = yysize1;
   }
 
   if (*yymsg_alloc < yysize)
@@ -1457,13 +1434,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 `-----------------------------------------------*/
 
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, yyscan_t scanner, ndt_t **ast, ndt_meta_t *meta, ndt_context_t *ctx)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, yyscan_t scanner, const ndt_t **ast, ndt_context_t *ctx)
 {
   YYUSE (yyvaluep);
   YYUSE (yylocationp);
   YYUSE (scanner);
   YYUSE (ast);
-  YYUSE (meta);
   YYUSE (ctx);
   if (!yymsg)
     yymsg = "Deleting";
@@ -1472,277 +1448,276 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   switch (yytype)
     {
-          case 59: /* INTEGER  */
-#line 191 "grammar.y" /* yacc.c:1257  */
+    case 63: /* INTEGER  */
+#line 203 "grammar.y" /* yacc.c:1257  */
+      { ndt_free(((*yyvaluep).string)); }
+#line 1455 "grammar.c" /* yacc.c:1257  */
+        break;
+
+    case 64: /* FLOATNUMBER  */
+#line 203 "grammar.y" /* yacc.c:1257  */
+      { ndt_free(((*yyvaluep).string)); }
+#line 1461 "grammar.c" /* yacc.c:1257  */
+        break;
+
+    case 65: /* STRINGLIT  */
+#line 203 "grammar.y" /* yacc.c:1257  */
+      { ndt_free(((*yyvaluep).string)); }
+#line 1467 "grammar.c" /* yacc.c:1257  */
+        break;
+
+    case 66: /* NAME_LOWER  */
+#line 203 "grammar.y" /* yacc.c:1257  */
+      { ndt_free(((*yyvaluep).string)); }
+#line 1473 "grammar.c" /* yacc.c:1257  */
+        break;
+
+    case 67: /* NAME_UPPER  */
+#line 203 "grammar.y" /* yacc.c:1257  */
       { ndt_free(((*yyvaluep).string)); }
 #line 1479 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 60: /* FLOATNUMBER  */
-#line 191 "grammar.y" /* yacc.c:1257  */
+    case 68: /* NAME_OTHER  */
+#line 203 "grammar.y" /* yacc.c:1257  */
       { ndt_free(((*yyvaluep).string)); }
 #line 1485 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 61: /* STRINGLIT  */
-#line 191 "grammar.y" /* yacc.c:1257  */
-      { ndt_free(((*yyvaluep).string)); }
+    case 71: /* input  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1491 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 62: /* NAME_LOWER  */
-#line 191 "grammar.y" /* yacc.c:1257  */
-      { ndt_free(((*yyvaluep).string)); }
+    case 72: /* datashape_or_module  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1497 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 63: /* NAME_UPPER  */
-#line 191 "grammar.y" /* yacc.c:1257  */
-      { ndt_free(((*yyvaluep).string)); }
+    case 73: /* datashape_with_ellipsis  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1503 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 64: /* NAME_OTHER  */
-#line 191 "grammar.y" /* yacc.c:1257  */
-      { ndt_free(((*yyvaluep).string)); }
+    case 74: /* fixed_ellipsis  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1509 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 66: /* input  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 75: /* datashape  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1515 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 67: /* datashape_or_module  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 76: /* dimensions  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1521 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 68: /* datashape_with_ellipsis  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 77: /* dimensions_nooption  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1527 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 69: /* fixed_ellipsis  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 78: /* dimensions_tail  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1533 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 70: /* datashape  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 79: /* dtype  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1539 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 71: /* dimensions  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 80: /* scalar  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1545 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 72: /* dimensions_nooption  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 86: /* character  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1551 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 73: /* dimensions_tail  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 87: /* string  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1557 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 74: /* dtype  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 88: /* fixed_string  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1563 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 75: /* scalar  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 93: /* bytes  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1569 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 76: /* signed  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 94: /* array_dimensions  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1575 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 77: /* unsigned  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 95: /* array  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1581 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 78: /* ieee_float  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 96: /* fixed_bytes  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1587 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 79: /* ieee_complex  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 97: /* ref  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1593 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 80: /* alias  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 98: /* categorical  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1599 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 81: /* character  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 99: /* typed_value_seq  */
+#line 200 "grammar.y" /* yacc.c:1257  */
+      { ndt_value_seq_del(((*yyvaluep).typed_value_seq)); }
 #line 1605 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 82: /* string  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 100: /* typed_value  */
+#line 199 "grammar.y" /* yacc.c:1257  */
+      { ndt_value_del(((*yyvaluep).typed_value)); }
 #line 1611 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 83: /* fixed_string  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 103: /* tuple_type  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1617 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 86: /* bytes  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 104: /* tuple_field_seq  */
+#line 198 "grammar.y" /* yacc.c:1257  */
+      { ndt_field_seq_del(((*yyvaluep).field_seq)); }
 #line 1623 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 87: /* fixed_bytes  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 105: /* tuple_field  */
+#line 197 "grammar.y" /* yacc.c:1257  */
+      { ndt_field_del(((*yyvaluep).field)); }
 #line 1629 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 88: /* ref  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 106: /* record_type  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1635 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 89: /* categorical  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 107: /* record_field_seq  */
+#line 198 "grammar.y" /* yacc.c:1257  */
+      { ndt_field_seq_del(((*yyvaluep).field_seq)); }
 #line 1641 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 90: /* typed_value_seq  */
-#line 188 "grammar.y" /* yacc.c:1257  */
-      { ndt_value_seq_del(((*yyvaluep).typed_value_seq)); }
+    case 108: /* record_field  */
+#line 197 "grammar.y" /* yacc.c:1257  */
+      { ndt_field_del(((*yyvaluep).field)); }
 #line 1647 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 91: /* typed_value  */
-#line 187 "grammar.y" /* yacc.c:1257  */
-      { ndt_value_del(((*yyvaluep).typed_value)); }
+    case 109: /* field_name_or_tag  */
+#line 203 "grammar.y" /* yacc.c:1257  */
+      { ndt_free(((*yyvaluep).string)); }
 #line 1653 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 94: /* tuple_type  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 110: /* union_type  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1659 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 95: /* tuple_field_seq  */
-#line 186 "grammar.y" /* yacc.c:1257  */
+    case 111: /* union_member_seq  */
+#line 198 "grammar.y" /* yacc.c:1257  */
       { ndt_field_seq_del(((*yyvaluep).field_seq)); }
 #line 1665 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 96: /* tuple_field  */
-#line 185 "grammar.y" /* yacc.c:1257  */
+    case 112: /* union_member  */
+#line 197 "grammar.y" /* yacc.c:1257  */
       { ndt_field_del(((*yyvaluep).field)); }
 #line 1671 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 97: /* record_type  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
+    case 113: /* arguments_opt  */
+#line 202 "grammar.y" /* yacc.c:1257  */
+      { ndt_attr_seq_del(((*yyvaluep).attribute_seq)); }
 #line 1677 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 98: /* record_field_seq  */
-#line 186 "grammar.y" /* yacc.c:1257  */
-      { ndt_field_seq_del(((*yyvaluep).field_seq)); }
+    case 114: /* attribute_seq  */
+#line 202 "grammar.y" /* yacc.c:1257  */
+      { ndt_attr_seq_del(((*yyvaluep).attribute_seq)); }
 #line 1683 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 99: /* record_field  */
-#line 185 "grammar.y" /* yacc.c:1257  */
-      { ndt_field_del(((*yyvaluep).field)); }
+    case 115: /* attribute  */
+#line 201 "grammar.y" /* yacc.c:1257  */
+      { ndt_attr_del(((*yyvaluep).attribute)); }
 #line 1689 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 100: /* record_field_name  */
-#line 191 "grammar.y" /* yacc.c:1257  */
-      { ndt_free(((*yyvaluep).string)); }
+    case 116: /* untyped_value_seq  */
+#line 204 "grammar.y" /* yacc.c:1257  */
+      { ndt_string_seq_del(((*yyvaluep).string_seq)); }
 #line 1695 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 101: /* arguments_opt  */
-#line 190 "grammar.y" /* yacc.c:1257  */
-      { ndt_attr_seq_del(((*yyvaluep).attribute_seq)); }
+    case 117: /* untyped_value  */
+#line 203 "grammar.y" /* yacc.c:1257  */
+      { ndt_free(((*yyvaluep).string)); }
 #line 1701 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 102: /* attribute_seq  */
-#line 190 "grammar.y" /* yacc.c:1257  */
-      { ndt_attr_seq_del(((*yyvaluep).attribute_seq)); }
+    case 118: /* function_type  */
+#line 196 "grammar.y" /* yacc.c:1257  */
+      { ndt_decref(((*yyvaluep).ndt)); }
 #line 1707 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 103: /* attribute  */
-#line 189 "grammar.y" /* yacc.c:1257  */
-      { ndt_attr_del(((*yyvaluep).attribute)); }
-#line 1713 "grammar.c" /* yacc.c:1257  */
-        break;
-
-    case 104: /* untyped_value_seq  */
-#line 192 "grammar.y" /* yacc.c:1257  */
-      { ndt_string_seq_del(((*yyvaluep).string_seq)); }
-#line 1719 "grammar.c" /* yacc.c:1257  */
-        break;
-
-    case 105: /* untyped_value  */
-#line 191 "grammar.y" /* yacc.c:1257  */
-      { ndt_free(((*yyvaluep).string)); }
-#line 1725 "grammar.c" /* yacc.c:1257  */
-        break;
-
-    case 106: /* function_type  */
-#line 184 "grammar.y" /* yacc.c:1257  */
-      { ndt_del(((*yyvaluep).ndt)); }
-#line 1731 "grammar.c" /* yacc.c:1257  */
-        break;
-
-    case 107: /* type_seq_or_void  */
-#line 193 "grammar.y" /* yacc.c:1257  */
+    case 119: /* type_seq_or_void  */
+#line 205 "grammar.y" /* yacc.c:1257  */
       { ndt_type_seq_del(((*yyvaluep).type_seq)); }
-#line 1737 "grammar.c" /* yacc.c:1257  */
+#line 1713 "grammar.c" /* yacc.c:1257  */
         break;
 
-    case 108: /* type_seq  */
-#line 193 "grammar.y" /* yacc.c:1257  */
+    case 120: /* type_seq  */
+#line 205 "grammar.y" /* yacc.c:1257  */
       { ndt_type_seq_del(((*yyvaluep).type_seq)); }
-#line 1743 "grammar.c" /* yacc.c:1257  */
+#line 1719 "grammar.c" /* yacc.c:1257  */
         break;
 
-
       default:
         break;
     }
@@ -1757,7 +1732,7 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocatio
 `----------*/
 
 int
-yyparse (yyscan_t scanner, ndt_t **ast, ndt_meta_t *meta, ndt_context_t *ctx)
+yyparse (yyscan_t scanner, const ndt_t **ast, ndt_context_t *ctx)
 {
 /* The lookahead symbol.  */
 int yychar;
@@ -1847,7 +1822,7 @@ YYLTYPE yylloc = yyloc_default;
   yychar = YYEMPTY; /* Cause a token to be read.  */
 
 /* User initialization code.  */
-#line 76 "grammar.y" /* yacc.c:1429  */
+#line 75 "grammar.y" /* yacc.c:1431  */
 {
    yylloc.first_line = 1;
    yylloc.first_column = 1;
@@ -1855,27 +1830,35 @@ YYLTYPE yylloc = yyloc_default;
    yylloc.last_column = 1;
 }
 
-#line 1859 "grammar.c" /* yacc.c:1429  */
+#line 1834 "grammar.c" /* yacc.c:1431  */
   yylsp[0] = yylloc;
   goto yysetstate;
 
+
 /*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
+| yynewstate -- push a new state, which is found in yystate.  |
 `------------------------------------------------------------*/
- yynewstate:
+yynewstate:
   /* In all cases, when you get here, the value and location stacks
      have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
- yysetstate:
-  *yyssp = yystate;
+
+/*--------------------------------------------------------------------.
+| yynewstate -- set current state (the top of the stack) to yystate.  |
+`--------------------------------------------------------------------*/
+yysetstate:
+  *yyssp = (yytype_int16) yystate;
 
   if (yyss + yystacksize - 1 <= yyssp)
+#if !defined yyoverflow && !defined YYSTACK_RELOCATE
+    goto yyexhaustedlab;
+#else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
+      YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
 
-#ifdef yyoverflow
+# if defined yyoverflow
       {
         /* Give user a chance to reallocate the stack.  Use copies of
            these so that the &'s don't force the real ones into
@@ -1893,15 +1876,11 @@ YYLTYPE yylloc = yyloc_default;
                     &yyvs1, yysize * sizeof (*yyvsp),
                     &yyls1, yysize * sizeof (*yylsp),
                     &yystacksize);
-
-        yyls = yyls1;
         yyss = yyss1;
         yyvs = yyvs1;
+        yyls = yyls1;
       }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
+# else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
         goto yyexhaustedlab;
@@ -1918,23 +1897,23 @@ YYLTYPE yylloc = yyloc_default;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
         YYSTACK_RELOCATE (yyls_alloc, yyls);
-#  undef YYSTACK_RELOCATE
+# undef YYSTACK_RELOCATE
         if (yyss1 != yyssa)
           YYSTACK_FREE (yyss1);
       }
 # endif
-#endif /* no yyoverflow */
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
       yylsp = yyls + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
+                  (unsigned long) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
         YYABORT;
     }
+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
@@ -1943,11 +1922,11 @@ YYLTYPE yylloc = yyloc_default;
 
   goto yybackup;
 
+
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
-
   /* Do appropriate processing given the current state.  Read a
      lookahead token if we need one and don't already have one.  */
 
@@ -2020,7 +1999,7 @@ yydefault:
 
 
 /*-----------------------------.
-| yyreduce -- Do a reduction.  |
+| yyreduce -- do a reduction.  |
 `-----------------------------*/
 yyreduce:
   /* yyn is the number of a rule to reduce with.  */
@@ -2036,801 +2015,932 @@ yyreduce:
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 
-  /* Default location.  */
+  /* Default location. */
   YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+  yyerror_range[1] = yyloc;
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
         case 2:
-#line 198 "grammar.y" /* yacc.c:1646  */
+#line 214 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[-1].ndt);  *ast = (yyval.ndt); YYACCEPT; }
-#line 2048 "grammar.c" /* yacc.c:1646  */
+#line 2028 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 3:
-#line 202 "grammar.y" /* yacc.c:1646  */
+#line 218 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2054 "grammar.c" /* yacc.c:1646  */
+#line 2034 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 4:
-#line 203 "grammar.y" /* yacc.c:1646  */
+#line 219 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2060 "grammar.c" /* yacc.c:1646  */
+#line 2040 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 5:
-#line 204 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_module((yyvsp[-3].string), (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2066 "grammar.c" /* yacc.c:1646  */
+#line 220 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_module((yyvsp[-3].string), (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2046 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 6:
-#line 208 "grammar.y" /* yacc.c:1646  */
+#line 224 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2072 "grammar.c" /* yacc.c:1646  */
+#line 2052 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 7:
-#line 209 "grammar.y" /* yacc.c:1646  */
+#line 225 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2078 "grammar.c" /* yacc.c:1646  */
+#line 2058 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 8:
-#line 210 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_contig((yyvsp[-3].string), (yyvsp[-1].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2084 "grammar.c" /* yacc.c:1646  */
+#line 226 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_contig((yyvsp[-3].string), (ndt_t *)(yyvsp[-1].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2064 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 9:
-#line 211 "grammar.y" /* yacc.c:1646  */
+#line 227 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = mk_var_ellipsis((yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2090 "grammar.c" /* yacc.c:1646  */
+#line 2070 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 10:
-#line 212 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_var_ellipsis(ndt_option((yyvsp[0].ndt)), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2096 "grammar.c" /* yacc.c:1646  */
+#line 228 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = (yyvsp[0].ndt); }
+#line 2076 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 11:
-#line 215 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_ellipsis_dim(NULL, (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2102 "grammar.c" /* yacc.c:1646  */
+#line 231 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_ellipsis_dim(NULL, (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2082 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 12:
-#line 216 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_ellipsis_dim((yyvsp[-3].string), (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2108 "grammar.c" /* yacc.c:1646  */
+#line 232 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_ellipsis_dim((yyvsp[-3].string), (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2088 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 13:
-#line 219 "grammar.y" /* yacc.c:1646  */
+#line 235 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2114 "grammar.c" /* yacc.c:1646  */
+#line 2094 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 14:
-#line 220 "grammar.y" /* yacc.c:1646  */
+#line 236 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2120 "grammar.c" /* yacc.c:1646  */
+#line 2100 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 15:
-#line 221 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_option((yyvsp[0].ndt)); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2126 "grammar.c" /* yacc.c:1646  */
+#line 239 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = (yyvsp[0].ndt); }
+#line 2106 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 16:
-#line 224 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2132 "grammar.c" /* yacc.c:1646  */
+#line 240 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_contig((yyvsp[-3].string), (ndt_t *)(yyvsp[-1].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2112 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 17:
-#line 225 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_option((yyvsp[0].ndt)); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2138 "grammar.c" /* yacc.c:1646  */
+#line 241 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_fortran((yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2118 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 18:
-#line 226 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_contig((yyvsp[-3].string), (yyvsp[-1].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2144 "grammar.c" /* yacc.c:1646  */
+#line 244 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_fixed_dim_from_shape((yyvsp[-2].string), (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2124 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 19:
-#line 227 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_fortran((yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2150 "grammar.c" /* yacc.c:1646  */
+#line 245 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_fixed_dim_from_attrs((yyvsp[-3].attribute_seq), (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2130 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 20:
-#line 230 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_fixed_dim_from_shape((yyvsp[-2].string), (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2156 "grammar.c" /* yacc.c:1646  */
+#line 246 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_symbolic_dim((yyvsp[-2].string), (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2136 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 21:
-#line 231 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_fixed_dim_from_attrs((yyvsp[-3].attribute_seq), (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2162 "grammar.c" /* yacc.c:1646  */
+#line 247 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_var_dim((yyvsp[-2].attribute_seq), (yyvsp[0].ndt), false, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2142 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 22:
-#line 232 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_symbolic_dim((yyvsp[-2].string), (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2168 "grammar.c" /* yacc.c:1646  */
+#line 248 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_var_dim((yyvsp[-2].attribute_seq), (yyvsp[0].ndt), true, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2148 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 23:
-#line 233 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_var_dim(meta, (yyvsp[-2].attribute_seq), (yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2174 "grammar.c" /* yacc.c:1646  */
+#line 252 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = (yyvsp[0].ndt); }
+#line 2154 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 24:
-#line 236 "grammar.y" /* yacc.c:1646  */
+#line 253 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2180 "grammar.c" /* yacc.c:1646  */
+#line 2160 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 25:
-#line 237 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_option((yyvsp[0].ndt)); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2186 "grammar.c" /* yacc.c:1646  */
+#line 256 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_any_kind((yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2166 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 26:
-#line 238 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2192 "grammar.c" /* yacc.c:1646  */
+#line 257 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_scalar_kind((yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2172 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 27:
-#line 241 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_any_kind(ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2198 "grammar.c" /* yacc.c:1646  */
+#line 258 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = (yyvsp[0].ndt); }
+#line 2178 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 28:
-#line 242 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_scalar_kind(ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2204 "grammar.c" /* yacc.c:1646  */
+#line 259 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = (yyvsp[0].ndt); }
+#line 2184 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 29:
-#line 243 "grammar.y" /* yacc.c:1646  */
+#line 260 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2210 "grammar.c" /* yacc.c:1646  */
+#line 2190 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 30:
-#line 244 "grammar.y" /* yacc.c:1646  */
+#line 261 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2216 "grammar.c" /* yacc.c:1646  */
+#line 2196 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 31:
-#line 245 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2222 "grammar.c" /* yacc.c:1646  */
+#line 262 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_nominal((yyvsp[0].string), NULL, false, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2202 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 32:
-#line 246 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_nominal((yyvsp[0].string), NULL, ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2228 "grammar.c" /* yacc.c:1646  */
+#line 263 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_nominal((yyvsp[0].string), NULL, true, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2208 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 33:
-#line 247 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_constr((yyvsp[-3].string), (yyvsp[-1].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2234 "grammar.c" /* yacc.c:1646  */
+#line 264 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_constr((yyvsp[-3].string), (yyvsp[-1].ndt), false, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2214 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 34:
-#line 248 "grammar.y" /* yacc.c:1646  */
-    { (void)(yyvsp[-3].string); (void)(yyvsp[-1].attribute_seq); ndt_free((yyvsp[-3].string)); ndt_attr_seq_del((yyvsp[-1].attribute_seq)); (yyval.ndt) = NULL;
-                                            ndt_err_format(ctx, NDT_NotImplementedError, "general attributes are not implemented");
-                                            YYABORT; }
-#line 2242 "grammar.c" /* yacc.c:1646  */
+#line 265 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_constr((yyvsp[-3].string), (yyvsp[-1].ndt), true, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2220 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 35:
-#line 251 "grammar.y" /* yacc.c:1646  */
+#line 266 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = ndt_typevar((yyvsp[0].string), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2248 "grammar.c" /* yacc.c:1646  */
+#line 2226 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 36:
-#line 254 "grammar.y" /* yacc.c:1646  */
+#line 269 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = ndt_primitive(Bool, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2254 "grammar.c" /* yacc.c:1646  */
+#line 2232 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 37:
-#line 255 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_signed_kind(ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2260 "grammar.c" /* yacc.c:1646  */
+#line 270 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_signed_kind((yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2238 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 38:
-#line 256 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2266 "grammar.c" /* yacc.c:1646  */
+#line 271 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_primitive((yyvsp[0].tag), (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2244 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 39:
-#line 257 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_unsigned_kind(ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2272 "grammar.c" /* yacc.c:1646  */
+#line 272 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_unsigned_kind((yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2250 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 40:
-#line 258 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2278 "grammar.c" /* yacc.c:1646  */
+#line 273 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_primitive((yyvsp[0].tag), (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2256 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 41:
-#line 259 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_float_kind(ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2284 "grammar.c" /* yacc.c:1646  */
+#line 274 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_float_kind((yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2262 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 42:
-#line 260 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2290 "grammar.c" /* yacc.c:1646  */
+#line 275 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_primitive(BFloat16, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2268 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 43:
-#line 261 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_complex_kind(ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2296 "grammar.c" /* yacc.c:1646  */
+#line 276 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_primitive((yyvsp[0].tag), (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2274 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 44:
-#line 262 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2302 "grammar.c" /* yacc.c:1646  */
+#line 277 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_complex_kind((yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2280 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 45:
-#line 263 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2308 "grammar.c" /* yacc.c:1646  */
+#line 278 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_primitive(BComplex32, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2286 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 46:
-#line 264 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2314 "grammar.c" /* yacc.c:1646  */
+#line 279 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_primitive((yyvsp[0].tag), (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2292 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 47:
-#line 265 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2320 "grammar.c" /* yacc.c:1646  */
+#line 280 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_from_alias((yyvsp[0].alias), (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2298 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 48:
-#line 266 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_fixed_string_kind(ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2326 "grammar.c" /* yacc.c:1646  */
+#line 281 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = (yyvsp[0].ndt); }
+#line 2304 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 49:
-#line 267 "grammar.y" /* yacc.c:1646  */
+#line 282 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2332 "grammar.c" /* yacc.c:1646  */
+#line 2310 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 50:
-#line 268 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2338 "grammar.c" /* yacc.c:1646  */
+#line 283 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_fixed_string_kind((yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2316 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 51:
-#line 269 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_fixed_bytes_kind(ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2344 "grammar.c" /* yacc.c:1646  */
+#line 284 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = (yyvsp[0].ndt); }
+#line 2322 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 52:
-#line 270 "grammar.y" /* yacc.c:1646  */
+#line 285 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2350 "grammar.c" /* yacc.c:1646  */
+#line 2328 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 53:
-#line 271 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2356 "grammar.c" /* yacc.c:1646  */
+#line 286 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_fixed_bytes_kind((yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2334 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 54:
-#line 272 "grammar.y" /* yacc.c:1646  */
+#line 287 "grammar.y" /* yacc.c:1652  */
     { (yyval.ndt) = (yyvsp[0].ndt); }
-#line 2362 "grammar.c" /* yacc.c:1646  */
+#line 2340 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 55:
-#line 275 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Int8, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2368 "grammar.c" /* yacc.c:1646  */
+#line 288 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = (yyvsp[0].ndt); }
+#line 2346 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 56:
-#line 276 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Int16, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2374 "grammar.c" /* yacc.c:1646  */
+#line 289 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = (yyvsp[0].ndt); }
+#line 2352 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 57:
-#line 277 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Int32, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2380 "grammar.c" /* yacc.c:1646  */
+#line 292 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Int8; }
+#line 2358 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 58:
-#line 278 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Int64, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2386 "grammar.c" /* yacc.c:1646  */
+#line 293 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Int16; }
+#line 2364 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 59:
-#line 281 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Uint8, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2392 "grammar.c" /* yacc.c:1646  */
+#line 294 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Int32; }
+#line 2370 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 60:
-#line 282 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Uint16, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2398 "grammar.c" /* yacc.c:1646  */
+#line 295 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Int64; }
+#line 2376 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 61:
-#line 283 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Uint32, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2404 "grammar.c" /* yacc.c:1646  */
+#line 298 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Uint8; }
+#line 2382 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 62:
-#line 284 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Uint64, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2410 "grammar.c" /* yacc.c:1646  */
+#line 299 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Uint16; }
+#line 2388 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 63:
-#line 287 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Float16, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2416 "grammar.c" /* yacc.c:1646  */
+#line 300 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Uint32; }
+#line 2394 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 64:
-#line 288 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Float32, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2422 "grammar.c" /* yacc.c:1646  */
+#line 301 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Uint64; }
+#line 2400 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 65:
-#line 289 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Float64, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2428 "grammar.c" /* yacc.c:1646  */
+#line 304 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Float16; }
+#line 2406 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 66:
-#line 292 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Complex32, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2434 "grammar.c" /* yacc.c:1646  */
+#line 305 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Float32; }
+#line 2412 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 67:
-#line 293 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Complex64, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2440 "grammar.c" /* yacc.c:1646  */
+#line 306 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Float64; }
+#line 2418 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 68:
-#line 294 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_primitive(Complex128, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2446 "grammar.c" /* yacc.c:1646  */
+#line 309 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Complex32; }
+#line 2424 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 69:
-#line 298 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_from_alias(Intptr, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2452 "grammar.c" /* yacc.c:1646  */
+#line 310 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Complex64; }
+#line 2430 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 70:
-#line 299 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_from_alias(Uintptr, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2458 "grammar.c" /* yacc.c:1646  */
+#line 311 "grammar.y" /* yacc.c:1652  */
+    { (yyval.tag) = Complex128; }
+#line 2436 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 71:
-#line 300 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_from_alias(Size, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2464 "grammar.c" /* yacc.c:1646  */
+#line 315 "grammar.y" /* yacc.c:1652  */
+    { (yyval.alias) = Intptr; }
+#line 2442 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 72:
-#line 303 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_char(Utf32, ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2470 "grammar.c" /* yacc.c:1646  */
+#line 316 "grammar.y" /* yacc.c:1652  */
+    { (yyval.alias) = Uintptr; }
+#line 2448 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 73:
-#line 304 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_char((yyvsp[-1].encoding), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2476 "grammar.c" /* yacc.c:1646  */
+#line 317 "grammar.y" /* yacc.c:1652  */
+    { (yyval.alias) = Size; }
+#line 2454 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 74:
-#line 307 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_string(ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2482 "grammar.c" /* yacc.c:1646  */
+#line 320 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_char(Utf32, (yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2460 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 75:
-#line 310 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_fixed_string((yyvsp[-1].string), Utf8, ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2488 "grammar.c" /* yacc.c:1646  */
+#line 321 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_char((yyvsp[-1].encoding), (yyvsp[-4].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2466 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 76:
-#line 311 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_fixed_string((yyvsp[-3].string), (yyvsp[-1].encoding), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2494 "grammar.c" /* yacc.c:1646  */
+#line 324 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = ndt_string((yyvsp[-1].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2472 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 77:
-#line 314 "grammar.y" /* yacc.c:1646  */
-    { (yyval.uint32) = 0; }
-#line 2500 "grammar.c" /* yacc.c:1646  */
+#line 327 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_fixed_string((yyvsp[-1].string), Utf8, (yyvsp[-4].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2478 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 78:
-#line 315 "grammar.y" /* yacc.c:1646  */
-    { (yyval.uint32) = NDT_SYS_BIG_ENDIAN ? NDT_BIG_ENDIAN : NDT_LITTLE_ENDIAN; }
-#line 2506 "grammar.c" /* yacc.c:1646  */
+#line 328 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_fixed_string((yyvsp[-3].string), (yyvsp[-1].encoding), (yyvsp[-6].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2484 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 79:
-#line 316 "grammar.y" /* yacc.c:1646  */
-    { (yyval.uint32) = NDT_LITTLE_ENDIAN; }
-#line 2512 "grammar.c" /* yacc.c:1646  */
+#line 331 "grammar.y" /* yacc.c:1652  */
+    { (yyval.uint32) = (yyvsp[-1].uint32) | (yyvsp[0].uint32); }
+#line 2490 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 80:
-#line 317 "grammar.y" /* yacc.c:1646  */
-    { (yyval.uint32) = NDT_BIG_ENDIAN; }
-#line 2518 "grammar.c" /* yacc.c:1646  */
+#line 334 "grammar.y" /* yacc.c:1652  */
+    { (yyval.uint32) = 0; }
+#line 2496 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 81:
-#line 318 "grammar.y" /* yacc.c:1646  */
-    { (yyval.uint32) = 0; }
-#line 2524 "grammar.c" /* yacc.c:1646  */
+#line 335 "grammar.y" /* yacc.c:1652  */
+    { (yyval.uint32) = NDT_OPTION; }
+#line 2502 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 82:
-#line 321 "grammar.y" /* yacc.c:1646  */
-    { (yyval.encoding) = encoding_from_string((yyvsp[0].string), ctx); if (ndt_err_occurred(ctx)) YYABORT; }
-#line 2530 "grammar.c" /* yacc.c:1646  */
+#line 338 "grammar.y" /* yacc.c:1652  */
+    { (yyval.uint32) = 0; }
+#line 2508 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 83:
-#line 324 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_bytes((yyvsp[0].attribute_seq), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2536 "grammar.c" /* yacc.c:1646  */
+#line 339 "grammar.y" /* yacc.c:1652  */
+    { (yyval.uint32) = NDT_SYS_BIG_ENDIAN ? NDT_BIG_ENDIAN : NDT_LITTLE_ENDIAN; }
+#line 2514 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 84:
-#line 327 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_fixed_bytes((yyvsp[-1].attribute_seq), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2542 "grammar.c" /* yacc.c:1646  */
+#line 340 "grammar.y" /* yacc.c:1652  */
+    { (yyval.uint32) = NDT_LITTLE_ENDIAN; }
+#line 2520 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 85:
-#line 330 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_ref((yyvsp[-1].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2548 "grammar.c" /* yacc.c:1646  */
+#line 341 "grammar.y" /* yacc.c:1652  */
+    { (yyval.uint32) = NDT_BIG_ENDIAN; }
+#line 2526 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 86:
-#line 331 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = ndt_ref((yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2554 "grammar.c" /* yacc.c:1646  */
+#line 342 "grammar.y" /* yacc.c:1652  */
+    { (yyval.uint32) = 0; }
+#line 2532 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 87:
-#line 334 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_categorical((yyvsp[-1].typed_value_seq), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2560 "grammar.c" /* yacc.c:1646  */
+#line 345 "grammar.y" /* yacc.c:1652  */
+    { (yyval.encoding) = encoding_from_string((yyvsp[0].string), ctx); if (ndt_err_occurred(ctx)) YYABORT; }
+#line 2538 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 88:
-#line 337 "grammar.y" /* yacc.c:1646  */
-    { (yyval.typed_value_seq) = ndt_value_seq_new((yyvsp[0].typed_value), ctx); if ((yyval.typed_value_seq) == NULL) YYABORT; }
-#line 2566 "grammar.c" /* yacc.c:1646  */
+#line 348 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_bytes((yyvsp[0].attribute_seq), (yyvsp[-2].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2544 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 89:
-#line 338 "grammar.y" /* yacc.c:1646  */
-    { (yyval.typed_value_seq) = ndt_value_seq_append((yyvsp[-2].typed_value_seq), (yyvsp[0].typed_value), ctx); if ((yyval.typed_value_seq) == NULL) YYABORT; }
-#line 2572 "grammar.c" /* yacc.c:1646  */
+#line 351 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = (yyvsp[0].ndt); }
+#line 2550 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 90:
-#line 341 "grammar.y" /* yacc.c:1646  */
-    { (yyval.typed_value) = ndt_value_from_number(ValInt64, (yyvsp[0].string), ctx); if ((yyval.typed_value) == NULL) YYABORT; }
-#line 2578 "grammar.c" /* yacc.c:1646  */
+#line 352 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_array_ellipsis((yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2556 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 91:
-#line 342 "grammar.y" /* yacc.c:1646  */
-    { (yyval.typed_value) = ndt_value_from_number(ValFloat64, (yyvsp[0].string), ctx); if ((yyval.typed_value) == NULL) YYABORT; }
-#line 2584 "grammar.c" /* yacc.c:1646  */
+#line 353 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_array_ellipsis((yyvsp[0].ndt), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2562 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 92:
-#line 343 "grammar.y" /* yacc.c:1646  */
-    { (yyval.typed_value) = ndt_value_from_string((yyvsp[0].string), ctx); if ((yyval.typed_value) == NULL) YYABORT; }
-#line 2590 "grammar.c" /* yacc.c:1646  */
+#line 356 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_array((yyvsp[0].ndt), (yyvsp[-3].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2568 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 93:
-#line 344 "grammar.y" /* yacc.c:1646  */
-    { (yyval.typed_value) = ndt_value_na(ctx); if ((yyval.typed_value) == NULL) YYABORT; }
-#line 2596 "grammar.c" /* yacc.c:1646  */
+#line 357 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_array((yyvsp[0].ndt), (yyvsp[-3].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2574 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 94:
-#line 347 "grammar.y" /* yacc.c:1646  */
-    { (yyval.variadic_flag) = Nonvariadic; }
-#line 2602 "grammar.c" /* yacc.c:1646  */
+#line 360 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_fixed_bytes((yyvsp[-1].attribute_seq), (yyvsp[-4].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2580 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 95:
-#line 348 "grammar.y" /* yacc.c:1646  */
-    { (yyval.variadic_flag) = Variadic; }
-#line 2608 "grammar.c" /* yacc.c:1646  */
+#line 363 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_ref((yyvsp[-1].ndt), (yyvsp[-4].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2586 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 96:
-#line 351 "grammar.y" /* yacc.c:1646  */
-    { (yyval.variadic_flag) = Nonvariadic; }
-#line 2614 "grammar.c" /* yacc.c:1646  */
+#line 364 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_ref((yyvsp[0].ndt), (yyvsp[-2].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2592 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 97:
-#line 352 "grammar.y" /* yacc.c:1646  */
-    { (yyval.variadic_flag) = Nonvariadic; }
-#line 2620 "grammar.c" /* yacc.c:1646  */
+#line 367 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_categorical((yyvsp[-1].typed_value_seq), (yyvsp[-4].uint32), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2598 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 98:
-#line 353 "grammar.y" /* yacc.c:1646  */
-    { (yyval.variadic_flag) = Variadic; }
-#line 2626 "grammar.c" /* yacc.c:1646  */
+#line 370 "grammar.y" /* yacc.c:1652  */
+    { (yyval.typed_value_seq) = ndt_value_seq_new((yyvsp[0].typed_value), ctx); if ((yyval.typed_value_seq) == NULL) YYABORT; }
+#line 2604 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 99:
-#line 356 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_tuple((yyvsp[-1].variadic_flag), NULL, NULL, ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2632 "grammar.c" /* yacc.c:1646  */
+#line 371 "grammar.y" /* yacc.c:1652  */
+    { (yyval.typed_value_seq) = ndt_value_seq_append((yyvsp[-2].typed_value_seq), (yyvsp[0].typed_value), ctx); if ((yyval.typed_value_seq) == NULL) YYABORT; }
+#line 2610 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 100:
-#line 357 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_tuple((yyvsp[-1].variadic_flag), (yyvsp[-2].field_seq), NULL, ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2638 "grammar.c" /* yacc.c:1646  */
+#line 374 "grammar.y" /* yacc.c:1652  */
+    { (yyval.typed_value) = ndt_value_from_number(ValInt64, (yyvsp[0].string), ctx); if ((yyval.typed_value) == NULL) YYABORT; }
+#line 2616 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 101:
-#line 358 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_tuple(Nonvariadic, (yyvsp[-3].field_seq), (yyvsp[-1].attribute_seq), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2644 "grammar.c" /* yacc.c:1646  */
+#line 375 "grammar.y" /* yacc.c:1652  */
+    { (yyval.typed_value) = ndt_value_from_number(ValFloat64, (yyvsp[0].string), ctx); if ((yyval.typed_value) == NULL) YYABORT; }
+#line 2622 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 102:
-#line 361 "grammar.y" /* yacc.c:1646  */
-    { (yyval.field_seq) = ndt_field_seq_new((yyvsp[0].field), ctx); if ((yyval.field_seq) == NULL) YYABORT; }
-#line 2650 "grammar.c" /* yacc.c:1646  */
+#line 376 "grammar.y" /* yacc.c:1652  */
+    { (yyval.typed_value) = ndt_value_from_string((yyvsp[0].string), ctx); if ((yyval.typed_value) == NULL) YYABORT; }
+#line 2628 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 103:
-#line 362 "grammar.y" /* yacc.c:1646  */
-    { (yyval.field_seq) = ndt_field_seq_append((yyvsp[-2].field_seq), (yyvsp[0].field), ctx); if ((yyval.field_seq) == NULL) YYABORT; }
-#line 2656 "grammar.c" /* yacc.c:1646  */
+#line 377 "grammar.y" /* yacc.c:1652  */
+    { (yyval.typed_value) = ndt_value_na(ctx); if ((yyval.typed_value) == NULL) YYABORT; }
+#line 2634 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 104:
-#line 365 "grammar.y" /* yacc.c:1646  */
-    { (yyval.field) = mk_field(NULL, (yyvsp[0].ndt), NULL, ctx); if ((yyval.field) == NULL) YYABORT; }
-#line 2662 "grammar.c" /* yacc.c:1646  */
+#line 380 "grammar.y" /* yacc.c:1652  */
+    { (yyval.variadic_flag) = Nonvariadic; }
+#line 2640 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 105:
-#line 366 "grammar.y" /* yacc.c:1646  */
-    { (yyval.field) = mk_field(NULL, (yyvsp[-3].ndt), (yyvsp[-1].attribute_seq), ctx); if ((yyval.field) == NULL) YYABORT; }
-#line 2668 "grammar.c" /* yacc.c:1646  */
+#line 381 "grammar.y" /* yacc.c:1652  */
+    { (yyval.variadic_flag) = Variadic; }
+#line 2646 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 106:
-#line 369 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_record((yyvsp[-1].variadic_flag), NULL, NULL, ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2674 "grammar.c" /* yacc.c:1646  */
+#line 384 "grammar.y" /* yacc.c:1652  */
+    { (yyval.variadic_flag) = Nonvariadic; }
+#line 2652 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 107:
-#line 370 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_record((yyvsp[-1].variadic_flag), (yyvsp[-2].field_seq), NULL, ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2680 "grammar.c" /* yacc.c:1646  */
+#line 385 "grammar.y" /* yacc.c:1652  */
+    { (yyval.variadic_flag) = Nonvariadic; }
+#line 2658 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 108:
-#line 371 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_record(Nonvariadic, (yyvsp[-3].field_seq), (yyvsp[-1].attribute_seq), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2686 "grammar.c" /* yacc.c:1646  */
+#line 386 "grammar.y" /* yacc.c:1652  */
+    { (yyval.variadic_flag) = Variadic; }
+#line 2664 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 109:
-#line 374 "grammar.y" /* yacc.c:1646  */
-    { (yyval.field_seq) = ndt_field_seq_new((yyvsp[0].field), ctx); if ((yyval.field_seq) == NULL) YYABORT; }
-#line 2692 "grammar.c" /* yacc.c:1646  */
+#line 389 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_tuple((yyvsp[-1].variadic_flag), NULL, NULL, false, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2670 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 110:
-#line 375 "grammar.y" /* yacc.c:1646  */
-    { (yyval.field_seq) = ndt_field_seq_append((yyvsp[-2].field_seq), (yyvsp[0].field), ctx); if ((yyval.field_seq) == NULL) YYABORT; }
-#line 2698 "grammar.c" /* yacc.c:1646  */
+#line 390 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_tuple((yyvsp[-1].variadic_flag), (yyvsp[-2].field_seq), NULL, false, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2676 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 111:
-#line 378 "grammar.y" /* yacc.c:1646  */
-    { (yyval.field) = mk_field((yyvsp[-2].string), (yyvsp[0].ndt), NULL, ctx); if ((yyval.field) == NULL) YYABORT; }
-#line 2704 "grammar.c" /* yacc.c:1646  */
+#line 391 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_tuple(Nonvariadic, (yyvsp[-3].field_seq), (yyvsp[-1].attribute_seq), false, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2682 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 112:
-#line 379 "grammar.y" /* yacc.c:1646  */
-    { (yyval.field) = mk_field((yyvsp[-5].string), (yyvsp[-3].ndt), (yyvsp[-1].attribute_seq), ctx); if ((yyval.field) == NULL) YYABORT; }
-#line 2710 "grammar.c" /* yacc.c:1646  */
+#line 392 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_tuple((yyvsp[-1].variadic_flag), NULL, NULL, true, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2688 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 113:
-#line 382 "grammar.y" /* yacc.c:1646  */
-    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
-#line 2716 "grammar.c" /* yacc.c:1646  */
+#line 393 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_tuple((yyvsp[-1].variadic_flag), (yyvsp[-2].field_seq), NULL, true, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2694 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 114:
-#line 383 "grammar.y" /* yacc.c:1646  */
-    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
-#line 2722 "grammar.c" /* yacc.c:1646  */
+#line 394 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_tuple(Nonvariadic, (yyvsp[-3].field_seq), (yyvsp[-1].attribute_seq), true, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2700 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 115:
-#line 384 "grammar.y" /* yacc.c:1646  */
-    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
-#line 2728 "grammar.c" /* yacc.c:1646  */
+#line 397 "grammar.y" /* yacc.c:1652  */
+    { (yyval.field_seq) = ndt_field_seq_new((yyvsp[0].field), ctx); if ((yyval.field_seq) == NULL) YYABORT; }
+#line 2706 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 116:
-#line 387 "grammar.y" /* yacc.c:1646  */
-    { (yyval.attribute_seq) = NULL; }
-#line 2734 "grammar.c" /* yacc.c:1646  */
+#line 398 "grammar.y" /* yacc.c:1652  */
+    { (yyval.field_seq) = ndt_field_seq_append((yyvsp[-2].field_seq), (yyvsp[0].field), ctx); if ((yyval.field_seq) == NULL) YYABORT; }
+#line 2712 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 117:
-#line 388 "grammar.y" /* yacc.c:1646  */
-    { (yyval.attribute_seq) = (yyvsp[-1].attribute_seq); if ((yyval.attribute_seq) == NULL) YYABORT; }
-#line 2740 "grammar.c" /* yacc.c:1646  */
+#line 401 "grammar.y" /* yacc.c:1652  */
+    { (yyval.field) = mk_field(NULL, (yyvsp[0].ndt), NULL, ctx); if ((yyval.field) == NULL) YYABORT; }
+#line 2718 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 118:
-#line 391 "grammar.y" /* yacc.c:1646  */
-    { (yyval.attribute_seq) = ndt_attr_seq_new((yyvsp[0].attribute), ctx); if ((yyval.attribute_seq) == NULL) YYABORT; }
-#line 2746 "grammar.c" /* yacc.c:1646  */
+#line 402 "grammar.y" /* yacc.c:1652  */
+    { (yyval.field) = mk_field(NULL, (yyvsp[-3].ndt), (yyvsp[-1].attribute_seq), ctx); if ((yyval.field) == NULL) YYABORT; }
+#line 2724 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 119:
-#line 392 "grammar.y" /* yacc.c:1646  */
-    { (yyval.attribute_seq) = ndt_attr_seq_append((yyvsp[-2].attribute_seq), (yyvsp[0].attribute), ctx); if ((yyval.attribute_seq) == NULL) YYABORT; }
-#line 2752 "grammar.c" /* yacc.c:1646  */
+#line 405 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_record((yyvsp[-1].variadic_flag), NULL, NULL, false, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2730 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 120:
-#line 395 "grammar.y" /* yacc.c:1646  */
-    { (yyval.attribute) = mk_attr((yyvsp[-2].string), (yyvsp[0].string), ctx); if ((yyval.attribute) == NULL) YYABORT; }
-#line 2758 "grammar.c" /* yacc.c:1646  */
+#line 406 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_record((yyvsp[-1].variadic_flag), (yyvsp[-2].field_seq), NULL, false, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2736 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 121:
-#line 396 "grammar.y" /* yacc.c:1646  */
-    { (yyval.attribute) = mk_attr_from_seq((yyvsp[-4].string), (yyvsp[-1].string_seq), ctx); if ((yyval.attribute) == NULL) YYABORT; }
-#line 2764 "grammar.c" /* yacc.c:1646  */
+#line 407 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_record(Nonvariadic, (yyvsp[-3].field_seq), (yyvsp[-1].attribute_seq), false, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2742 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 122:
-#line 399 "grammar.y" /* yacc.c:1646  */
-    { (yyval.string_seq) = ndt_string_seq_new((yyvsp[0].string), ctx); if ((yyval.string_seq) == NULL) YYABORT; }
-#line 2770 "grammar.c" /* yacc.c:1646  */
+#line 408 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_record((yyvsp[-1].variadic_flag), NULL, NULL, true, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2748 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 123:
-#line 400 "grammar.y" /* yacc.c:1646  */
-    { (yyval.string_seq) = ndt_string_seq_append((yyvsp[-2].string_seq), (yyvsp[0].string), ctx); if ((yyval.string_seq) == NULL) YYABORT; }
-#line 2776 "grammar.c" /* yacc.c:1646  */
+#line 409 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_record((yyvsp[-1].variadic_flag), (yyvsp[-2].field_seq), NULL, true, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2754 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 124:
-#line 403 "grammar.y" /* yacc.c:1646  */
-    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
-#line 2782 "grammar.c" /* yacc.c:1646  */
+#line 410 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_record(Nonvariadic, (yyvsp[-3].field_seq), (yyvsp[-1].attribute_seq), true, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2760 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 125:
-#line 404 "grammar.y" /* yacc.c:1646  */
-    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
-#line 2788 "grammar.c" /* yacc.c:1646  */
+#line 413 "grammar.y" /* yacc.c:1652  */
+    { (yyval.field_seq) = ndt_field_seq_new((yyvsp[0].field), ctx); if ((yyval.field_seq) == NULL) YYABORT; }
+#line 2766 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 126:
-#line 405 "grammar.y" /* yacc.c:1646  */
-    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
-#line 2794 "grammar.c" /* yacc.c:1646  */
+#line 414 "grammar.y" /* yacc.c:1652  */
+    { (yyval.field_seq) = ndt_field_seq_append((yyvsp[-2].field_seq), (yyvsp[0].field), ctx); if ((yyval.field_seq) == NULL) YYABORT; }
+#line 2772 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 127:
-#line 406 "grammar.y" /* yacc.c:1646  */
-    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
-#line 2800 "grammar.c" /* yacc.c:1646  */
+#line 417 "grammar.y" /* yacc.c:1652  */
+    { (yyval.field) = mk_field((yyvsp[-2].string), (yyvsp[0].ndt), NULL, ctx); if ((yyval.field) == NULL) YYABORT; }
+#line 2778 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 128:
-#line 409 "grammar.y" /* yacc.c:1646  */
-    { (yyval.ndt) = mk_function((yyvsp[-2].type_seq), (yyvsp[0].type_seq), ctx); if ((yyval.ndt) == NULL) YYABORT; }
-#line 2806 "grammar.c" /* yacc.c:1646  */
+#line 418 "grammar.y" /* yacc.c:1652  */
+    { (yyval.field) = mk_field((yyvsp[-5].string), (yyvsp[-3].ndt), (yyvsp[-1].attribute_seq), ctx); if ((yyval.field) == NULL) YYABORT; }
+#line 2784 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 129:
-#line 412 "grammar.y" /* yacc.c:1646  */
-    { (yyval.type_seq) = (yyvsp[0].type_seq); if ((yyval.type_seq) == NULL) YYABORT; }
-#line 2812 "grammar.c" /* yacc.c:1646  */
+#line 421 "grammar.y" /* yacc.c:1652  */
+    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
+#line 2790 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 130:
-#line 413 "grammar.y" /* yacc.c:1646  */
-    { (yyval.type_seq) = ndt_type_seq_empty(ctx); if ((yyval.type_seq) == NULL) YYABORT; }
-#line 2818 "grammar.c" /* yacc.c:1646  */
+#line 422 "grammar.y" /* yacc.c:1652  */
+    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
+#line 2796 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 131:
-#line 416 "grammar.y" /* yacc.c:1646  */
-    { (yyval.type_seq) = ndt_type_seq_new((yyvsp[0].ndt), ctx); if ((yyval.type_seq) == NULL) YYABORT; }
-#line 2824 "grammar.c" /* yacc.c:1646  */
+#line 423 "grammar.y" /* yacc.c:1652  */
+    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
+#line 2802 "grammar.c" /* yacc.c:1652  */
     break;
 
   case 132:
-#line 417 "grammar.y" /* yacc.c:1646  */
-    { (yyval.type_seq) = ndt_type_seq_append((yyvsp[-2].type_seq), (yyvsp[0].ndt), ctx); if ((yyval.type_seq) == NULL) YYABORT; }
-#line 2830 "grammar.c" /* yacc.c:1646  */
+#line 426 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_union((yyvsp[0].field_seq), false, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2808 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 133:
+#line 427 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_union((yyvsp[-1].field_seq), false, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2814 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 134:
+#line 428 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_union((yyvsp[0].field_seq), true, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2820 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 135:
+#line 429 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_union((yyvsp[-1].field_seq), true, ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2826 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 136:
+#line 432 "grammar.y" /* yacc.c:1652  */
+    { (yyval.field_seq) = ndt_field_seq_new((yyvsp[0].field), ctx); if ((yyval.field_seq) == NULL) YYABORT; }
+#line 2832 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 137:
+#line 433 "grammar.y" /* yacc.c:1652  */
+    { (yyval.field_seq) = ndt_field_seq_append((yyvsp[-2].field_seq), (yyvsp[0].field), ctx); if ((yyval.field_seq) == NULL) YYABORT; }
+#line 2838 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 138:
+#line 436 "grammar.y" /* yacc.c:1652  */
+    { (yyval.field) = mk_field((yyvsp[-2].string), (yyvsp[0].ndt), NULL, ctx); if ((yyval.field) == NULL) YYABORT; }
+#line 2844 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 139:
+#line 439 "grammar.y" /* yacc.c:1652  */
+    { (yyval.attribute_seq) = NULL; }
+#line 2850 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 140:
+#line 440 "grammar.y" /* yacc.c:1652  */
+    { (yyval.attribute_seq) = (yyvsp[-1].attribute_seq); if ((yyval.attribute_seq) == NULL) YYABORT; }
+#line 2856 "grammar.c" /* yacc.c:1652  */
     break;
 
+  case 141:
+#line 443 "grammar.y" /* yacc.c:1652  */
+    { (yyval.attribute_seq) = ndt_attr_seq_new((yyvsp[0].attribute), ctx); if ((yyval.attribute_seq) == NULL) YYABORT; }
+#line 2862 "grammar.c" /* yacc.c:1652  */
+    break;
 
-#line 2834 "grammar.c" /* yacc.c:1646  */
+  case 142:
+#line 444 "grammar.y" /* yacc.c:1652  */
+    { (yyval.attribute_seq) = ndt_attr_seq_append((yyvsp[-2].attribute_seq), (yyvsp[0].attribute), ctx); if ((yyval.attribute_seq) == NULL) YYABORT; }
+#line 2868 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 143:
+#line 447 "grammar.y" /* yacc.c:1652  */
+    { (yyval.attribute) = mk_attr((yyvsp[-2].string), (yyvsp[0].string), ctx); if ((yyval.attribute) == NULL) YYABORT; }
+#line 2874 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 144:
+#line 448 "grammar.y" /* yacc.c:1652  */
+    { (yyval.attribute) = mk_attr_from_seq((yyvsp[-4].string), (yyvsp[-1].string_seq), ctx); if ((yyval.attribute) == NULL) YYABORT; }
+#line 2880 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 145:
+#line 451 "grammar.y" /* yacc.c:1652  */
+    { (yyval.string_seq) = ndt_string_seq_new((yyvsp[0].string), ctx); if ((yyval.string_seq) == NULL) YYABORT; }
+#line 2886 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 146:
+#line 452 "grammar.y" /* yacc.c:1652  */
+    { (yyval.string_seq) = ndt_string_seq_append((yyvsp[-2].string_seq), (yyvsp[0].string), ctx); if ((yyval.string_seq) == NULL) YYABORT; }
+#line 2892 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 147:
+#line 455 "grammar.y" /* yacc.c:1652  */
+    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
+#line 2898 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 148:
+#line 456 "grammar.y" /* yacc.c:1652  */
+    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
+#line 2904 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 149:
+#line 457 "grammar.y" /* yacc.c:1652  */
+    { (yyval.string) = (yyvsp[0].string); if ((yyval.string) == NULL) YYABORT; }
+#line 2910 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 150:
+#line 460 "grammar.y" /* yacc.c:1652  */
+    { (yyval.ndt) = mk_function((yyvsp[-2].type_seq), (yyvsp[0].type_seq), ctx); if ((yyval.ndt) == NULL) YYABORT; }
+#line 2916 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 151:
+#line 463 "grammar.y" /* yacc.c:1652  */
+    { (yyval.type_seq) = (yyvsp[0].type_seq); }
+#line 2922 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 152:
+#line 464 "grammar.y" /* yacc.c:1652  */
+    { (yyval.type_seq) = ndt_type_seq_empty(ctx); if ((yyval.type_seq) == NULL) YYABORT; }
+#line 2928 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 153:
+#line 467 "grammar.y" /* yacc.c:1652  */
+    { (yyval.type_seq) = ndt_type_seq_new((ndt_t *)(yyvsp[0].ndt), ctx); if ((yyval.type_seq) == NULL) YYABORT; }
+#line 2934 "grammar.c" /* yacc.c:1652  */
+    break;
+
+  case 154:
+#line 468 "grammar.y" /* yacc.c:1652  */
+    { (yyval.type_seq) = ndt_type_seq_append((yyvsp[-2].type_seq), (ndt_t *)(yyvsp[0].ndt), ctx); if ((yyval.type_seq) == NULL) YYABORT; }
+#line 2940 "grammar.c" /* yacc.c:1652  */
+    break;
+
+
+#line 2944 "grammar.c" /* yacc.c:1652  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2856,14 +2966,13 @@ yyreduce:
   /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
+  {
+    const int yylhs = yyr1[yyn] - YYNTOKENS;
+    const int yyi = yypgoto[yylhs] + *yyssp;
+    yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
+               ? yytable[yyi]
+               : yydefgoto[yylhs]);
+  }
 
   goto yynewstate;
 
@@ -2881,7 +2990,7 @@ yyerrlab:
     {
       ++yynerrs;
 #if ! YYERROR_VERBOSE
-      yyerror (&yylloc, scanner, ast, meta, ctx, YY_("syntax error"));
+      yyerror (&yylloc, scanner, ast, ctx, YY_("syntax error"));
 #else
 # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
                                         yyssp, yytoken)
@@ -2908,7 +3017,7 @@ yyerrlab:
                 yymsgp = yymsg;
               }
           }
-        yyerror (&yylloc, scanner, ast, meta, ctx, yymsgp);
+        yyerror (&yylloc, scanner, ast, ctx, yymsgp);
         if (yysyntax_error_status == 2)
           goto yyexhaustedlab;
       }
@@ -2932,7 +3041,7 @@ yyerrlab:
       else
         {
           yydestruct ("Error: discarding",
-                      yytoken, &yylval, &yylloc, scanner, ast, meta, ctx);
+                      yytoken, &yylval, &yylloc, scanner, ast, ctx);
           yychar = YYEMPTY;
         }
     }
@@ -2946,14 +3055,11 @@ yyerrlab:
 | yyerrorlab -- error raised explicitly by YYERROR.  |
 `---------------------------------------------------*/
 yyerrorlab:
+  /* Pacify compilers when the user code never invokes YYERROR and the
+     label yyerrorlab therefore never appears in user code.  */
+  if (0)
+    YYERROR;
 
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-
-  yyerror_range[1] = yylsp[1-yylen];
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
@@ -2989,7 +3095,7 @@ yyerrlab1:
 
       yyerror_range[1] = *yylsp;
       yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp, yylsp, scanner, ast, meta, ctx);
+                  yystos[yystate], yyvsp, yylsp, scanner, ast, ctx);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -3019,6 +3125,7 @@ yyacceptlab:
   yyresult = 0;
   goto yyreturn;
 
+
 /*-----------------------------------.
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
@@ -3026,16 +3133,21 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
+
 #if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:
-  yyerror (&yylloc, scanner, ast, meta, ctx, YY_("memory exhausted"));
+  yyerror (&yylloc, scanner, ast, ctx, YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
+
+/*-----------------------------------------------------.
+| yyreturn -- parsing is finished, return the result.  |
+`-----------------------------------------------------*/
 yyreturn:
   if (yychar != YYEMPTY)
     {
@@ -3043,7 +3155,7 @@ yyreturn:
          user semantic actions for why this is necessary.  */
       yytoken = YYTRANSLATE (yychar);
       yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval, &yylloc, scanner, ast, meta, ctx);
+                  yytoken, &yylval, &yylloc, scanner, ast, ctx);
     }
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
@@ -3052,7 +3164,7 @@ yyreturn:
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp, yylsp, scanner, ast, meta, ctx);
+                  yystos[*yyssp], yyvsp, yylsp, scanner, ast, ctx);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow