ndtypes 0.2.0dev5 → 0.2.0dev6

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

@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
+/* A Bison parser, made by GNU Bison 3.3.  */
 
 /* Bison interface 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
@@ -30,6 +31,9 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+/* Undocumented macros, especially those whose name start with YY_,
+   are private implementation details.  Do not rely on them.  */
+
 #ifndef YY_NDT_YY_GRAMMAR_H_INCLUDED
 # define YY_NDT_YY_GRAMMAR_H_INCLUDED
 /* Debug traces.  */
@@ -40,7 +44,7 @@
 extern int ndt_yydebug;
 #endif
 /* "%code requires" blocks.  */
-#line 57 "grammar.y" /* yacc.c:1909  */
+#line 56 "grammar.y" /* yacc.c:1921  */
 
   #include "ndtypes.h"
   #include "seq.h"
@@ -49,7 +53,7 @@ extern int ndt_yydebug;
   #define YY_TYPEDEF_YY_SCANNER_T
   typedef void * yyscan_t;
 
-#line 53 "grammar.h" /* yacc.c:1909  */
+#line 57 "grammar.h" /* yacc.c:1921  */
 
 /* Token type.  */
 #ifndef YYTOKENTYPE
@@ -72,53 +76,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
 
@@ -127,9 +136,11 @@ extern int ndt_yydebug;
 
 union YYSTYPE
 {
-#line 86 "grammar.y" /* yacc.c:1909  */
+#line 85 "grammar.y" /* yacc.c:1921  */
 
-    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;
@@ -143,7 +154,7 @@ union YYSTYPE
     ndt_string_seq_t *string_seq;
     ndt_type_seq_t *type_seq;
 
-#line 147 "grammar.h" /* yacc.c:1909  */
+#line 158 "grammar.h" /* yacc.c:1921  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -167,14 +178,14 @@ 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:1909  */
+#line 65 "grammar.y" /* yacc.c:1921  */
 
   #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 179 "grammar.h" /* yacc.c:1909  */
+#line 190 "grammar.h" /* yacc.c:1921  */
 
 #endif /* !YY_NDT_YY_GRAMMAR_H_INCLUDED  */

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

@@ -36,12 +36,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);
@@ -66,11 +65,11 @@ yylex(YYSTYPE *val, YYLTYPE *loc, yyscan_t scanner, ndt_context_t *ctx)
 %code provides {
   #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);
 }
 
 %pure-parser
-%error-verbose
+%define parse.error verbose
 
 %locations
 %initial-action {
@@ -81,10 +80,12 @@ yylex(YYSTYPE *val, YYLTYPE *loc, yyscan_t scanner, ndt_context_t *ctx)
 }
 
 %lex-param   {yyscan_t scanner} {ndt_context_t *ctx}
