ndtypes 0.2.0dev5 → 0.2.0dev6

data/ext/ruby_ndtypes/ndtypes/libndtypes/compat/bpgrammar.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_BP_BPGRAMMAR_H_INCLUDED
 # define YY_NDT_BP_BPGRAMMAR_H_INCLUDED
 /* Debug traces.  */
@@ -40,7 +44,7 @@
 extern int ndt_bpdebug;
 #endif
 /* "%code requires" blocks.  */
-#line 292 "bpgrammar.y" /* yacc.c:1909  */
+#line 302 "bpgrammar.y" /* yacc.c:1921  */
 
   #include <ctype.h>
   #include <assert.h>
@@ -51,7 +55,7 @@ extern int ndt_bpdebug;
   #define YY_TYPEDEF_YY_SCANNER_T
   typedef void * yyscan_t;
 
-#line 55 "bpgrammar.h" /* yacc.c:1909  */
+#line 59 "bpgrammar.h" /* yacc.c:1921  */
 
 /* Token type.  */
 #ifndef YYTOKENTYPE
@@ -86,9 +90,9 @@ extern int ndt_bpdebug;
 
 union YYSTYPE
 {
-#line 325 "bpgrammar.y" /* yacc.c:1909  */
+#line 335 "bpgrammar.y" /* yacc.c:1921  */
 
-    ndt_t *ndt;
+    const ndt_t *ndt;
     ndt_field_t *field;
     ndt_field_seq_t *field_seq;
     ndt_string_seq_t *string_seq;
@@ -97,7 +101,7 @@ union YYSTYPE
     unsigned char uchar;
     uint16_t uint16;
 
-#line 101 "bpgrammar.h" /* yacc.c:1909  */
+#line 105 "bpgrammar.h" /* yacc.c:1921  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -121,14 +125,14 @@ struct YYLTYPE
 
 
 
-int ndt_bpparse (yyscan_t scanner, ndt_t **ast, ndt_context_t *ctx);
+int ndt_bpparse (yyscan_t scanner, const ndt_t **ast, ndt_context_t *ctx);
 /* "%code provides" blocks.  */
-#line 303 "bpgrammar.y" /* yacc.c:1909  */
+#line 313 "bpgrammar.y" /* yacc.c:1921  */
 
   #define YY_DECL extern int ndt_bplexfunc(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner, ndt_context_t *ctx)
   extern int ndt_bplexfunc(YYSTYPE *, YYLTYPE *, yyscan_t, ndt_context_t *);
-  void yyerror(YYLTYPE *loc, yyscan_t scanner, ndt_t **ast, 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 133 "bpgrammar.h" /* yacc.c:1909  */
+#line 137 "bpgrammar.h" /* yacc.c:1921  */
 
 #endif /* !YY_NDT_BP_BPGRAMMAR_H_INCLUDED  */

data/ext/ruby_ndtypes/ndtypes/libndtypes/compat/bpgrammar.y

@@ -37,7 +37,7 @@
 
 
 void
-yyerror(YYLTYPE *loc, yyscan_t scanner, ndt_t **ast, ndt_context_t *ctx,
+yyerror(YYLTYPE *loc, yyscan_t scanner, const ndt_t **ast, ndt_context_t *ctx,
         const char *msg)
 {
     (void)scanner;
@@ -67,13 +67,13 @@ add_uint16(uint16_t a, uint16_t b, ndt_context_t *ctx)
     return c;
 }
 
-static ndt_t *
+static const ndt_t *
 primitive_native(char dtype, ndt_context_t *ctx)
 {
     switch (dtype) {
     case '?': return ndt_primitive(Bool, 0, ctx);
 
-    case 'c': return ndt_char(Ascii, ctx);
+    case 'c': return ndt_char(Ascii, false, ctx);
     case 'b': return ndt_primitive(Int8, 0, ctx);
     case 'B': return ndt_primitive(Uint8, 0, ctx);
 
@@ -104,13 +104,13 @@ primitive_native(char dtype, ndt_context_t *ctx)
     }
 }
 
-static ndt_t *
+static const ndt_t *
 primitive_fixed(char dtype, uint32_t flags, ndt_context_t *ctx)
 {
     switch (dtype) {
     case '?': return ndt_primitive(Bool, flags, ctx);
 
-    case 'c': return ndt_char(Ascii, ctx);
+    case 'c': return ndt_char(Ascii, false, ctx);
     case 'b': return ndt_primitive(Int8, flags, ctx);
     case 'B': return ndt_primitive(Uint8, flags, ctx);
 
@@ -139,7 +139,7 @@ primitive_fixed(char dtype, uint32_t flags, ndt_context_t *ctx)
     }
 }
 
-static ndt_t *
+static const ndt_t *
 make_dtype(char modifier, char dtype, ndt_context_t *ctx)
 {
     switch (modifier) {
@@ -160,7 +160,7 @@ make_dtype(char modifier, char dtype, ndt_context_t *ctx)
     }
 }
 
-static ndt_t *
+static const ndt_t *
 make_fixed_bytes(char *v, ndt_context_t *ctx)
 {
     uint16_opt_t align = {None, 0};
@@ -180,13 +180,13 @@ make_fixed_bytes(char *v, ndt_context_t *ctx)
         return NULL;
     }
 
-    return ndt_fixed_bytes(datasize, align, ctx);
+    return ndt_fixed_bytes(datasize, align, false, ctx);
 }
 
-static ndt_t *
-make_dimensions(ndt_string_seq_t *seq, ndt_t *type, ndt_context_t *ctx)
+static const ndt_t *
+make_dimensions(ndt_string_seq_t *seq, const ndt_t *type, ndt_context_t *ctx)
 {
-    ndt_t *t;
+    const ndt_t *t;
     int64_t shape;
     int64_t i;
 
@@ -194,18 +194,21 @@ make_dimensions(ndt_string_seq_t *seq, ndt_t *type, ndt_context_t *ctx)
         ndt_err_format(ctx, NDT_ValueError,
             "number of dimensions must be between 1 and %d", NDT_MAX_DIM);
         ndt_string_seq_del(seq);
-        ndt_del(type);
+        ndt_decref(type);
         return NULL;
     }
 
+
     for (i=seq->len-1, t=type; i>=0; i--, type=t) {
         shape = ndt_strtoll(seq->ptr[i], 0, INT_MAX, ctx);
         if (ndt_err_occurred(ctx)) {
             ndt_string_seq_del(seq);
+            ndt_decref(type);
             return NULL;
         }
 
         t = ndt_fixed_dim(type, shape, INT64_MAX, ctx);
+        ndt_decref(type);
         if (t == NULL) {
             ndt_string_seq_del(seq);
             return NULL;
@@ -218,27 +221,32 @@ make_dimensions(ndt_string_seq_t *seq, ndt_t *type, ndt_context_t *ctx)
 }
 
 static ndt_field_t *
-make_field(char *name, ndt_t *type, uint16_t padding, ndt_context_t *ctx)
+make_field(char *name, const ndt_t *type, uint16_t padding, ndt_context_t *ctx)
 {
     uint16_opt_t align = {None, 0};
     uint16_opt_t pack = {None, 0};
     uint16_opt_t pad = {Some, 0};
+    ndt_field_t *f;
 
     pad.Some = padding;
-    return ndt_field(name, type, align, pack, pad, ctx);
+    f = ndt_field(name, type, align, pack, pad, ctx);
+    ndt_decref(type);
+    return f;
 }
 
-static ndt_t *
+static const ndt_t *
 make_record(ndt_field_seq_t *fields, ndt_context_t *ctx)
 {
     uint16_opt_t align = {None, 0};
     uint16_opt_t pack = {None, 0};
-    ndt_t *t;
+    const ndt_t *t;
     int64_t i;
 
     fields = ndt_field_seq_finalize(fields);
     if (fields == NULL) {
-        return ndt_record(Nonvariadic, NULL, 0, align, pack, ctx);
+        t = ndt_record(Nonvariadic, NULL, 0, align, pack, false, ctx);
+        ndt_field_seq_del(fields);
+        return t;
     }
 
     assert(fields->len >= 1);
@@ -255,18 +263,19 @@ make_record(ndt_field_seq_t *fields, ndt_context_t *ctx)
         fields->ptr[i].Concrete.explicit_align = true;
     }
 
-    t = ndt_record(Nonvariadic, fields->ptr, fields->len, align, pack, ctx);
-    ndt_free(fields);
+    t = ndt_record(Nonvariadic, fields->ptr, fields->len, align, pack, false, ctx);
+    ndt_field_seq_del(fields);
 
     return t;
 }
 
 static ndt_type_seq_t *
-broadcast_seq_new(ndt_t *type, ndt_context_t *ctx)
+broadcast_seq_new(const ndt_t *type, ndt_context_t *ctx)
 {
     ndt_t *t;
 
-    t = ndt_ellipsis_dim(NULL, type, ctx);
+    t = (ndt_t *)ndt_ellipsis_dim(NULL, type, ctx);
+    ndt_decref(type);
     if (t == NULL) {
         return NULL;
     }
@@ -275,11 +284,12 @@ broadcast_seq_new(ndt_t *type, ndt_context_t *ctx)
 }
 
 static ndt_type_seq_t *
-broadcast_seq_append(ndt_type_seq_t *seq, ndt_t *type, ndt_context_t *ctx)
+broadcast_seq_append(ndt_type_seq_t *seq, const ndt_t *type, ndt_context_t *ctx)
 {
     ndt_t *t;
 
-    t = ndt_ellipsis_dim(NULL, type, ctx);
+    t = (ndt_t *)ndt_ellipsis_dim(NULL, type, ctx);
+    ndt_decref(type);
     if (t == NULL) {
         ndt_type_seq_del(seq);
         return NULL;
@@ -303,12 +313,12 @@ broadcast_seq_append(ndt_type_seq_t *seq, ndt_t *type, ndt_context_t *ctx)
 %code provides {
   #define YY_DECL extern int ndt_bplexfunc(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner, ndt_context_t *ctx)
   extern int ndt_bplexfunc(YYSTYPE *, YYLTYPE *, yyscan_t, ndt_context_t *);
-  void yyerror(YYLTYPE *loc, yyscan_t scanner, ndt_t **ast, 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
@@ -320,10 +330,10 @@ broadcast_seq_append(ndt_type_seq_t *seq, ndt_t *type, ndt_context_t *ctx)
 }
 
 %lex-param   {yyscan_t scanner} {ndt_context_t *ctx}
-%parse-param {yyscan_t scanner} {ndt_t **ast} {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;
     ndt_field_t *field;
     ndt_field_seq_t *field_seq;
     ndt_string_seq_t *string_seq;
@@ -366,7 +376,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_string_seq_del($$); } <string_seq>

data/ext/ruby_ndtypes/ndtypes/libndtypes/compat/bplexer.c

@@ -601,15 +601,15 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[62] =
+static const flex_int16_t yy_accept[63] =
     {   0,
         0,    0,    0,    0,   45,   43,   41,   40,   40,   30,
        42,   43,   33,   34,   31,   43,   37,   37,   32,   28,
-       27,   29,    2,   26,    5,   21,   19,   20,    7,    9,
-       11,   15,   13,   23,    4,    3,   18,   16,   17,    6,
-        8,   10,   14,   12,   24,   22,   35,   36,   38,   39,
-       42,    0,   37,   37,   25,   37,   39,    0,    0,    1,
-        0
+       27,   29,    2,   26,    5,    7,    9,   11,   15,   13,
+       23,   43,    4,    3,   18,   16,   17,    6,    8,   10,
+       14,   12,   24,   22,   35,   36,   38,   39,   42,    0,
+       37,   37,   25,   37,   21,   19,   20,   39,    0,    0,
+        1,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -620,14 +620,14 @@ static const YY_CHAR yy_ec[256] =
         1,    2,    5,    1,    6,    1,    7,    1,    1,    8,
         9,    1,    1,   10,   11,    1,    1,   12,   13,   13,
        13,   13,   13,   13,   13,   13,   13,   14,    1,   15,
-       16,   17,   18,   19,   20,   21,   20,   22,   23,   24,
-       20,   25,   26,   20,   20,   27,   20,   28,   20,   20,
-       29,   20,   20,   30,   20,   20,   20,   20,   20,   20,
-        1,    1,    1,    1,   31,    1,   20,   32,   33,   34,
-
-       35,   36,   20,   37,   38,   20,   20,   39,   20,   40,
-       41,   20,   42,   20,   43,   20,   20,   20,   20,   44,
-       20,   20,   45,    1,   46,    1,    1,    1,    1,    1,
+       16,   17,   18,   19,   20,   21,   20,   20,   20,   20,
+       20,   22,   23,   20,   20,   24,   20,   25,   20,   20,
+       26,   20,   20,   27,   20,   20,   20,   20,   20,   28,
+        1,    1,    1,    1,   29,    1,   20,   30,   31,   32,
+
+       33,   34,   20,   35,   36,   20,   20,   37,   20,   38,
+       39,   20,   40,   20,   41,   20,   20,   20,   20,   42,
+       20,   20,   43,    1,   44,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -644,77 +644,77 @@ static const YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static const YY_CHAR yy_meta[47] =
+static const YY_CHAR yy_meta[45] =
     {   0,
         1,    1,    2,    2,    1,    1,    1,    1,    1,    1,
         1,    3,    3,    1,    1,    1,    1,    1,    1,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    1,    1
+        3,    3,    1,    1
     } ;
 
-static const flex_int16_t yy_base[64] =
+static const flex_int16_t yy_base[65] =
     {   0,
-        0,    0,   46,    0,  111,  112,  112,  112,  112,  112,
-        0,   77,  112,  112,  112,   81,   97,   83,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  112,  112,    0,
-        0,   67,   95,   87,  112,   89,    0,   72,   69,  112,
-      112,  102,   94
+        0,    0,   44,    0,  110,  111,  111,  111,  111,  111,
+        0,   78,  111,  111,  111,   77,   96,   79,  111,  111,
+      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
+      111,   63,  111,  111,  111,  111,  111,  111,  111,  111,
+      111,  111,  111,  111,  111,  111,  111,    0,    0,   68,
+       94,   86,  111,   88,  111,  111,  111,    0,   73,   70,
+      111,  111,  101,   90
     } ;
 
-static const flex_int16_t yy_def[64] =
+static const flex_int16_t yy_def[65] =
     {   0,
-       61,    1,   61,    3,   61,   61,   61,   61,   61,   61,
-       62,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   63,
-       62,   61,   61,   61,   61,   61,   63,   61,   61,   61,
-        0,   61,   61
+       62,    1,   62,    3,   62,   62,   62,   62,   62,   62,
+       63,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   64,   63,   62,
+       62,   62,   62,   62,   62,   62,   62,   64,   62,   62,
+       62,    0,   62,   62
     } ;
 
-static const flex_int16_t yy_nxt[159] =
+static const flex_int16_t yy_nxt[156] =
     {   0,
         6,    7,    8,    9,   10,   11,   12,   13,   14,   15,
        16,   17,   18,   19,   20,   21,   22,   23,   24,    6,
-       25,   26,   27,   28,   29,   30,   31,   32,   33,   34,
-        6,   35,   36,   37,   38,   39,   40,   41,   42,   43,
-        6,   44,   45,   46,   47,   48,    6,    7,    8,    9,
-        6,   11,    6,    6,    6,    6,    6,    6,    6,   49,
-        6,    6,    6,    6,    6,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   50,    6,   50,   50,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-        6,    6,   53,   54,   56,   56,   57,   55,   56,   56,
-
-       56,   56,   51,   60,   51,   59,   53,   58,   53,   52,
-       61,    5,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61
+       25,   26,   27,   28,   29,   30,   31,   32,    6,   33,
+       34,   35,   36,   37,   38,   39,   40,   41,    6,   42,
+       43,   44,   45,   46,    6,    7,    8,    9,    6,   11,
+        6,    6,    6,    6,    6,    6,    6,   47,    6,    6,
+        6,    6,    6,   48,   48,   48,   48,   48,   48,   48,
+       48,   48,    6,   48,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,    6,    6,   51,   52,
+       54,   54,   58,   53,   55,   56,   57,   54,   54,   54,
+
+       54,   49,   61,   49,   60,   51,   59,   51,   50,   62,
+        5,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62
     } ;
 
-static const flex_int16_t yy_chk[159] =
+static const flex_int16_t yy_chk[156] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    3,    3,    3,    3,
+        1,    1,    1,    1,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,   16,   16,   18,   18,   63,   16,   54,   54,
-
-       56,   56,   62,   59,   62,   58,   53,   52,   17,   12,
-        5,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61
+        3,    3,    3,    3,    3,    3,    3,    3,   16,   16,
+       18,   18,   64,   16,   32,   32,   32,   52,   52,   54,
+
+       54,   63,   60,   63,   59,   51,   50,   17,   12,    5,
+       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,   62,   62,   62,   62
     } ;
 
 /* Table of booleans, true if rule could match eol. */
@@ -1128,13 +1128,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 62 )
+				if ( yy_current_state >= 63 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 61 );
+		while ( yy_current_state != 62 );
 		yy_cp = yyg->yy_last_accepting_cpos;
 		yy_current_state = yyg->yy_last_accepting_state;
 
@@ -1269,109 +1269,109 @@ YY_RULE_SETUP
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 139 "bplexer.l"
+#line 140 "bplexer.l"
 { yylval->uchar = 'E'; return DTYPE; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 140 "bplexer.l"
+#line 141 "bplexer.l"
 { yylval->uchar = 'F'; return DTYPE; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 141 "bplexer.l"
+#line 142 "bplexer.l"
 { yylval->uchar = 'D'; return DTYPE; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 143 "bplexer.l"
+#line 144 "bplexer.l"
 { return PAD; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 144 "bplexer.l"
+#line 145 "bplexer.l"
 { return RECORD; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 145 "bplexer.l"
+#line 146 "bplexer.l"
 { return BYTES; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 147 "bplexer.l"
+#line 148 "bplexer.l"
 { return RARROW; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 148 "bplexer.l"
+#line 149 "bplexer.l"
 { return AT; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 149 "bplexer.l"
+#line 150 "bplexer.l"
 { return EQUAL; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 150 "bplexer.l"
+#line 151 "bplexer.l"
 { return LESS; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 151 "bplexer.l"
+#line 152 "bplexer.l"
 { return GREATER; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 152 "bplexer.l"
+#line 153 "bplexer.l"
 { return BANG; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 153 "bplexer.l"
+#line 154 "bplexer.l"
 { return COMMA; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 154 "bplexer.l"
+#line 155 "bplexer.l"
 { BEGIN(FIELDNAME); return COLON; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 155 "bplexer.l"
+#line 156 "bplexer.l"
 { return LPAREN; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 156 "bplexer.l"
+#line 157 "bplexer.l"
 { return RPAREN; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 157 "bplexer.l"
+#line 158 "bplexer.l"
 { return LBRACE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 158 "bplexer.l"
+#line 159 "bplexer.l"
 { return RBRACE; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 160 "bplexer.l"
+#line 161 "bplexer.l"
 { yylval->string = ndt_strdup(yytext, ctx); if (yylval->string == NULL) return ERRTOKEN; return INTEGER; }
 	YY_BREAK
 
 
 case 38:
 YY_RULE_SETUP
-#line 164 "bplexer.l"
+#line 165 "bplexer.l"
 { BEGIN(INITIAL); return COLON; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 165 "bplexer.l"
+#line 166 "bplexer.l"
 { yylval->string = ndt_strdup(yytext, ctx); if (yylval->string == NULL) return ERRTOKEN; return NAME; }
 	YY_BREAK
 
@@ -1379,28 +1379,28 @@ YY_RULE_SETUP
 case 40:
 /* rule 40 can match eol */
 YY_RULE_SETUP
-#line 169 "bplexer.l"
+#line 170 "bplexer.l"
 { yycolumn = 1; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 170 "bplexer.l"
+#line 171 "bplexer.l"
 {} /* ignore */
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 171 "bplexer.l"
+#line 172 "bplexer.l"
 {} /* ignore */
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 172 "bplexer.l"
+#line 173 "bplexer.l"
 { return ERRTOKEN; }
 	YY_BREAK
 
 case 44:
 YY_RULE_SETUP
-#line 176 "bplexer.l"
+#line 177 "bplexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
 #line 1406 "bplexer.c"
@@ -1704,7 +1704,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 62 )
+			if ( yy_current_state >= 63 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -1733,11 +1733,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 62 )
+		if ( yy_current_state >= 63 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 61);
+	yy_is_jam = (yy_current_state == 62);
 
 	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
@@ -2538,6 +2538,6 @@ static int yy_flex_strlen (const char * s , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 176 "bplexer.l"
+#line 177 "bplexer.l"