-%parse-param {yyscan_t scanner} {ndt_t **ast} {ndt_meta_t *meta} {ndt_context_t *ctx}
+%parse-param {yyscan_t scanner} {const ndt_t **ast} {ndt_context_t *ctx}
 
 %union {
-    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;
@@ -110,16 +111,20 @@ yylex(YYSTYPE *val, YYLTYPE *loc, yyscan_t scanner, ndt_context_t *ctx)
 %type <ndt> dimensions_tail
 %type <ndt> dtype
 %type <ndt> scalar
-%type <ndt> signed
-%type <ndt> unsigned
-%type <ndt> ieee_float
-%type <ndt> ieee_complex
-%type <ndt> alias
+
+%type <tag> signed
+%type <tag> unsigned
+%type <tag> ieee_float
+%type <tag> ieee_complex
+%type <alias> alias
+
 %type <ndt> character
 %type <ndt> string
 %type <ndt> fixed_string
 %type <ndt> bytes
 %type <ndt> fixed_bytes
+%type <ndt> array_dimensions
+%type <ndt> array
 %type <ndt> ref
 
 %type <ndt> tuple_type
@@ -129,7 +134,12 @@ yylex(YYSTYPE *val, YYLTYPE *loc, yyscan_t scanner, ndt_context_t *ctx)
 %type <ndt> record_type
 %type <field> record_field
 %type <field_seq> record_field_seq
-%type <string> record_field_name
+
+%type <ndt> union_type
+%type <field> union_member
+%type <field_seq> union_member_seq
+
+%type <string> field_name_or_tag
 
 %type <ndt> categorical
 %type <typed_value> typed_value
@@ -148,6 +158,8 @@ yylex(YYSTYPE *val, YYLTYPE *loc, yyscan_t scanner, ndt_context_t *ctx)
 
 %type <ndt> function_type
 
+%type <uint32> flags_opt
+%type <uint32> option_opt
 %type <uint32> endian_opt
 %type <encoding> encoding
 %type <variadic_flag> variadic_flag
@@ -160,8 +172,8 @@ yylex(YYSTYPE *val, YYLTYPE *loc, yyscan_t scanner, ndt_context_t *ctx)
    BOOL
    SIGNED_KIND INT8 INT16 INT32 INT64
    UNSIGNED_KIND UINT8 UINT16 UINT32 UINT64
-   FLOAT_KIND FLOAT16 FLOAT32 FLOAT64
-   COMPLEX_KIND COMPLEX32 COMPLEX64 COMPLEX128
+   FLOAT_KIND BFLOAT16 FLOAT16 FLOAT32 FLOAT64
+   COMPLEX_KIND BCOMPLEX32 COMPLEX32 COMPLEX64 COMPLEX128
    CATEGORICAL NA
    INTPTR UINTPTR SIZE
    CHAR
@@ -169,7 +181,7 @@ yylex(YYSTYPE *val, YYLTYPE *loc, yyscan_t scanner, ndt_context_t *ctx)
    BYTES FIXED_BYTES_KIND FIXED_BYTES
    REF
 
-FIXED VAR
+FIXED VAR ARRAY OF
 
 COMMA COLON LPAREN RPAREN LBRACE RBRACE LBRACK RBRACK STAR ELLIPSIS
 RARROW EQUAL LESS GREATER QUESTIONMARK BANG AMPERSAND BAR
@@ -181,7 +193,7 @@ ERRTOKEN
 
 %token ENDMARKER 0 "end of file"
 
-%destructor { ndt_del($$); } <ndt>
+%destructor { ndt_decref($$); } <ndt>
 %destructor { ndt_field_del($$); } <field>
 %destructor { ndt_field_seq_del($$); } <field_seq>
 %destructor { ndt_value_del($$); } <typed_value>
@@ -192,6 +204,10 @@ ERRTOKEN
 %destructor { ndt_string_seq_del($$); } <string_seq>
 %destructor { ndt_type_seq_del($$); } <type_seq>
 
+%token BELOW_BAR
+%precedence BELOW_BAR
+%precedence BAR
+
 %%
 
 input:
@@ -201,114 +217,122 @@ input:
 datashape_or_module:
   datashape_with_ellipsis                        { $$ = $1; }
 | function_type                                  { $$ = $1; }
-| NAME_UPPER COLON COLON datashape_with_ellipsis { $$ = ndt_module($1, $4, ctx); if ($$ == NULL) YYABORT; }
+| NAME_UPPER COLON COLON datashape_with_ellipsis { $$ = mk_module($1, $4, ctx); if ($$ == NULL) YYABORT; }
 
 /* types */
 datashape_with_ellipsis:
   datashape                                { $$ = $1; }
 | fixed_ellipsis                           { $$ = $1; }
-| NAME_UPPER LBRACK fixed_ellipsis RBRACK  { $$ = mk_contig($1, $3, ctx); if ($$ == NULL) YYABORT; }
+| NAME_UPPER LBRACK fixed_ellipsis RBRACK  { $$ = mk_contig($1, (ndt_t *)$3, ctx); if ($$ == NULL) YYABORT; }
 | VAR ELLIPSIS STAR dtype                  { $$ = mk_var_ellipsis($4, ctx); if ($$ == NULL) YYABORT; }
-| VAR ELLIPSIS STAR QUESTIONMARK dtype     { $$ = mk_var_ellipsis(ndt_option($5), ctx); if ($$ == NULL) YYABORT; }
+| array_dimensions                         { $$ = $1; }
 
 fixed_ellipsis:
-  ELLIPSIS STAR dimensions_tail            { $$ = ndt_ellipsis_dim(NULL, $3, ctx); if ($$ == NULL) YYABORT; }
-| NAME_UPPER ELLIPSIS STAR dimensions_tail { $$ = ndt_ellipsis_dim($1, $4, ctx); if ($$ == NULL) YYABORT; }
+  ELLIPSIS STAR dimensions_tail            { $$ = mk_ellipsis_dim(NULL, $3, ctx); if ($$ == NULL) YYABORT; }
+| NAME_UPPER ELLIPSIS STAR dimensions_tail { $$ = mk_ellipsis_dim($1, $4, ctx); if ($$ == NULL) YYABORT; }
 
 datashape:
   dimensions         { $$ = $1; }
 | dtype              { $$ = $1; }
-| QUESTIONMARK dtype { $$ = ndt_option($2); if ($$ == NULL) YYABORT; }
 
 dimensions:
   dimensions_nooption                 { $$ = $1; }
-| QUESTIONMARK dimensions_nooption    { $$ = ndt_option($2); if ($$ == NULL) YYABORT; }
-| NAME_UPPER LBRACK dimensions RBRACK { $$ = mk_contig($1, $3, ctx); if ($$ == NULL) YYABORT; }
+| NAME_UPPER LBRACK dimensions RBRACK { $$ = mk_contig($1, (ndt_t *)$3, ctx); if ($$ == NULL) YYABORT; }
 | BANG dimensions                     { $$ = mk_fortran($2, ctx); if ($$ == NULL) YYABORT; }
 
 dimensions_nooption:
   INTEGER STAR dimensions_tail                           { $$ = mk_fixed_dim_from_shape($1, $3, ctx); if ($$ == NULL) YYABORT; }
 | FIXED LPAREN attribute_seq RPAREN STAR dimensions_tail { $$ = mk_fixed_dim_from_attrs($3, $6, ctx); if ($$ == NULL) YYABORT; }
-| NAME_UPPER STAR dimensions_tail                        { $$ = ndt_symbolic_dim($1, $3, ctx); if ($$ == NULL) YYABORT; }
-| VAR arguments_opt STAR dimensions_tail                 { $$ = mk_var_dim(meta, $2, $4, ctx); if ($$ == NULL) YYABORT; }
+| NAME_UPPER STAR dimensions_tail                        { $$ = mk_symbolic_dim($1, $3, ctx); if ($$ == NULL) YYABORT; }
+| VAR arguments_opt STAR dimensions_tail                 { $$ = mk_var_dim($2, $4, false, ctx); if ($$ == NULL) YYABORT; }
+| QUESTIONMARK VAR arguments_opt STAR dimensions_tail    { $$ = mk_var_dim($3, $5, true, ctx); if ($$ == NULL) YYABORT; }
+
 
 dimensions_tail:
   dtype              { $$ = $1; }
-| QUESTIONMARK dtype { $$ = ndt_option($2); if ($$ == NULL) YYABORT; }
 | dimensions         { $$ = $1; }
 
 dtype:
-  ANY_KIND                               { $$ = ndt_any_kind(ctx); if ($$ == NULL) YYABORT; }
-| SCALAR_KIND                            { $$ = ndt_scalar_kind(ctx); if ($$ == NULL) YYABORT; }
-| scalar                                 { $$ = $1; }
-| tuple_type                             { $$ = $1; }
-| record_type                            { $$ = $1; }
-| NAME_LOWER                             { $$ = ndt_nominal($1, NULL, ctx); if ($$ == NULL) YYABORT; }
-| NAME_UPPER LPAREN datashape RPAREN     { $$ = ndt_constr($1, $3, ctx); if ($$ == NULL) YYABORT; }
-| NAME_UPPER LPAREN attribute_seq RPAREN { (void)$1; (void)$3; ndt_free($1); ndt_attr_seq_del($3); $$ = NULL;
-                                            ndt_err_format(ctx, NDT_NotImplementedError, "general attributes are not implemented");
-                                            YYABORT; }
-| NAME_UPPER                             { $$ = ndt_typevar($1, ctx); if ($$ == NULL) YYABORT; }
+  option_opt ANY_KIND                             { $$ = ndt_any_kind($1, ctx); if ($$ == NULL) YYABORT; }
+| option_opt SCALAR_KIND                          { $$ = ndt_scalar_kind($1, ctx); if ($$ == NULL) YYABORT; }
+| scalar                                          { $$ = $1; }
+| tuple_type                                      { $$ = $1; }
+| record_type                                     { $$ = $1; }
+| union_type                                      { $$ = $1; }
+| NAME_LOWER                                      { $$ = ndt_nominal($1, NULL, false, ctx); if ($$ == NULL) YYABORT; }
+| QUESTIONMARK NAME_LOWER                         { $$ = ndt_nominal($2, NULL, true, ctx); if ($$ == NULL) YYABORT; }
+| NAME_UPPER LPAREN datashape RPAREN              { $$ = mk_constr($1, $3, false, ctx); if ($$ == NULL) YYABORT; }
+| QUESTIONMARK NAME_UPPER LPAREN datashape RPAREN { $$ = mk_constr($2, $4, true, ctx); if ($$ == NULL) YYABORT; }
+| NAME_UPPER                                      { $$ = ndt_typevar($1, ctx); if ($$ == NULL) YYABORT; }
 
 scalar:
-  endian_opt BOOL    { $$ = ndt_primitive(Bool, $1, ctx); if ($$ == NULL) YYABORT; }
-| SIGNED_KIND        { $$ = ndt_signed_kind(ctx); if ($$ == NULL) YYABORT; }
-| signed             { $$ = $1; }
-| UNSIGNED_KIND      { $$ = ndt_unsigned_kind(ctx); if ($$ == NULL) YYABORT; }
-| unsigned           { $$ = $1; }
-| FLOAT_KIND         { $$ = ndt_float_kind(ctx); if ($$ == NULL) YYABORT; }
-| ieee_float         { $$ = $1; }
-| COMPLEX_KIND       { $$ = ndt_complex_kind(ctx); if ($$ == NULL) YYABORT; }
-| ieee_complex       { $$ = $1; }
-| alias              { $$ = $1; }
-| character          { $$ = $1; }
-| string             { $$ = $1; }
-| FIXED_STRING_KIND  { $$ = ndt_fixed_string_kind(ctx); if ($$ == NULL) YYABORT; }
-| fixed_string       { $$ = $1; }
-| bytes              { $$ = $1; }
-| FIXED_BYTES_KIND   { $$ = ndt_fixed_bytes_kind(ctx); if ($$ == NULL) YYABORT; }
-| fixed_bytes        { $$ = $1; }
-| categorical        { $$ = $1; }
-| ref                { $$ = $1; }
+  flags_opt BOOL               { $$ = ndt_primitive(Bool, $1, ctx); if ($$ == NULL) YYABORT; }
+| flags_opt SIGNED_KIND        { $$ = ndt_signed_kind($1, ctx); if ($$ == NULL) YYABORT; }
+| flags_opt signed             { $$ = ndt_primitive($2, $1, ctx); if ($$ == NULL) YYABORT; }
+| flags_opt UNSIGNED_KIND      { $$ = ndt_unsigned_kind($1, ctx); if ($$ == NULL) YYABORT; }
+| flags_opt unsigned           { $$ = ndt_primitive($2, $1, ctx); if ($$ == NULL) YYABORT; }
+| flags_opt FLOAT_KIND         { $$ = ndt_float_kind($1, ctx); if ($$ == NULL) YYABORT; }
+| flags_opt BFLOAT16           { $$ = ndt_primitive(BFloat16, $1, ctx); if ($$ == NULL) YYABORT; }
+| flags_opt ieee_float         { $$ = ndt_primitive($2, $1, ctx); if ($$ == NULL) YYABORT; }
+| flags_opt COMPLEX_KIND       { $$ = ndt_complex_kind($1, ctx); if ($$ == NULL) YYABORT; }
+| flags_opt BCOMPLEX32         { $$ = ndt_primitive(BComplex32, $1, ctx); if ($$ == NULL) YYABORT; }
+| flags_opt ieee_complex       { $$ = ndt_primitive($2, $1, ctx); if ($$ == NULL) YYABORT; }
+| flags_opt alias              { $$ = ndt_from_alias($2, $1, ctx); if ($$ == NULL) YYABORT; }
+| character                    { $$ = $1; }
+| string                       { $$ = $1; }
+| option_opt FIXED_STRING_KIND { $$ = ndt_fixed_string_kind($1, ctx); if ($$ == NULL) YYABORT; }
+| fixed_string                 { $$ = $1; }
+| bytes                        { $$ = $1; }
+| option_opt FIXED_BYTES_KIND  { $$ = ndt_fixed_bytes_kind($1, ctx); if ($$ == NULL) YYABORT; }
+| fixed_bytes                  { $$ = $1; }
+| categorical                  { $$ = $1; }
+| ref                          { $$ = $1; }
 
 signed:
-  endian_opt INT8  { $$ = ndt_primitive(Int8, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt INT16 { $$ = ndt_primitive(Int16, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt INT32 { $$ = ndt_primitive(Int32, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt INT64 { $$ = ndt_primitive(Int64, $1, ctx); if ($$ == NULL) YYABORT; }
+  INT8  { $$ = Int8; }
+| INT16 { $$ = Int16; }
+| INT32 { $$ = Int32; }
+| INT64 { $$ = Int64; }
 
 unsigned:
-  endian_opt UINT8  { $$ = ndt_primitive(Uint8, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt UINT16 { $$ = ndt_primitive(Uint16, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt UINT32 { $$ = ndt_primitive(Uint32, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt UINT64 { $$ = ndt_primitive(Uint64, $1, ctx); if ($$ == NULL) YYABORT; }
+  UINT8  { $$ = Uint8; }
+| UINT16 { $$ = Uint16; }
+| UINT32 { $$ = Uint32; }
+| UINT64 { $$ = Uint64; }
 
 ieee_float:
-  endian_opt FLOAT16 { $$ = ndt_primitive(Float16, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt FLOAT32 { $$ = ndt_primitive(Float32, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt FLOAT64 { $$ = ndt_primitive(Float64, $1, ctx); if ($$ == NULL) YYABORT; }
+  FLOAT16 { $$ = Float16; }
+| FLOAT32 { $$ = Float32; }
+| FLOAT64 { $$ = Float64; }
 
 ieee_complex:
-  endian_opt COMPLEX32  { $$ = ndt_primitive(Complex32, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt COMPLEX64  { $$ = ndt_primitive(Complex64, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt COMPLEX128 { $$ = ndt_primitive(Complex128, $1, ctx); if ($$ == NULL) YYABORT; }
+  COMPLEX32  { $$ = Complex32; }
+| COMPLEX64  { $$ = Complex64; }
+| COMPLEX128 { $$ = Complex128; }
 
 alias:
   /* machine dependent */
-  endian_opt INTPTR  { $$ = ndt_from_alias(Intptr, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt UINTPTR { $$ = ndt_from_alias(Uintptr, $1, ctx); if ($$ == NULL) YYABORT; }
-| endian_opt SIZE    { $$ = ndt_from_alias(Size, $1, ctx); if ($$ == NULL) YYABORT; }
+  INTPTR  { $$ = Intptr; }
+| UINTPTR { $$ = Uintptr; }
+| SIZE    { $$ = Size; }
 
 character:
-  CHAR                        { $$ = ndt_char(Utf32, ctx); if ($$ == NULL) YYABORT; }
-| CHAR LPAREN encoding RPAREN { $$ = ndt_char($3, ctx); if ($$ == NULL) YYABORT; }
+  option_opt CHAR                        { $$ = ndt_char(Utf32, $1, ctx); if ($$ == NULL) YYABORT; }
+| option_opt CHAR LPAREN encoding RPAREN { $$ = ndt_char($4, $1, ctx); if ($$ == NULL) YYABORT; }
 
 string:
-  STRING { $$ = ndt_string(ctx); if ($$ == NULL) YYABORT; }
+  option_opt STRING { $$ = ndt_string($1, ctx); if ($$ == NULL) YYABORT; }
 
 fixed_string:
-  FIXED_STRING LPAREN INTEGER RPAREN                { $$ = mk_fixed_string($3, Utf8, ctx); if ($$ == NULL) YYABORT; }
-| FIXED_STRING LPAREN INTEGER COMMA encoding RPAREN { $$ = mk_fixed_string($3, $5, ctx); if ($$ == NULL) YYABORT; }
+  option_opt FIXED_STRING LPAREN INTEGER RPAREN                { $$ = mk_fixed_string($4, Utf8, $1, ctx); if ($$ == NULL) YYABORT; }
+| option_opt FIXED_STRING LPAREN INTEGER COMMA encoding RPAREN { $$ = mk_fixed_string($4, $6, $1, ctx); if ($$ == NULL) YYABORT; }
+
+flags_opt:
+  option_opt endian_opt { $$ = $1 | $2; }
+
+option_opt:
+  %empty       { $$ = 0; }
+| QUESTIONMARK { $$ = NDT_OPTION; }
 
 endian_opt:
   %empty  { $$ = 0; }
@@ -321,17 +345,26 @@ encoding:
   STRINGLIT { $$ = encoding_from_string($1, ctx); if (ndt_err_occurred(ctx)) YYABORT; }
 
 bytes:
-  BYTES arguments_opt { $$ = mk_bytes($2, ctx); if ($$ == NULL) YYABORT; }
+  option_opt BYTES arguments_opt { $$ = mk_bytes($3, $1, ctx); if ($$ == NULL) YYABORT; }
+
+array_dimensions:
+  array                                  { $$ = $1; }
+| option_opt ARRAY ELLIPSIS OF datashape { $$ = mk_array_ellipsis($5, ctx); if ($$ == NULL) YYABORT; }
+| option_opt ARRAY ELLIPSIS OF array     { $$ = mk_array_ellipsis($5, ctx); if ($$ == NULL) YYABORT; }
+
+array:
+  option_opt ARRAY OF datashape { $$ = mk_array($4, $1, ctx); if ($$ == NULL) YYABORT; }
+| option_opt ARRAY OF array     { $$ = mk_array($4, $1, ctx); if ($$ == NULL) YYABORT; }
 
 fixed_bytes:
-  FIXED_BYTES LPAREN attribute_seq RPAREN { $$ = mk_fixed_bytes($3, ctx); if ($$ == NULL) YYABORT; }
+  option_opt FIXED_BYTES LPAREN attribute_seq RPAREN { $$ = mk_fixed_bytes($4, $1, ctx); if ($$ == NULL) YYABORT; }
 
 ref:
-  REF LPAREN datashape RPAREN { $$ = ndt_ref($3, ctx); if ($$ == NULL) YYABORT; }
-| AMPERSAND datashape         { $$ = ndt_ref($2, ctx); if ($$ == NULL) YYABORT; }
+  option_opt REF LPAREN datashape RPAREN { $$ = mk_ref($4, $1, ctx); if ($$ == NULL) YYABORT; }
+| option_opt AMPERSAND datashape         { $$ = mk_ref($3, $1, ctx); if ($$ == NULL) YYABORT; }
 
 categorical:
-  CATEGORICAL LPAREN typed_value_seq RPAREN { $$ = mk_categorical($3, ctx); if ($$ == NULL) YYABORT; }
+  option_opt CATEGORICAL LPAREN typed_value_seq RPAREN { $$ = mk_categorical($4, $1, ctx); if ($$ == NULL) YYABORT; }
 
 typed_value_seq:
   typed_value                       { $$ = ndt_value_seq_new($1, ctx); if ($$ == NULL) YYABORT; }
@@ -353,9 +386,12 @@ comma_variadic_flag:
 | COMMA ELLIPSIS { $$ = Variadic; }
 
 tuple_type:
-  LPAREN variadic_flag RPAREN                       { $$ = mk_tuple($2, NULL, NULL, ctx); if ($$ == NULL) YYABORT; }
-| LPAREN tuple_field_seq comma_variadic_flag RPAREN { $$ = mk_tuple($3, $2, NULL, ctx); if ($$ == NULL) YYABORT; }
-| LPAREN tuple_field_seq COMMA attribute_seq RPAREN { $$ = mk_tuple(Nonvariadic, $2, $4, ctx); if ($$ == NULL) YYABORT; }
+  LPAREN variadic_flag RPAREN                                    { $$ = mk_tuple($2, NULL, NULL, false, ctx); if ($$ == NULL) YYABORT; }
+| LPAREN tuple_field_seq comma_variadic_flag RPAREN              { $$ = mk_tuple($3, $2, NULL, false, ctx); if ($$ == NULL) YYABORT; }
+| LPAREN tuple_field_seq COMMA attribute_seq RPAREN              { $$ = mk_tuple(Nonvariadic, $2, $4, false, ctx); if ($$ == NULL) YYABORT; }
+| QUESTIONMARK LPAREN variadic_flag RPAREN                       { $$ = mk_tuple($3, NULL, NULL, true, ctx); if ($$ == NULL) YYABORT; }
+| QUESTIONMARK LPAREN tuple_field_seq comma_variadic_flag RPAREN { $$ = mk_tuple($4, $3, NULL, true, ctx); if ($$ == NULL) YYABORT; }
+| QUESTIONMARK LPAREN tuple_field_seq COMMA attribute_seq RPAREN { $$ = mk_tuple(Nonvariadic, $3, $5, true, ctx); if ($$ == NULL) YYABORT; }
 
 tuple_field_seq:
   tuple_field                       { $$ = ndt_field_seq_new($1, ctx); if ($$ == NULL) YYABORT; }
@@ -366,23 +402,39 @@ tuple_field:
 | datashape BAR attribute_seq BAR { $$ = mk_field(NULL, $1, $3, ctx); if ($$ == NULL) YYABORT; }
 
 record_type:
-  LBRACE variadic_flag RBRACE                        { $$ = mk_record($2, NULL, NULL, ctx); if ($$ == NULL) YYABORT; }
-| LBRACE record_field_seq comma_variadic_flag RBRACE { $$ = mk_record($3, $2, NULL, ctx); if ($$ == NULL) YYABORT; }
-| LBRACE record_field_seq COMMA attribute_seq RBRACE { $$ = mk_record(Nonvariadic, $2, $4, ctx); if ($$ == NULL) YYABORT; }
+  LBRACE variadic_flag RBRACE                                     { $$ = mk_record($2, NULL, NULL, false, ctx); if ($$ == NULL) YYABORT; }
+| LBRACE record_field_seq comma_variadic_flag RBRACE              { $$ = mk_record($3, $2, NULL, false, ctx); if ($$ == NULL) YYABORT; }
+| LBRACE record_field_seq COMMA attribute_seq RBRACE              { $$ = mk_record(Nonvariadic, $2, $4, false, ctx); if ($$ == NULL) YYABORT; }
+| QUESTIONMARK LBRACE variadic_flag RBRACE                        { $$ = mk_record($3, NULL, NULL, true, ctx); if ($$ == NULL) YYABORT; }
+| QUESTIONMARK LBRACE record_field_seq comma_variadic_flag RBRACE { $$ = mk_record($4, $3, NULL, true, ctx); if ($$ == NULL) YYABORT; }
+| QUESTIONMARK LBRACE record_field_seq COMMA attribute_seq RBRACE { $$ = mk_record(Nonvariadic, $3, $5, true, ctx); if ($$ == NULL) YYABORT; }
 
 record_field_seq:
   record_field                         { $$ = ndt_field_seq_new($1, ctx); if ($$ == NULL) YYABORT; }
 | record_field_seq COMMA record_field  { $$ = ndt_field_seq_append($1, $3, ctx); if ($$ == NULL) YYABORT; }
 
 record_field:
-  record_field_name COLON datashape                       { $$ = mk_field($1, $3, NULL, ctx); if ($$ == NULL) YYABORT; }
-| record_field_name COLON datashape BAR attribute_seq BAR { $$ = mk_field($1, $3, $5, ctx); if ($$ == NULL) YYABORT; }
+  field_name_or_tag COLON datashape                       { $$ = mk_field($1, $3, NULL, ctx); if ($$ == NULL) YYABORT; }
+| field_name_or_tag COLON datashape BAR attribute_seq BAR { $$ = mk_field($1, $3, $5, ctx); if ($$ == NULL) YYABORT; }
 
-record_field_name:
+field_name_or_tag:
   NAME_LOWER { $$ = $1; if ($$ == NULL) YYABORT; }
 | NAME_UPPER { $$ = $1; if ($$ == NULL) YYABORT; }
 | NAME_OTHER { $$ = $1; if ($$ == NULL) YYABORT; }
 
+union_type:
+  union_member_seq %prec BELOW_BAR              { $$ = mk_union($1, false, ctx); if ($$ == NULL) YYABORT; }
+| LBRACK union_member_seq RBRACK                { $$ = mk_union($2, false, ctx); if ($$ == NULL) YYABORT; }
+| QUESTIONMARK union_member_seq %prec BELOW_BAR { $$ = mk_union($2, true, ctx); if ($$ == NULL) YYABORT; }
+| QUESTIONMARK LBRACK union_member_seq RBRACK   { $$ = mk_union($3, true, ctx); if ($$ == NULL) YYABORT; }
+
+union_member_seq:
+  union_member                      { $$ = ndt_field_seq_new($1, ctx); if ($$ == NULL) YYABORT; }
+| union_member_seq BAR union_member { $$ = ndt_field_seq_append($1, $3, ctx); if ($$ == NULL) YYABORT; }
+
+union_member:
+  field_name_or_tag OF datashape    { $$ = mk_field($1, $3, NULL, ctx); if ($$ == NULL) YYABORT; }
+
 arguments_opt:
   %empty                      { $$ = NULL; }
 | LPAREN attribute_seq RPAREN { $$ = $2; if ($$ == NULL) YYABORT; }
@@ -400,8 +452,7 @@ untyped_value_seq:
 | untyped_value_seq COMMA untyped_value { $$ = ndt_string_seq_append($1, $3, ctx); if ($$ == NULL) YYABORT; }
 
 untyped_value:
-  NAME_LOWER  { $$ = $1; if ($$ == NULL) YYABORT; }
-| INTEGER     { $$ = $1; if ($$ == NULL) YYABORT; }
+  INTEGER     { $$ = $1; if ($$ == NULL) YYABORT; }
 | FLOATNUMBER { $$ = $1; if ($$ == NULL) YYABORT; }
 | STRINGLIT   { $$ = $1; if ($$ == NULL) YYABORT; }
 
@@ -409,9 +460,9 @@ function_type:
   type_seq_or_void RARROW type_seq_or_void { $$ = mk_function($1, $3, ctx); if ($$ == NULL) YYABORT; }
 
 type_seq_or_void:
-  type_seq { $$ = $1; if ($$ == NULL) YYABORT; }
+  type_seq { $$ = $1; }
 | VOID     { $$ = ndt_type_seq_empty(ctx); if ($$ == NULL) YYABORT; }
 
 type_seq:
-  datashape_with_ellipsis                { $$ = ndt_type_seq_new($1, ctx); if ($$ == NULL) YYABORT; }
-| type_seq COMMA datashape_with_ellipsis { $$ = ndt_type_seq_append($1, $3, ctx); if ($$ == NULL) YYABORT; }
+  datashape_with_ellipsis                { $$ = ndt_type_seq_new((ndt_t *)$1, ctx); if ($$ == NULL) YYABORT; }
+| type_seq COMMA datashape_with_ellipsis { $$ = ndt_type_seq_append($1, (ndt_t *)$3, ctx); if ($$ == NULL) YYABORT; }