Index: trunk/src/VBox/ExtPacks/VBoxDTrace/generated/dt_grammar.c
===================================================================
--- trunk/src/VBox/ExtPacks/VBoxDTrace/generated/dt_grammar.c	(revision 63134)
+++ trunk/src/VBox/ExtPacks/VBoxDTrace/generated/dt_grammar.c	(revision 63135)
@@ -1,23 +1,22 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
@@ -30,5 +29,5 @@
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
@@ -48,5 +47,5 @@
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
@@ -56,7 +55,89 @@
 #define YYPURE 0
 
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
+
+
+/* Copy the first part of user declarations.  */
+
+/* Line 189 of yacc.c  */
+#line 1 "dt_grammar.y"
+
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef VBOX
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#else
+# ifdef _MSC_VER
+#  pragma warning(disable:4255 4702)
+# endif
+#endif
+
+#include <dt_impl.h>
+
+#define	OP1(op, c)	dt_node_op1(op, c)
+#define	OP2(op, l, r)	dt_node_op2(op, l, r)
+#define	OP3(x, y, z)	dt_node_op3(x, y, z)
+#define	LINK(l, r)	dt_node_link(l, r)
+#define	DUP(s)		strdup(s)
+
+#ifdef VBOX
+# define YYMALLOC RTMemAlloc
+# define YYFREE   RTMemFree
+#endif
+
+
+
+
+/* Line 189 of yacc.c  */
+#line 124 "dt_grammar.c"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
 
 
@@ -290,74 +371,11 @@
 
 
-/* Copy the first part of user declarations.  */
-#line 1 "dt_grammar.y"
-
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef VBOX
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#endif
-
-#include <dt_impl.h>
-
-#define	OP1(op, c)	dt_node_op1(op, c)
-#define	OP2(op, l, r)	dt_node_op2(op, l, r)
-#define	OP3(x, y, z)	dt_node_op3(x, y, z)
-#define	LINK(l, r)	dt_node_link(l, r)
-#define	DUP(s)		strdup(s)
-
-#ifdef VBOX
-# define YYMALLOC RTMemAlloc
-# define YYFREE   RTMemFree
-#endif
-
-
-
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 47 "dt_grammar.y"
 {
+
+/* Line 214 of yacc.c  */
+#line 51 "dt_grammar.y"
+
 	dt_node_t *l_node;
 	dt_decl_t *l_decl;
@@ -365,13 +383,14 @@
 	uintmax_t l_int;
 	int l_tok;
-}
-/* Line 193 of yacc.c.  */
-#line 370 "dt_grammar.c"
-	YYSTYPE;
+
+
+
+/* Line 214 of yacc.c  */
+#line 390 "dt_grammar.c"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-
+#endif
 
 
@@ -379,6 +398,6 @@
 
 
-/* Line 216 of yacc.c.  */
-#line 383 "dt_grammar.c"
+/* Line 264 of yacc.c  */
+#line 402 "dt_grammar.c"
 
 #ifdef short
@@ -430,5 +449,5 @@
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
@@ -455,12 +474,12 @@
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int i)
+YYID (int yyi)
 #else
 static int
-YYID (i)
-    int i;
+YYID (yyi)
+    int yyi;
 #endif
 {
-  return i;
+  return yyi;
 }
 #endif
@@ -543,7 +562,7 @@
 union yyalloc
 {
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
 
 /* The size of the maximum gap between one aligned stack and the next.  */
@@ -579,10 +598,10 @@
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
@@ -765,28 +784,28 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   217,   217,   218,   219,   222,   223,   226,   227,   230,
-     231,   235,   236,   240,   241,   242,   243,   244,   249,   248,
-     264,   268,   275,   276,   280,   286,   289,   295,   296,   300,
-     303,   310,   326,   329,   333,   340,   344,   345,   351,   352,
-     355,   356,   359,   360,   364,   365,   371,   372,   373,   374,
-     375,   376,   377,   381,   382,   386,   389,   393,   396,   399,
-     402,   405,   408,   411,   415,   419,   426,   427,   428,   429,
-     430,   431,   434,   439,   440,   441,   442,   443,   444,   448,
-     449,   455,   456,   459,   462,   468,   469,   472,   478,   479,
-     482,   488,   489,   492,   495,   498,   504,   505,   508,   514,
-     515,   521,   522,   528,   529,   535,   536,   542,   543,   549,
-     550,   555,   559,   560,   565,   566,   572,   573,   574,   575,
-     576,   577,   578,   579,   580,   581,   582,   585,   586,   591,
-     596,   604,   605,   606,   607,   608,   609,   613,   614,   615,
-     616,   617,   618,   622,   623,   624,   625,   626,   630,   631,
-     632,   635,   636,   637,   638,   639,   640,   641,   642,   643,
-     644,   647,   648,   649,   652,   653,   654,   658,   661,   662,
-     666,   667,   668,   672,   673,   677,   678,   682,   683,   689,
-     696,   702,   703,   704,   705,   709,   710,   714,   715,   716,
-     722,   723,   724,   728,   729,   730,   734,   735,   738,   739,
-     744,   745,   749,   750,   751,   752,   755,   758,   759,   760,
-     761,   765,   766,   770,   771,   772,   777,   778,   784,   787,
-     790,   795,   798,   804,   805,   806,   810,   811,   812,   813,
-     814,   817,   817,   825,   826,   827,   830,   830,   838,   839
+       0,   221,   221,   222,   223,   226,   227,   230,   231,   234,
+     235,   239,   240,   244,   245,   246,   247,   248,   253,   252,
+     268,   272,   279,   280,   284,   290,   293,   299,   300,   304,
+     307,   314,   330,   333,   337,   344,   348,   349,   355,   356,
+     359,   360,   363,   364,   368,   369,   375,   376,   377,   378,
+     379,   380,   381,   385,   386,   390,   393,   397,   400,   403,
+     406,   409,   412,   415,   419,   423,   430,   431,   432,   433,
+     434,   435,   438,   443,   444,   445,   446,   447,   448,   452,
+     453,   459,   460,   463,   466,   472,   473,   476,   482,   483,
+     486,   492,   493,   496,   499,   502,   508,   509,   512,   518,
+     519,   525,   526,   532,   533,   539,   540,   546,   547,   553,
+     554,   559,   563,   564,   569,   570,   576,   577,   578,   579,
+     580,   581,   582,   583,   584,   585,   586,   589,   590,   595,
+     600,   608,   609,   610,   611,   612,   613,   617,   618,   619,
+     620,   621,   622,   626,   627,   628,   629,   630,   634,   635,
+     636,   639,   640,   641,   642,   643,   644,   645,   646,   647,
+     648,   651,   652,   653,   656,   657,   658,   662,   665,   666,
+     670,   671,   672,   676,   677,   681,   682,   686,   687,   693,
+     700,   706,   707,   708,   709,   713,   714,   718,   719,   720,
+     726,   727,   728,   732,   733,   734,   738,   739,   742,   743,
+     748,   749,   753,   754,   755,   756,   759,   762,   763,   764,
+     765,   769,   770,   774,   775,   776,   781,   782,   788,   791,
+     794,   799,   802,   808,   809,   810,   814,   815,   816,   817,
+     818,   821,   821,   829,   830,   831,   834,   834,   842,   843
 };
 #endif
@@ -825,5 +844,5 @@
   "DT_CTX_DTYPE", "';'", "'{'", "'}'", "$accept", "dtrace_program",
   "d_expression", "d_program", "d_type", "translation_unit",
-  "external_declaration", "inline_definition", "@1",
+  "external_declaration", "inline_definition", "$@1",
   "translator_definition", "translator_member_list", "translator_member",
   "provider_definition", "provider_probe_list", "provider_probe",
@@ -849,5 +868,5 @@
   "parameter_type_list", "parameter_list", "parameter_declaration",
   "type_name", "abstract_declarator", "direct_abstract_declarator",
-  "array", "@2", "array_parameters", "function", "@3",
+  "array", "$@2", "array_parameters", "function", "$@3",
   "function_parameters", 0
 };
@@ -1343,5 +1362,5 @@
 
 #ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+# if YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
@@ -1454,15 +1473,18 @@
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 #else
 static void
-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
   YYFPRINTF (stderr, "\n");
 }
@@ -1498,9 +1520,9 @@
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      fprintf (stderr, "   $%d = ", yyi + 1);
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "\n");
     }
 }
@@ -1785,8 +1807,5 @@
 }
 
-
-
 /* Prevent warnings from -Wmissing-prototypes.  */
-
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
@@ -1804,9 +1823,8 @@
 
 
-
-/* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
@@ -1816,7 +1834,7 @@
 
 
-/*----------.
-| yyparse.  |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
 
 #ifdef YYPARSE_PARAM
@@ -1842,12 +1860,37 @@
 #endif
 {
-  
-  int yystate;
+
+
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
+
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
   int yyn;
   int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
-  int yytoken = 0;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
@@ -1857,32 +1900,5 @@
 #endif
 
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
-
-
-
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
-
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
 
   /* The number of symbols on the RHS of the reduced rule.
@@ -1890,4 +1906,9 @@
   int yylen = 0;
 
+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
   YYDPRINTF ((stderr, "Starting parse\n"));
 
@@ -1895,5 +1916,5 @@
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
+  yychar = YYEMPTY; /* Cause a token to be read.  */
 
   /* Initialize stack pointers.
@@ -1901,5 +1922,4 @@
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
-
   yyssp = yyss;
   yyvsp = yyvs;
@@ -1931,5 +1951,4 @@
 	yytype_int16 *yyss1 = yyss;
 
-
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
@@ -1939,5 +1958,4 @@
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
-
 		    &yystacksize);
 
@@ -1962,7 +1980,6 @@
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
@@ -1975,5 +1992,4 @@
       yyvsp = yyvs + yysize - 1;
 
-
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
@@ -1984,4 +2000,7 @@
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
 
   goto yybackup;
@@ -1993,14 +2012,14 @@
 
   /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
-
-  /* First try to decide what to do without reference to look-ahead token.  */
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
-
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
@@ -2034,7 +2053,4 @@
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
@@ -2042,10 +2058,9 @@
     yyerrstatus--;
 
-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
 
   yystate = yyn;
@@ -2087,60 +2102,84 @@
     {
         case 2:
-#line 217 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 221 "dt_grammar.y"
     { return (dt_node_root((yyvsp[(1) - (2)].l_node))); }
     break;
 
   case 3:
-#line 218 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 222 "dt_grammar.y"
     { return (dt_node_root((yyvsp[(1) - (2)].l_node))); }
     break;
 
   case 4:
-#line 219 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 223 "dt_grammar.y"
     { return (dt_node_root((yyvsp[(1) - (2)].l_node))); }
     break;
 
   case 5:
-#line 222 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 226 "dt_grammar.y"
     { (yyval.l_node) = NULL; }
     break;
 
   case 6:
-#line 223 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 227 "dt_grammar.y"
     { (yyval.l_node) = (yyvsp[(2) - (2)].l_node); }
     break;
 
   case 7:
-#line 226 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 230 "dt_grammar.y"
     { (yyval.l_node) = dt_node_program(NULL); }
     break;
 
   case 8:
-#line 227 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 231 "dt_grammar.y"
     { (yyval.l_node) = dt_node_program((yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 9:
-#line 230 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 234 "dt_grammar.y"
     { (yyval.l_node) = NULL; }
     break;
 
   case 10:
-#line 231 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 235 "dt_grammar.y"
     { (yyval.l_node) = (dt_node_t *)(yyvsp[(2) - (2)].l_decl); }
     break;
 
   case 12:
-#line 236 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 240 "dt_grammar.y"
     { (yyval.l_node) = LINK((yyvsp[(1) - (2)].l_node), (yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 18:
-#line 249 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 253 "dt_grammar.y"
     { dt_scope_push(NULL, CTF_ERR); }
     break;
 
   case 19:
-#line 250 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 254 "dt_grammar.y"
     {
 			/*
@@ -2157,5 +2196,7 @@
 
   case 20:
-#line 265 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 269 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_xlator((yyvsp[(2) - (10)].l_decl), (yyvsp[(4) - (10)].l_decl), (yyvsp[(5) - (10)].l_str), (yyvsp[(8) - (10)].l_node));
@@ -2164,5 +2205,7 @@
 
   case 21:
-#line 269 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 273 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_xlator((yyvsp[(2) - (9)].l_decl), (yyvsp[(4) - (9)].l_decl), (yyvsp[(5) - (9)].l_str), NULL);
@@ -2171,10 +2214,14 @@
 
   case 23:
-#line 276 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 280 "dt_grammar.y"
     { (yyval.l_node) = LINK((yyvsp[(1) - (2)].l_node),(yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 24:
-#line 280 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 284 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_member(NULL, (yyvsp[(1) - (4)].l_str), (yyvsp[(3) - (4)].l_node));
@@ -2183,5 +2230,7 @@
 
   case 25:
-#line 286 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 290 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_provider((yyvsp[(2) - (6)].l_str), (yyvsp[(4) - (6)].l_node));
@@ -2190,5 +2239,7 @@
 
   case 26:
-#line 289 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 293 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_provider((yyvsp[(2) - (5)].l_str), NULL);
@@ -2197,10 +2248,14 @@
 
   case 28:
-#line 296 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 300 "dt_grammar.y"
     { (yyval.l_node) = LINK((yyvsp[(1) - (2)].l_node), (yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 29:
-#line 300 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 304 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_probe((yyvsp[(2) - (6)].l_str), 2, (yyvsp[(3) - (6)].l_node), (yyvsp[(5) - (6)].l_node));
@@ -2209,5 +2264,7 @@
 
   case 30:
-#line 303 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 307 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_probe((yyvsp[(2) - (4)].l_str), 1, (yyvsp[(3) - (4)].l_node), NULL);
@@ -2216,5 +2273,7 @@
 
   case 31:
-#line 310 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 314 "dt_grammar.y"
     {
 			/*
@@ -2236,5 +2295,7 @@
 
   case 32:
-#line 326 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 330 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_clause((yyvsp[(1) - (4)].l_node), NULL, (yyvsp[(3) - (4)].l_node));
@@ -2243,5 +2304,7 @@
 
   case 33:
-#line 329 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 333 "dt_grammar.y"
     {
 			dnerror((yyvsp[(3) - (4)].l_node), D_SYNTAX, "expected actions { } following "
@@ -2251,5 +2314,7 @@
 
   case 34:
-#line 334 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 338 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_clause((yyvsp[(1) - (7)].l_node), (yyvsp[(3) - (7)].l_node), (yyvsp[(6) - (7)].l_node));
@@ -2258,10 +2323,14 @@
 
   case 35:
-#line 340 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 344 "dt_grammar.y"
     { yybegin(YYS_EXPR); (yyval.l_node) = (yyvsp[(1) - (1)].l_node); }
     break;
 
   case 37:
-#line 345 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 349 "dt_grammar.y"
     {
 			(yyval.l_node) = LINK((yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2270,35 +2339,49 @@
 
   case 38:
-#line 351 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 355 "dt_grammar.y"
     { (yyval.l_node) = dt_node_pdesc_by_name((yyvsp[(1) - (1)].l_str)); }
     break;
 
   case 39:
-#line 352 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 356 "dt_grammar.y"
     { (yyval.l_node) = dt_node_pdesc_by_id((yyvsp[(1) - (1)].l_int)); }
     break;
 
   case 40:
-#line 355 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 359 "dt_grammar.y"
     { (yyval.l_node) = (yyvsp[(1) - (1)].l_node); }
     break;
 
   case 41:
-#line 356 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 360 "dt_grammar.y"
     { (yyval.l_node) = LINK((yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node)); }
     break;
 
   case 42:
-#line 359 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 363 "dt_grammar.y"
     { (yyval.l_node) = NULL; }
     break;
 
   case 43:
-#line 360 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 364 "dt_grammar.y"
     { (yyval.l_node) = dt_node_statement((yyvsp[(1) - (1)].l_node)); }
     break;
 
   case 45:
-#line 365 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 369 "dt_grammar.y"
     {
 			(yyval.l_node) = LINK((yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2307,40 +2390,56 @@
 
   case 46:
-#line 371 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 375 "dt_grammar.y"
     { (yyval.l_node) = dt_node_ident((yyvsp[(1) - (1)].l_str)); }
     break;
 
   case 47:
-#line 372 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 376 "dt_grammar.y"
     { (yyval.l_node) = dt_node_ident((yyvsp[(1) - (1)].l_str)); }
     break;
 
   case 48:
-#line 373 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 377 "dt_grammar.y"
     { (yyval.l_node) = dt_node_int((yyvsp[(1) - (1)].l_int)); }
     break;
 
   case 49:
-#line 374 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 378 "dt_grammar.y"
     { (yyval.l_node) = dt_node_string((yyvsp[(1) - (1)].l_str)); }
     break;
 
   case 50:
-#line 375 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 379 "dt_grammar.y"
     { (yyval.l_node) = dt_node_ident(DUP("self")); }
     break;
 
   case 51:
-#line 376 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 380 "dt_grammar.y"
     { (yyval.l_node) = dt_node_ident(DUP("this")); }
     break;
 
   case 52:
-#line 377 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 381 "dt_grammar.y"
     { (yyval.l_node) = (yyvsp[(2) - (3)].l_node); }
     break;
 
   case 54:
-#line 383 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 387 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_LBRAC, (yyvsp[(1) - (4)].l_node), (yyvsp[(3) - (4)].l_node));
@@ -2349,5 +2448,7 @@
 
   case 55:
-#line 386 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 390 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_func((yyvsp[(1) - (3)].l_node), NULL);
@@ -2356,5 +2457,7 @@
 
   case 56:
-#line 390 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 394 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_func((yyvsp[(1) - (4)].l_node), (yyvsp[(3) - (4)].l_node));
@@ -2363,5 +2466,7 @@
 
   case 57:
-#line 393 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 397 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_DOT, (yyvsp[(1) - (3)].l_node), dt_node_ident((yyvsp[(3) - (3)].l_str)));
@@ -2370,5 +2475,7 @@
 
   case 58:
-#line 396 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 400 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_DOT, (yyvsp[(1) - (3)].l_node), dt_node_ident((yyvsp[(3) - (3)].l_str)));
@@ -2377,5 +2484,7 @@
 
   case 59:
-#line 399 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 403 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_PTR, (yyvsp[(1) - (3)].l_node), dt_node_ident((yyvsp[(3) - (3)].l_str)));
@@ -2384,5 +2493,7 @@
 
   case 60:
-#line 402 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 406 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_PTR, (yyvsp[(1) - (3)].l_node), dt_node_ident((yyvsp[(3) - (3)].l_str)));
@@ -2391,5 +2502,7 @@
 
   case 61:
-#line 405 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 409 "dt_grammar.y"
     {
 			(yyval.l_node) = OP1(DT_TOK_POSTINC, (yyvsp[(1) - (2)].l_node));
@@ -2398,5 +2511,7 @@
 
   case 62:
-#line 408 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 412 "dt_grammar.y"
     {
 			(yyval.l_node) = OP1(DT_TOK_POSTDEC, (yyvsp[(1) - (2)].l_node));
@@ -2405,5 +2520,7 @@
 
   case 63:
-#line 412 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 416 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_offsetof((yyvsp[(3) - (6)].l_decl), (yyvsp[(5) - (6)].l_str));
@@ -2412,5 +2529,7 @@
 
   case 64:
-#line 416 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 420 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_offsetof((yyvsp[(3) - (6)].l_decl), (yyvsp[(5) - (6)].l_str));
@@ -2419,5 +2538,7 @@
 
   case 65:
-#line 420 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 424 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_XLATE, dt_node_type((yyvsp[(3) - (7)].l_decl)), (yyvsp[(6) - (7)].l_node));
@@ -2426,25 +2547,35 @@
 
   case 67:
-#line 427 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 431 "dt_grammar.y"
     { (yyval.l_node) = OP1(DT_TOK_PREINC, (yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 68:
-#line 428 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 432 "dt_grammar.y"
     { (yyval.l_node) = OP1(DT_TOK_PREDEC, (yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 69:
-#line 429 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 433 "dt_grammar.y"
     { (yyval.l_node) = OP1((yyvsp[(1) - (2)].l_tok), (yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 70:
-#line 430 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 434 "dt_grammar.y"
     { (yyval.l_node) = OP1(DT_TOK_SIZEOF, (yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 71:
-#line 431 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 435 "dt_grammar.y"
     {
 			(yyval.l_node) = OP1(DT_TOK_SIZEOF, dt_node_type((yyvsp[(3) - (4)].l_decl)));
@@ -2453,5 +2584,7 @@
 
   case 72:
-#line 434 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 438 "dt_grammar.y"
     {
 			(yyval.l_node) = OP1(DT_TOK_STRINGOF, (yyvsp[(2) - (2)].l_node));
@@ -2460,35 +2593,49 @@
 
   case 73:
-#line 439 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 443 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_ADDROF; }
     break;
 
   case 74:
-#line 440 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 444 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_DEREF; }
     break;
 
   case 75:
-#line 441 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 445 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_IPOS; }
     break;
 
   case 76:
-#line 442 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 446 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_INEG; }
     break;
 
   case 77:
-#line 443 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 447 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_BNEG; }
     break;
 
   case 78:
-#line 444 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 448 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_LNEG; }
     break;
 
   case 80:
-#line 449 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 453 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_LPAR, dt_node_type((yyvsp[(2) - (4)].l_decl)), (yyvsp[(4) - (4)].l_node));
@@ -2497,5 +2644,7 @@
 
   case 82:
-#line 456 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 460 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_MUL, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2504,5 +2653,7 @@
 
   case 83:
-#line 459 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 463 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_DIV, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2511,5 +2662,7 @@
 
   case 84:
-#line 462 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 466 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_MOD, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2518,5 +2671,7 @@
 
   case 86:
-#line 469 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 473 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_ADD, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2525,5 +2680,7 @@
 
   case 87:
-#line 472 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 476 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_SUB, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2532,5 +2689,7 @@
 
   case 89:
-#line 479 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 483 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_LSH, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2539,5 +2698,7 @@
 
   case 90:
-#line 482 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 486 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_RSH, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2546,5 +2707,7 @@
 
   case 92:
-#line 489 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 493 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_LT, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2553,5 +2716,7 @@
 
   case 93:
-#line 492 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 496 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_GT, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2560,5 +2725,7 @@
 
   case 94:
-#line 495 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 499 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_LE, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2567,5 +2734,7 @@
 
   case 95:
-#line 498 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 502 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_GE, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2574,5 +2743,7 @@
 
   case 97:
-#line 505 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 509 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_EQU, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2581,5 +2752,7 @@
 
   case 98:
-#line 508 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 512 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_NEQ, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2588,5 +2761,7 @@
 
   case 100:
-#line 515 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 519 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_BAND, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2595,5 +2770,7 @@
 
   case 102:
-#line 522 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 526 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_XOR, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2602,5 +2779,7 @@
 
   case 104:
-#line 529 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 533 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_BOR, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2609,5 +2788,7 @@
 
   case 106:
-#line 536 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 540 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_LAND, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2616,5 +2797,7 @@
 
   case 108:
-#line 543 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 547 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_LXOR, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2623,5 +2806,7 @@
 
   case 110:
-#line 550 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 554 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_LOR, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2630,10 +2815,14 @@
 
   case 113:
-#line 561 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 565 "dt_grammar.y"
     { (yyval.l_node) = OP3((yyvsp[(1) - (5)].l_node), (yyvsp[(3) - (5)].l_node), (yyvsp[(5) - (5)].l_node)); }
     break;
 
   case 115:
-#line 566 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 570 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2((yyvsp[(2) - (3)].l_tok), (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2642,60 +2831,84 @@
 
   case 116:
-#line 572 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 576 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_ASGN; }
     break;
 
   case 117:
-#line 573 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 577 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_MUL_EQ; }
     break;
 
   case 118:
-#line 574 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 578 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_DIV_EQ; }
     break;
 
   case 119:
-#line 575 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 579 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_MOD_EQ; }
     break;
 
   case 120:
-#line 576 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 580 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_ADD_EQ; }
     break;
 
   case 121:
-#line 577 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 581 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_SUB_EQ; }
     break;
 
   case 122:
-#line 578 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 582 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_LSH_EQ; }
     break;
 
   case 123:
-#line 579 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 583 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_RSH_EQ; }
     break;
 
   case 124:
-#line 580 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 584 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_AND_EQ; }
     break;
 
   case 125:
-#line 581 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 585 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_XOR_EQ; }
     break;
 
   case 126:
-#line 582 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 586 "dt_grammar.y"
     { (yyval.l_tok) = DT_TOK_OR_EQ; }
     break;
 
   case 128:
-#line 586 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 590 "dt_grammar.y"
     {
 			(yyval.l_node) = OP2(DT_TOK_COMMA, (yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2704,5 +2917,7 @@
 
   case 129:
-#line 591 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 595 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_decl();
@@ -2713,5 +2928,7 @@
 
   case 130:
-#line 596 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 600 "dt_grammar.y"
     {
 			(yyval.l_node) = (yyvsp[(2) - (3)].l_node);
@@ -2722,85 +2939,119 @@
 
   case 143:
-#line 622 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 626 "dt_grammar.y"
     { dt_decl_class(DT_DC_AUTO); }
     break;
 
   case 144:
-#line 623 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 627 "dt_grammar.y"
     { dt_decl_class(DT_DC_REGISTER); }
     break;
 
   case 145:
-#line 624 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 628 "dt_grammar.y"
     { dt_decl_class(DT_DC_STATIC); }
     break;
 
   case 146:
-#line 625 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 629 "dt_grammar.y"
     { dt_decl_class(DT_DC_EXTERN); }
     break;
 
   case 147:
-#line 626 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 630 "dt_grammar.y"
     { dt_decl_class(DT_DC_TYPEDEF); }
     break;
 
   case 149:
-#line 631 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 635 "dt_grammar.y"
     { dt_decl_class(DT_DC_SELF); }
     break;
 
   case 150:
-#line 632 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 636 "dt_grammar.y"
     { dt_decl_class(DT_DC_THIS); }
     break;
 
   case 151:
-#line 635 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 639 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_spec(CTF_K_INTEGER, DUP("void")); }
     break;
 
   case 152:
-#line 636 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 640 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_spec(CTF_K_INTEGER, DUP("char")); }
     break;
 
   case 153:
-#line 637 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 641 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_attr(DT_DA_SHORT); }
     break;
 
   case 154:
-#line 638 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 642 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_spec(CTF_K_INTEGER, DUP("int")); }
     break;
 
   case 155:
-#line 639 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 643 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_attr(DT_DA_LONG); }
     break;
 
   case 156:
-#line 640 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 644 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_spec(CTF_K_FLOAT, DUP("float")); }
     break;
 
   case 157:
-#line 641 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 645 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_spec(CTF_K_FLOAT, DUP("double")); }
     break;
 
   case 158:
-#line 642 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 646 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_attr(DT_DA_SIGNED); }
     break;
 
   case 159:
-#line 643 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 647 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_attr(DT_DA_UNSIGNED); }
     break;
 
   case 160:
-#line 644 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 648 "dt_grammar.y"
     {
 			(yyval.l_decl) = dt_decl_spec(CTF_K_TYPEDEF, DUP("string"));
@@ -2809,25 +3060,35 @@
 
   case 161:
-#line 647 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 651 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_spec(CTF_K_TYPEDEF, (yyvsp[(1) - (1)].l_str)); }
     break;
 
   case 164:
-#line 652 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 656 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_attr(DT_DA_CONST); }
     break;
 
   case 165:
-#line 653 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 657 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_attr(DT_DA_RESTRICT); }
     break;
 
   case 166:
-#line 654 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 658 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_attr(DT_DA_VOLATILE); }
     break;
 
   case 167:
-#line 658 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 662 "dt_grammar.y"
     {
 			(yyval.l_decl) = dt_scope_pop();
@@ -2836,40 +3097,56 @@
 
   case 168:
-#line 661 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 665 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_spec((yyvsp[(1) - (2)].l_tok), (yyvsp[(2) - (2)].l_str)); }
     break;
 
   case 169:
-#line 662 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 666 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_spec((yyvsp[(1) - (2)].l_tok), (yyvsp[(2) - (2)].l_str)); }
     break;
 
   case 170:
-#line 666 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 670 "dt_grammar.y"
     { dt_decl_sou((yyvsp[(1) - (2)].l_tok), NULL); }
     break;
 
   case 171:
-#line 667 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 671 "dt_grammar.y"
     { dt_decl_sou((yyvsp[(1) - (3)].l_tok), (yyvsp[(2) - (3)].l_str)); }
     break;
 
   case 172:
-#line 668 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 672 "dt_grammar.y"
     { dt_decl_sou((yyvsp[(1) - (3)].l_tok), (yyvsp[(2) - (3)].l_str)); }
     break;
 
   case 173:
-#line 672 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 676 "dt_grammar.y"
     { (yyval.l_tok) = CTF_K_STRUCT; }
     break;
 
   case 174:
-#line 673 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 677 "dt_grammar.y"
     { (yyval.l_tok) = CTF_K_UNION; }
     break;
 
   case 178:
-#line 683 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 687 "dt_grammar.y"
     {
 			(yyval.l_node) = LINK((yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -2878,5 +3155,7 @@
 
   case 179:
-#line 689 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 693 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_decl();
@@ -2886,5 +3165,7 @@
 
   case 180:
-#line 696 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 700 "dt_grammar.y"
     {
 			dt_decl_free(dt_decl_pop());
@@ -2893,25 +3174,35 @@
 
   case 182:
-#line 703 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 707 "dt_grammar.y"
     { (yyval.l_decl) = (yyvsp[(2) - (2)].l_decl); }
     break;
 
   case 184:
-#line 705 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 709 "dt_grammar.y"
     { (yyval.l_decl) = (yyvsp[(2) - (2)].l_decl); }
     break;
 
   case 187:
-#line 714 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 718 "dt_grammar.y"
     { dt_decl_member(NULL); }
     break;
 
   case 188:
-#line 715 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 719 "dt_grammar.y"
     { dt_decl_member((yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 189:
-#line 716 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 720 "dt_grammar.y"
     {
 			dt_decl_member((yyvsp[(3) - (3)].l_node));
@@ -2920,40 +3211,56 @@
 
   case 190:
-#line 722 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 726 "dt_grammar.y"
     { (yyval.l_decl) = dt_scope_pop(); }
     break;
 
   case 191:
-#line 723 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 727 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_spec(CTF_K_ENUM, (yyvsp[(2) - (2)].l_str)); }
     break;
 
   case 192:
-#line 724 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 728 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_spec(CTF_K_ENUM, (yyvsp[(2) - (2)].l_str)); }
     break;
 
   case 193:
-#line 728 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 732 "dt_grammar.y"
     { dt_decl_enum(NULL); }
     break;
 
   case 194:
-#line 729 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 733 "dt_grammar.y"
     { dt_decl_enum((yyvsp[(2) - (3)].l_str)); }
     break;
 
   case 195:
-#line 730 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 734 "dt_grammar.y"
     { dt_decl_enum((yyvsp[(2) - (3)].l_str)); }
     break;
 
   case 198:
-#line 738 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 742 "dt_grammar.y"
     { dt_decl_enumerator((yyvsp[(1) - (1)].l_str), NULL); }
     break;
 
   case 199:
-#line 739 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 743 "dt_grammar.y"
     {
 			dt_decl_enumerator((yyvsp[(1) - (3)].l_str), (yyvsp[(3) - (3)].l_node));
@@ -2962,60 +3269,84 @@
 
   case 202:
-#line 749 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 753 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_ident((yyvsp[(1) - (1)].l_str)); }
     break;
 
   case 203:
-#line 750 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 754 "dt_grammar.y"
     { (yyval.l_decl) = (yyvsp[(2) - (3)].l_decl); }
     break;
 
   case 204:
-#line 751 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 755 "dt_grammar.y"
     { dt_decl_array((yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 205:
-#line 752 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 756 "dt_grammar.y"
     { dt_decl_func((yyvsp[(1) - (2)].l_decl), (yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 206:
-#line 755 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 759 "dt_grammar.y"
     { dt_decl_top()->dd_attr |= DT_DA_PAREN; }
     break;
 
   case 207:
-#line 758 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 762 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_ptr(); }
     break;
 
   case 208:
-#line 759 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 763 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_ptr(); }
     break;
 
   case 209:
-#line 760 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 764 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_ptr(); }
     break;
 
   case 210:
-#line 761 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 765 "dt_grammar.y"
     { (yyval.l_decl) = dt_decl_ptr(); }
     break;
 
   case 212:
-#line 766 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 770 "dt_grammar.y"
     { (yyval.l_decl) = (yyvsp[(2) - (2)].l_decl); }
     break;
 
   case 214:
-#line 771 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 775 "dt_grammar.y"
     { (yyval.l_node) = dt_node_vatype(); }
     break;
 
   case 215:
-#line 772 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 776 "dt_grammar.y"
     {
 			(yyval.l_node) = LINK((yyvsp[(1) - (3)].l_node), dt_node_vatype());
@@ -3024,5 +3355,7 @@
 
   case 217:
-#line 778 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 782 "dt_grammar.y"
     {
 			(yyval.l_node) = LINK((yyvsp[(1) - (3)].l_node), (yyvsp[(3) - (3)].l_node));
@@ -3031,5 +3364,7 @@
 
   case 218:
-#line 784 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 788 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_type(NULL);
@@ -3038,5 +3373,7 @@
 
   case 219:
-#line 787 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 791 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_type(NULL);
@@ -3045,5 +3382,7 @@
 
   case 220:
-#line 790 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 794 "dt_grammar.y"
     {
 			(yyval.l_node) = dt_node_type(NULL);
@@ -3052,5 +3391,7 @@
 
   case 221:
-#line 795 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 799 "dt_grammar.y"
     {
 			(yyval.l_decl) = dt_decl_pop();
@@ -3059,5 +3400,7 @@
 
   case 222:
-#line 798 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 802 "dt_grammar.y"
     {
 			(yyval.l_decl) = dt_decl_pop();
@@ -3066,35 +3409,49 @@
 
   case 226:
-#line 810 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 814 "dt_grammar.y"
     { (yyval.l_decl) = (yyvsp[(2) - (3)].l_decl); }
     break;
 
   case 227:
-#line 811 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 815 "dt_grammar.y"
     { dt_decl_array((yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 228:
-#line 812 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 816 "dt_grammar.y"
     { dt_decl_array((yyvsp[(1) - (1)].l_node)); (yyval.l_decl) = NULL; }
     break;
 
   case 229:
-#line 813 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 817 "dt_grammar.y"
     { dt_decl_func((yyvsp[(1) - (2)].l_decl), (yyvsp[(2) - (2)].l_node)); }
     break;
 
   case 230:
-#line 814 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 818 "dt_grammar.y"
     { dt_decl_func(NULL, (yyvsp[(1) - (1)].l_node)); }
     break;
 
   case 231:
-#line 817 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 821 "dt_grammar.y"
     { dt_scope_push(NULL, CTF_ERR); }
     break;
 
   case 232:
-#line 818 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 822 "dt_grammar.y"
     {
 			dt_scope_pop();
@@ -3104,25 +3461,35 @@
 
   case 233:
-#line 825 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 829 "dt_grammar.y"
     { (yyval.l_node) = NULL; }
     break;
 
   case 234:
-#line 826 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 830 "dt_grammar.y"
     { (yyval.l_node) = (yyvsp[(1) - (1)].l_node); }
     break;
 
   case 235:
-#line 827 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 831 "dt_grammar.y"
     { (yyval.l_node) = (yyvsp[(1) - (1)].l_node); }
     break;
 
   case 236:
-#line 830 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 834 "dt_grammar.y"
     { dt_scope_push(NULL, CTF_ERR); }
     break;
 
   case 237:
-#line 831 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 835 "dt_grammar.y"
     {
 			dt_scope_pop();
@@ -3132,16 +3499,21 @@
 
   case 238:
-#line 838 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 842 "dt_grammar.y"
     { (yyval.l_node) = NULL; }
     break;
 
   case 239:
-#line 839 "dt_grammar.y"
+
+/* Line 1455 of yacc.c  */
+#line 843 "dt_grammar.y"
     { (yyval.l_node) = (yyvsp[(1) - (1)].l_node); }
     break;
 
 
-/* Line 1267 of yacc.c.  */
-#line 3143 "dt_grammar.c"
+
+/* Line 1455 of yacc.c  */
+#line 3516 "dt_grammar.c"
       default: break;
     }
@@ -3153,5 +3525,4 @@
 
   *++yyvsp = yyval;
-
 
   /* Now `shift' the result of the reduction.  Determine what state
@@ -3219,5 +3590,5 @@
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
@@ -3236,5 +3607,5 @@
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
   goto yyerrlab1;
@@ -3293,7 +3664,4 @@
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   *++yyvsp = yylval;
 
@@ -3320,5 +3688,5 @@
   goto yyreturn;
 
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
@@ -3331,5 +3699,5 @@
 
 yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
+  if (yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
 		 yytoken, &yylval);
@@ -3357,5 +3725,7 @@
 
 
-#line 842 "dt_grammar.y"
-
-
+
+/* Line 1675 of yacc.c  */
+#line 846 "dt_grammar.y"
+
+
Index: trunk/src/VBox/ExtPacks/VBoxDTrace/generated/dt_grammar.h
===================================================================
--- trunk/src/VBox/ExtPacks/VBoxDTrace/generated/dt_grammar.h	(revision 63134)
+++ trunk/src/VBox/ExtPacks/VBoxDTrace/generated/dt_grammar.h	(revision 63135)
@@ -1,23 +1,22 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
@@ -30,7 +29,8 @@
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
+
 
 /* Tokens.  */
@@ -265,6 +265,9 @@
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 47 "dt_grammar.y"
 {
+
+/* Line 1676 of yacc.c  */
+#line 51 "dt_grammar.y"
+
 	dt_node_t *l_node;
 	dt_decl_t *l_decl;
@@ -272,13 +275,16 @@
 	uintmax_t l_int;
 	int l_tok;
-}
-/* Line 1529 of yacc.c.  */
-#line 277 "dt_grammar.h"
-	YYSTYPE;
+
+
+
+/* Line 1676 of yacc.c  */
+#line 282 "dt_grammar.h"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 extern YYSTYPE yylval;
 
+
Index: trunk/src/VBox/ExtPacks/VBoxDTrace/generated/dt_lex.c
===================================================================
--- trunk/src/VBox/ExtPacks/VBoxDTrace/generated/dt_lex.c	(revision 63134)
+++ trunk/src/VBox/ExtPacks/VBoxDTrace/generated/dt_lex.c	(revision 63135)
@@ -1,92 +1,31 @@
 #line 2 "dt_lex.c"
-
-#line 4 "dt_lex.c"
-
-#define  YY_INT_ALIGNED short int
-
 /* A lexical scanner generated by flex */
+
+/* Scanner skeleton version:
+ * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
+ */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
+
 #include <stdio.h>
-#include <string.h>
-#include <errno.h>
+
+
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
+#endif
+#endif
+
+
+#ifdef __cplusplus
+
 #include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
+#include <unistd.h>
+
+/* Use prototypes in function declarations. */
+#define YY_USE_PROTOS
 
 /* The "const" storage-class-modifier is valid. */
@@ -95,11 +34,20 @@
 #else	/* ! __cplusplus */
 
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
+#if __STDC__
+
+#define YY_USE_PROTOS
 #define YY_USE_CONST
 
-#endif	/* defined (__STDC__) */
+#endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
+
+#ifdef __TURBOC__
+ #pragma warn -rch
+ #pragma warn -use
+#include <io.h>
+#include <stdlib.h>
+#define YY_USE_CONST
+#define YY_USE_PROTOS
+#endif
 
 #ifdef YY_USE_CONST
@@ -107,4 +55,11 @@
 #else
 #define yyconst
+#endif
+
+
+#ifdef YY_USE_PROTOS
+#define YY_PROTO(proto) proto
+#else
+#define YY_PROTO(proto) ()
 #endif
 
@@ -123,5 +78,5 @@
  * definition of BEGIN.
  */
-#define BEGIN (yy_start) = 1 + 2 *
+#define BEGIN yy_start = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
@@ -129,5 +84,5 @@
  * compatibility.
  */
-#define YY_START (((yy_start) - 1) / 2)
+#define YY_START ((yy_start - 1) / 2)
 #define YYSTATE YY_START
 
@@ -136,29 +91,14 @@
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin  )
+#define YY_NEW_FILE yyrestart( yyin )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
+
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-extern yy_size_t yyleng;
-
+
+extern int yyleng;
 extern FILE *yyin, *yyout;
 
@@ -167,37 +107,40 @@
 #define EOB_ACT_LAST_MATCH 2
 
-    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
-     *       access to the local variable yy_act. Since yyless() is a macro, it would break
-     *       existing scanners that call yyless() from OUTSIDE yylex. 
-     *       One obvious solution it to make yy_act a global. I tried that, and saw
-     *       a 5% performance hit in a non-yylineno scanner, because yy_act is
-     *       normally declared as a register variable-- so it is not worth it.
-     */
-    #define  YY_LESS_LINENO(n) \
-            do { \
-                yy_size_t yyl;\
-                for ( yyl = n; yyl < yyleng; ++yyl )\
-                    if ( yytext[yyl] == '\n' )\
-                        --yylineno;\
-            }while(0)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
+/* The funky do-while in the following #define is used to turn the definition
+ * int a single C statement (which needs a semi-colon terminator).  This
+ * avoids problems with code like:
+ *
+ * 	if ( condition_holds )
+ *		yyless( 5 );
+ *	else
+ *		do_something_else();
+ *
+ * Prior to using the do-while the compiler would get upset at the
+ * "else" because it interpreted the "if" statement as being all
+ * done when it reached the ';' after the yyless() call.
+ */
+
+/* Return all but the first 'n' matched characters back to the input stream. */
+
 #define yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
+		*yy_cp = yy_hold_char; \
 		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, (yytext_ptr)  )
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
+#define unput(c) yyunput( c, yytext_ptr )
+
+/* The following is because we cannot portably get our hands on size_t
+ * (without autoconf's help, which isn't available because we want
+ * flex-generated scanners to compile on their own).
+ */
+typedef unsigned int yy_size_t;
+
+
 struct yy_buffer_state
 	{
@@ -215,5 +158,5 @@
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
@@ -236,7 +179,4 @@
 	int yy_at_bol;
 
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
@@ -245,5 +185,4 @@
 
 	int yy_buffer_status;
-
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
@@ -259,36 +198,26 @@
 	 */
 #define YY_BUFFER_EOF_PENDING 2
-
 	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+static YY_BUFFER_STATE yy_current_buffer = 0;
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
- *
- * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+#define YY_CURRENT_BUFFER yy_current_buffer
+
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t yyleng;
+
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+
+
+int yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;		/* whether we need to initialize */
+static int yy_init = 1;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
@@ -298,25 +227,21 @@
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
-
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
-
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
-
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
+void yyrestart YY_PROTO(( FILE *input_file ));
+
+void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
+void yy_load_buffer_state YY_PROTO(( void ));
+YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
+void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
+void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
+
+YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
+YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
+YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+
+static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
+static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
+static void yy_flex_free YY_PROTO(( void * ));
 
 #define yy_new_buffer yy_create_buffer
@@ -324,43 +249,33 @@
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
+
+
+#define YY_USES_REJECT
 typedef unsigned char YY_CHAR;
-
 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
 typedef int yy_state_type;
-
 #define YY_FLEX_LEX_COMPAT
 extern int yylineno;
-
 int yylineno = 1;
-
 extern char yytext[];
 
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
+
+static yy_state_type yy_get_previous_state YY_PROTO(( void ));
+static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
+static int yy_get_next_buffer YY_PROTO(( void ));
+static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 
 /* Done after the current pattern has been matched and before the
@@ -368,26 +283,19 @@
  */
 #define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
+	yytext_ptr = yy_bp; \
+	yyleng = (int) (yy_cp - yy_bp); \
+	yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
-	if ( yyleng + (yy_more_offset) >= YYLMAX ) \
+	if ( yyleng + yy_more_offset >= YYLMAX ) \
 		YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
-	yy_flex_strncpy( &yytext[(yy_more_offset)], (yytext_ptr), yyleng + 1 ); \
-	yyleng += (yy_more_offset); \
-	(yy_prev_more_offset) = (yy_more_offset); \
-	(yy_more_offset) = 0; \
-	(yy_c_buf_p) = yy_cp;
+	yy_flex_strncpy( &yytext[yy_more_offset], yytext_ptr, yyleng + 1 ); \
+	yyleng += yy_more_offset; \
+	yy_prev_more_offset = yy_more_offset; \
+	yy_more_offset = 0; \
+	yy_c_buf_p = yy_cp;
 
 #define YY_NUM_RULES 162
 #define YY_END_OF_BUFFER 163
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_acclist[740] =
+static yyconst short int yy_acclist[740] =
     {   0,
       163,  162,  149,  162,  147,  149,  162,  147,  162,  126,
@@ -474,5 +382,5 @@
     } ;
 
-static yyconst flex_int16_t yy_accept[511] =
+static yyconst short int yy_accept[511] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -534,5 +442,5 @@
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
@@ -566,5 +474,5 @@
     } ;
 
-static yyconst flex_int32_t yy_meta[69] =
+static yyconst int yy_meta[69] =
     {   0,
         1,    2,    3,    1,    4,    2,    1,    5,    1,    1,
@@ -577,5 +485,5 @@
     } ;
 
-static yyconst flex_int16_t yy_base[530] =
+static yyconst short int yy_base[530] =
     {   0,
         0,    0,    0,   67,   56,   57,   76,  143,  145,  150,
@@ -639,5 +547,5 @@
     } ;
 
-static yyconst flex_int16_t yy_def[530] =
+static yyconst short int yy_def[530] =
     {   0,
       510,  510,  509,    3,  511,  511,  509,    7,  512,  512,
@@ -701,5 +609,5 @@
     } ;
 
-static yyconst flex_int16_t yy_nxt[884] =
+static yyconst short int yy_nxt[884] =
     {   0,
        15,   16,   17,   16,   18,   19,   15,   20,   21,   22,
@@ -802,5 +710,5 @@
     } ;
 
-static yyconst flex_int16_t yy_chk[884] =
+static yyconst short int yy_chk[884] =
     {   0,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
@@ -903,21 +811,5 @@
     } ;
 
-/* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[163] =
-    {   0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 
-    0, 0, 0,     };
-
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
-
-static yy_state_type *yy_state_buf=0, *yy_state_ptr=0;
+static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
 static char *yy_full_match;
 static int yy_lp;
@@ -929,22 +821,21 @@
 #define REJECT \
 { \
-*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ \
-yy_cp = (yy_full_match); /* restore poss. backed-over text */ \
-(yy_lp) = (yy_full_lp); /* restore orig. accepting pos. */ \
-(yy_state_ptr) = (yy_full_state); /* restore orig. state */ \
-yy_current_state = *(yy_state_ptr); /* restore curr. state */ \
-++(yy_lp); \
+*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ \
+yy_cp = yy_full_match; /* restore poss. backed-over text */ \
+yy_lp = yy_full_lp; /* restore orig. accepting pos. */ \
+yy_state_ptr = yy_full_state; /* restore orig. state */ \
+yy_current_state = *yy_state_ptr; /* restore curr. state */ \
+++yy_lp; \
 goto find_rule; \
 }
-
 static int yy_more_offset = 0;
 static int yy_prev_more_offset = 0;
-#define yymore() ((yy_more_offset) = yy_flex_strlen( yytext ))
+#define yymore() (yy_more_offset = yy_flex_strlen( yytext ))
 #define YY_NEED_STRLEN
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET \
 	{ \
-	(yy_more_offset) = (yy_prev_more_offset); \
-	yyleng -= (yy_more_offset); \
+	yy_more_offset = yy_prev_more_offset; \
+	yyleng -= yy_more_offset; \
 	}
 #ifndef YYLMAX
@@ -955,4 +846,5 @@
 char *yytext_ptr;
 #line 1 "dt_lex.l"
+#define INITIAL 0
 #line 2 "dt_lex.l"
 /*
@@ -999,4 +891,7 @@
 #  undef UINT32_MAX
 #  undef UINT64_MAX
+# endif
+# ifdef _MSC_VER
+#  pragma warning(disable:4668 4131 4255)
 # endif
 # include <iprt/ctype.h>
@@ -1059,8 +954,4 @@
  * S4 - D control line scan (locate control directives only and invoke S3)
  */
-
-#line 1063 "dt_lex.c"
-
-#define INITIAL 0
 #define S0 1
 #define S1 2
@@ -1069,46 +960,5 @@
 #define S4 5
 
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-static int yy_init_globals (void );
-
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-
-int yylex_destroy (void );
-
-int yyget_debug (void );
-
-void yyset_debug (int debug_flag  );
-
-YY_EXTRA_TYPE yyget_extra (void );
-
-void yyset_extra (YY_EXTRA_TYPE user_defined  );
-
-FILE *yyget_in (void );
-
-void yyset_in  (FILE * in_str  );
-
-FILE *yyget_out (void );
-
-void yyset_out  (FILE * out_str  );
-
-yy_size_t yyget_leng (void );
-
-char *yyget_text (void );
-
-int yyget_lineno (void );
-
-void yyset_lineno (int line_number  );
+#line 963 "dt_lex.c"
 
 /* Macros after this point can all be overridden by user definitions in
@@ -1118,28 +968,63 @@
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap (void );
-#else
-extern int yywrap (void );
-#endif
-#endif
-
-    static void yyunput (int c,char *buf_ptr  );
-    
+extern "C" int yywrap YY_PROTO(( void ));
+#else
+extern int yywrap YY_PROTO(( void ));
+#endif
+#endif
+
+#ifndef YY_NO_UNPUT
+static void yyunput YY_PROTO(( int c, char *buf_ptr ));
+#endif
+
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-
+static int yyinput YY_PROTO(( void ));
+#else
+static int input YY_PROTO(( void ));
+#endif
+#endif
+
+#if YY_STACK_USED
+static int yy_start_stack_ptr = 0;
+static int yy_start_stack_depth = 0;
+static int *yy_start_stack = 0;
+#ifndef YY_NO_PUSH_STATE
+static void yy_push_state YY_PROTO(( int new_state ));
+#endif
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state YY_PROTO(( void ));
+#endif
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state YY_PROTO(( void ));
+#endif
+
+#else
+#define YY_NO_PUSH_STATE 1
+#define YY_NO_POP_STATE 1
+#define YY_NO_TOP_STATE 1
+#endif
+
+#ifdef YY_MALLOC_DECL
+YY_MALLOC_DECL
+#else
+#if __STDC__
+#ifndef __cplusplus
+#include <stdlib.h>
+#endif
+#else
+/* Just try to get by without declaring the routines.  This will fail
+ * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
+ * or sizeof(void*) != sizeof(int).
+ */
+#endif
 #endif
 
@@ -1150,9 +1035,10 @@
 
 /* Copy whatever the last rule matched to the standard output. */
+
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
 #endif
 
@@ -1162,8 +1048,7 @@
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+	if ( yy_current_buffer->yy_is_interactive ) \
 		{ \
-		int c = '*'; \
-		yy_size_t n; \
+		int c = '*', n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
@@ -1175,20 +1060,7 @@
 		result = n; \
 		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
-
+	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
+		  && ferror( yyin ) ) \
+		YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
 
@@ -1211,16 +1083,10 @@
 #endif
 
-/* end tables serialization structures and prototypes */
-
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
+#define YY_DECL int yylex YY_PROTO(( void ))
+#endif
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
@@ -1238,17 +1104,15 @@
 #define YY_RULE_SETUP \
 	if ( yyleng > 0 ) \
-		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
+		yy_current_buffer->yy_at_bol = \
 				(yytext[yyleng - 1] == '\n'); \
 	YY_USER_ACTION
 
-/** The main scanner function which does all the work.
- */
 YY_DECL
-{
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-    
-#line 124 "dt_lex.l"
+
+#line 127 "dt_lex.l"
 
 
@@ -1270,9 +1134,9 @@
 
 
-#line 1273 "dt_lex.c"
-
-	if ( !(yy_init) )
+#line 1137 "dt_lex.c"
+
+	if ( yy_init )
 		{
-		(yy_init) = 1;
+		yy_init = 0;
 
 #ifdef YY_USER_INIT
@@ -1280,12 +1144,6 @@
 #endif
 
-        /* Create the reject buffer large enough to save one state per allowed character. */
-        if ( ! (yy_state_buf) )
-            (yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE  );
-            if ( ! (yy_state_buf) )
-                YY_FATAL_ERROR( "out of dynamic memory in yylex()" );
-
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
+		if ( ! yy_start )
+			yy_start = 1;	/* first start state */
 
 		if ( ! yyin )
@@ -1295,19 +1153,17 @@
 			yyout = stdout;
 
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
-		}
-
-		yy_load_buffer_state( );
+		if ( ! yy_current_buffer )
+			yy_current_buffer =
+				yy_create_buffer( yyin, YY_BUF_SIZE );
+
+		yy_load_buffer_state();
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = (yy_c_buf_p);
+		yy_cp = yy_c_buf_p;
 
 		/* Support of yytext. */
-		*yy_cp = (yy_hold_char);
+		*yy_cp = yy_hold_char;
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
@@ -1316,10 +1172,8 @@
 		yy_bp = yy_cp;
 
-		yy_current_state = (yy_start);
+		yy_current_state = yy_start;
 		yy_current_state += YY_AT_BOL();
-
-		(yy_state_ptr) = (yy_state_buf);
-		*(yy_state_ptr)++ = yy_current_state;
-
+		yy_state_ptr = yy_state_buf;
+		*yy_state_ptr++ = yy_current_state;
 yy_match:
 		do
@@ -1333,5 +1187,5 @@
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			*(yy_state_ptr)++ = yy_current_state;
+			*yy_state_ptr++ = yy_current_state;
 			++yy_cp;
 			}
@@ -1339,19 +1193,18 @@
 
 yy_find_action:
-		yy_current_state = *--(yy_state_ptr);
-		(yy_lp) = yy_accept[yy_current_state];
-goto find_rule; /* Shut up GCC warning -Wall */
+		yy_current_state = *--yy_state_ptr;
+		yy_lp = yy_accept[yy_current_state];
 find_rule: /* we branch to this label when backing up */
 		for ( ; ; ) /* until we find what rule we matched */
 			{
-			if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] )
+			if ( yy_lp && yy_lp < yy_accept[yy_current_state + 1] )
 				{
-				yy_act = yy_acclist[(yy_lp)];
+				yy_act = yy_acclist[yy_lp];
 				if ( yy_act & YY_TRAILING_HEAD_MASK ||
-				     (yy_looking_for_trail_begin) )
+				     yy_looking_for_trail_begin )
 					{
-					if ( yy_act == (yy_looking_for_trail_begin) )
+					if ( yy_act == yy_looking_for_trail_begin )
 						{
-						(yy_looking_for_trail_begin) = 0;
+						yy_looking_for_trail_begin = 0;
 						yy_act &= ~YY_TRAILING_HEAD_MASK;
 						break;
@@ -1360,38 +1213,37 @@
 				else if ( yy_act & YY_TRAILING_MASK )
 					{
-					(yy_looking_for_trail_begin) = yy_act & ~YY_TRAILING_MASK;
-					(yy_looking_for_trail_begin) |= YY_TRAILING_HEAD_MASK;
-					(yy_full_match) = yy_cp;
-					(yy_full_state) = (yy_state_ptr);
-					(yy_full_lp) = (yy_lp);
+					yy_looking_for_trail_begin = yy_act & ~YY_TRAILING_MASK;
+					yy_looking_for_trail_begin |= YY_TRAILING_HEAD_MASK;
+					yy_full_match = yy_cp;
+					yy_full_state = yy_state_ptr;
+					yy_full_lp = yy_lp;
 					}
 				else
 					{
-					(yy_full_match) = yy_cp;
-					(yy_full_state) = (yy_state_ptr);
-					(yy_full_lp) = (yy_lp);
+					yy_full_match = yy_cp;
+					yy_full_state = yy_state_ptr;
+					yy_full_lp = yy_lp;
 					break;
 					}
-				++(yy_lp);
+				++yy_lp;
 				goto find_rule;
 				}
 			--yy_cp;
-			yy_current_state = *--(yy_state_ptr);
-			(yy_lp) = yy_accept[yy_current_state];
+			yy_current_state = *--yy_state_ptr;
+			yy_lp = yy_accept[yy_current_state];
 			}
 
 		YY_DO_BEFORE_ACTION;
 
-		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
+		if ( yy_act != YY_END_OF_BUFFER )
 			{
-			yy_size_t yyl;
-			for ( yyl = (yy_prev_more_offset); yyl < yyleng; ++yyl )
+			int yyl;
+			for ( yyl = 0; yyl < yyleng; ++yyl )
 				if ( yytext[yyl] == '\n' )
-					   
-    yylineno++;
-;
+					++yylineno;
 			}
 
 do_action:	/* This label is used only to access EOF actions. */
+
 
 		switch ( yy_act )
@@ -1399,370 +1251,370 @@
 case 1:
 YY_RULE_SETUP
-#line 143 "dt_lex.l"
+#line 146 "dt_lex.l"
 return (DT_KEY_AUTO);
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 144 "dt_lex.l"
+#line 147 "dt_lex.l"
 return (DT_KEY_BREAK);
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 145 "dt_lex.l"
+#line 148 "dt_lex.l"
 return (DT_KEY_CASE);
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 146 "dt_lex.l"
+#line 149 "dt_lex.l"
 return (DT_KEY_CHAR);
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 147 "dt_lex.l"
+#line 150 "dt_lex.l"
 return (DT_KEY_CONST);
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 148 "dt_lex.l"
+#line 151 "dt_lex.l"
 return (DT_KEY_CONTINUE);
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 149 "dt_lex.l"
+#line 152 "dt_lex.l"
 return (DT_KEY_COUNTER);
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 150 "dt_lex.l"
+#line 153 "dt_lex.l"
 return (DT_KEY_DEFAULT);
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 151 "dt_lex.l"
+#line 154 "dt_lex.l"
 return (DT_KEY_DO);
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 152 "dt_lex.l"
+#line 155 "dt_lex.l"
 return (DT_KEY_DOUBLE);
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 153 "dt_lex.l"
+#line 156 "dt_lex.l"
 return (DT_KEY_ELSE);
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 154 "dt_lex.l"
+#line 157 "dt_lex.l"
 return (DT_KEY_ENUM);
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 155 "dt_lex.l"
+#line 158 "dt_lex.l"
 return (DT_KEY_EXTERN);
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 156 "dt_lex.l"
+#line 159 "dt_lex.l"
 return (DT_KEY_FLOAT);
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 157 "dt_lex.l"
+#line 160 "dt_lex.l"
 return (DT_KEY_FOR);
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 158 "dt_lex.l"
+#line 161 "dt_lex.l"
 return (DT_KEY_GOTO);
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 159 "dt_lex.l"
+#line 162 "dt_lex.l"
 return (DT_KEY_IF);
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 160 "dt_lex.l"
+#line 163 "dt_lex.l"
 return (DT_KEY_IMPORT);
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 161 "dt_lex.l"
+#line 164 "dt_lex.l"
 return (DT_KEY_INLINE);
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 162 "dt_lex.l"
+#line 165 "dt_lex.l"
 return (DT_KEY_INT);
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 163 "dt_lex.l"
+#line 166 "dt_lex.l"
 return (DT_KEY_LONG);
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 164 "dt_lex.l"
+#line 167 "dt_lex.l"
 return (DT_TOK_OFFSETOF);
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 165 "dt_lex.l"
+#line 168 "dt_lex.l"
 return (DT_KEY_PROBE);
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 166 "dt_lex.l"
+#line 169 "dt_lex.l"
 return (DT_KEY_PROVIDER);
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 167 "dt_lex.l"
+#line 170 "dt_lex.l"
 return (DT_KEY_REGISTER);
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 168 "dt_lex.l"
+#line 171 "dt_lex.l"
 return (DT_KEY_RESTRICT);
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 169 "dt_lex.l"
+#line 172 "dt_lex.l"
 return (DT_KEY_RETURN);
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 170 "dt_lex.l"
+#line 173 "dt_lex.l"
 return (DT_KEY_SELF);
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 171 "dt_lex.l"
+#line 174 "dt_lex.l"
 return (DT_KEY_SHORT);
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 172 "dt_lex.l"
+#line 175 "dt_lex.l"
 return (DT_KEY_SIGNED);
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 173 "dt_lex.l"
+#line 176 "dt_lex.l"
 return (DT_TOK_SIZEOF);
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 174 "dt_lex.l"
+#line 177 "dt_lex.l"
 return (DT_KEY_STATIC);
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 175 "dt_lex.l"
+#line 178 "dt_lex.l"
 return (DT_KEY_STRING);
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 176 "dt_lex.l"
+#line 179 "dt_lex.l"
 return (DT_TOK_STRINGOF);
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 177 "dt_lex.l"
+#line 180 "dt_lex.l"
 return (DT_KEY_STRUCT);
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 178 "dt_lex.l"
+#line 181 "dt_lex.l"
 return (DT_KEY_SWITCH);
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 179 "dt_lex.l"
+#line 182 "dt_lex.l"
 return (DT_KEY_THIS);
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 180 "dt_lex.l"
+#line 183 "dt_lex.l"
 return (DT_KEY_XLATOR);
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 181 "dt_lex.l"
+#line 184 "dt_lex.l"
 return (DT_KEY_TYPEDEF);
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 182 "dt_lex.l"
+#line 185 "dt_lex.l"
 return (DT_KEY_UNION);
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 183 "dt_lex.l"
+#line 186 "dt_lex.l"
 return (DT_KEY_UNSIGNED);
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 184 "dt_lex.l"
+#line 187 "dt_lex.l"
 return (DT_KEY_VOID);
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 185 "dt_lex.l"
+#line 188 "dt_lex.l"
 return (DT_KEY_VOLATILE);
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 186 "dt_lex.l"
+#line 189 "dt_lex.l"
 return (DT_KEY_WHILE);
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 187 "dt_lex.l"
+#line 190 "dt_lex.l"
 return (DT_TOK_XLATE);
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 189 "dt_lex.l"
+#line 192 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_AUTO); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 190 "dt_lex.l"
+#line 193 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_CHAR); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 191 "dt_lex.l"
+#line 194 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_CONST); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 192 "dt_lex.l"
+#line 195 "dt_lex.l"
 { yybegin(YYS_DEFINE);	return (DT_KEY_COUNTER); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 193 "dt_lex.l"
+#line 196 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_DOUBLE); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 194 "dt_lex.l"
+#line 197 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_ENUM); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 195 "dt_lex.l"
+#line 198 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_EXTERN); }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 196 "dt_lex.l"
+#line 199 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_FLOAT); }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 197 "dt_lex.l"
+#line 200 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_IMPORT); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 198 "dt_lex.l"
+#line 201 "dt_lex.l"
 { yybegin(YYS_DEFINE);	return (DT_KEY_INLINE); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 199 "dt_lex.l"
+#line 202 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_INT); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 200 "dt_lex.l"
+#line 203 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_LONG); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 201 "dt_lex.l"
+#line 204 "dt_lex.l"
 { yybegin(YYS_DEFINE);	return (DT_KEY_PROVIDER); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 202 "dt_lex.l"
+#line 205 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_REGISTER); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 203 "dt_lex.l"
+#line 206 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_RESTRICT); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 204 "dt_lex.l"
+#line 207 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_SELF); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 205 "dt_lex.l"
+#line 208 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_SHORT); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 206 "dt_lex.l"
+#line 209 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_SIGNED); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 207 "dt_lex.l"
+#line 210 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_STATIC); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 208 "dt_lex.l"
+#line 211 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_STRING); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 209 "dt_lex.l"
+#line 212 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_STRUCT); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 210 "dt_lex.l"
+#line 213 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_THIS); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 211 "dt_lex.l"
+#line 214 "dt_lex.l"
 { yybegin(YYS_DEFINE);	return (DT_KEY_XLATOR); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 212 "dt_lex.l"
+#line 215 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_TYPEDEF); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 213 "dt_lex.l"
+#line 216 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_UNION); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 214 "dt_lex.l"
+#line 217 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_UNSIGNED); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 215 "dt_lex.l"
+#line 218 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_VOID); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 216 "dt_lex.l"
+#line 219 "dt_lex.l"
 { yybegin(YYS_EXPR);	return (DT_KEY_VOLATILE); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 218 "dt_lex.l"
+#line 221 "dt_lex.l"
 {
 			int i = atoi(yytext + 2);
@@ -1797,5 +1649,5 @@
 case 75:
 YY_RULE_SETUP
-#line 248 "dt_lex.l"
+#line 251 "dt_lex.l"
 {
 			int i = atoi(yytext + 1);
@@ -1881,5 +1733,5 @@
 case 76:
 YY_RULE_SETUP
-#line 329 "dt_lex.l"
+#line 332 "dt_lex.l"
 {
 			dt_ident_t *idp = dt_idhash_lookup(
@@ -1906,5 +1758,5 @@
 case 77:
 YY_RULE_SETUP
-#line 351 "dt_lex.l"
+#line 354 "dt_lex.l"
 {
 			dt_ident_t *idp = dt_idhash_lookup(
@@ -1930,5 +1782,5 @@
 case 78:
 YY_RULE_SETUP
-#line 372 "dt_lex.l"
+#line 375 "dt_lex.l"
 {
 			return (id_or_type(yytext));
@@ -1937,5 +1789,5 @@
 case 79:
 YY_RULE_SETUP
-#line 376 "dt_lex.l"
+#line 379 "dt_lex.l"
 {
 			if ((yylval.l_str = strdup(yytext)) == NULL)
@@ -1946,5 +1798,5 @@
 case 80:
 YY_RULE_SETUP
-#line 382 "dt_lex.l"
+#line 385 "dt_lex.l"
 {
 			if ((yylval.l_str = strdup("@_")) == NULL)
@@ -1954,10 +1806,10 @@
 	YY_BREAK
 case 81:
-#line 389 "dt_lex.l"
+#line 392 "dt_lex.l"
 case 82:
-#line 390 "dt_lex.l"
+#line 393 "dt_lex.l"
 case 83:
 YY_RULE_SETUP
-#line 390 "dt_lex.l"
+#line 393 "dt_lex.l"
 {
 			char *p;
@@ -1995,5 +1847,5 @@
 case 84:
 YY_RULE_SETUP
-#line 423 "dt_lex.l"
+#line 426 "dt_lex.l"
 yyerror("floating-point constants are not permitted\n");
 	YY_BREAK
@@ -2004,12 +1856,12 @@
 case 85:
 YY_RULE_SETUP
-#line 429 "dt_lex.l"
+#line 432 "dt_lex.l"
 xyerror(D_STR_NL, "newline encountered in string literal");
 	YY_BREAK
 case 86:
-#line 432 "dt_lex.l"
+#line 435 "dt_lex.l"
 case 87:
 YY_RULE_SETUP
-#line 432 "dt_lex.l"
+#line 435 "dt_lex.l"
 {
 			/*
@@ -2032,10 +1884,10 @@
 case 88:
 YY_RULE_SETUP
-#line 450 "dt_lex.l"
+#line 453 "dt_lex.l"
 xyerror(D_CHR_NL, "newline encountered in character constant");
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 452 "dt_lex.l"
+#line 455 "dt_lex.l"
 {
 			char *s, *p, *q;
@@ -2073,8 +1925,8 @@
 	YY_BREAK
 case 90:
-#line 487 "dt_lex.l"
+#line 490 "dt_lex.l"
 case 91:
 YY_RULE_SETUP
-#line 487 "dt_lex.l"
+#line 490 "dt_lex.l"
 {
 			yypcb->pcb_cstate = (YYSTATE);
@@ -2083,17 +1935,17 @@
 	YY_BREAK
 case 92:
-#line 493 "dt_lex.l"
+#line 496 "dt_lex.l"
 case 93:
 YY_RULE_SETUP
-#line 493 "dt_lex.l"
+#line 496 "dt_lex.l"
 ;	/* discard any #! lines */
 	YY_BREAK
 case 94:
-#line 496 "dt_lex.l"
+#line 499 "dt_lex.l"
 case 95:
-#line 497 "dt_lex.l"
+#line 500 "dt_lex.l"
 case 96:
 YY_RULE_SETUP
-#line 497 "dt_lex.l"
+#line 500 "dt_lex.l"
 {
 			assert(yypragma == NULL);
@@ -2104,16 +1956,15 @@
 case 97:
 YY_RULE_SETUP
-#line 503 "dt_lex.l"
+#line 506 "dt_lex.l"
 ;	/* discard */
 	YY_BREAK
 case 98:
-/* rule 98 can match eol */
-YY_RULE_SETUP
-#line 504 "dt_lex.l"
+YY_RULE_SETUP
+#line 507 "dt_lex.l"
 ;	/* discard */
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 506 "dt_lex.l"
+#line 509 "dt_lex.l"
 {
 			int c, tok;
@@ -2152,5 +2003,5 @@
 case 100:
 YY_RULE_SETUP
-#line 540 "dt_lex.l"
+#line 543 "dt_lex.l"
 {
 			yypcb->pcb_parens++;
@@ -2160,5 +2011,5 @@
 case 101:
 YY_RULE_SETUP
-#line 545 "dt_lex.l"
+#line 548 "dt_lex.l"
 {
 			if (--yypcb->pcb_parens < 0)
@@ -2169,5 +2020,5 @@
 case 102:
 YY_RULE_SETUP
-#line 551 "dt_lex.l"
+#line 554 "dt_lex.l"
 {
 			yypcb->pcb_brackets++;
@@ -2177,5 +2028,5 @@
 case 103:
 YY_RULE_SETUP
-#line 556 "dt_lex.l"
+#line 559 "dt_lex.l"
 {
 			if (--yypcb->pcb_brackets < 0)
@@ -2185,8 +2036,8 @@
 	YY_BREAK
 case 104:
-#line 563 "dt_lex.l"
+#line 566 "dt_lex.l"
 case 105:
 YY_RULE_SETUP
-#line 563 "dt_lex.l"
+#line 566 "dt_lex.l"
 {
 			yypcb->pcb_braces++;
@@ -2196,5 +2047,5 @@
 case 106:
 YY_RULE_SETUP
-#line 568 "dt_lex.l"
+#line 571 "dt_lex.l"
 {
 			if (--yypcb->pcb_braces < 0)
@@ -2205,244 +2056,241 @@
 case 107:
 YY_RULE_SETUP
-#line 574 "dt_lex.l"
+#line 577 "dt_lex.l"
 return (DT_TOK_BOR);
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 575 "dt_lex.l"
+#line 578 "dt_lex.l"
 return (DT_TOK_XOR);
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 576 "dt_lex.l"
+#line 579 "dt_lex.l"
 return (DT_TOK_BAND);
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 577 "dt_lex.l"
+#line 580 "dt_lex.l"
 return (DT_TOK_LAND);
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 578 "dt_lex.l"
+#line 581 "dt_lex.l"
 return (DT_TOK_LXOR);
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 579 "dt_lex.l"
+#line 582 "dt_lex.l"
 return (DT_TOK_LOR);
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 580 "dt_lex.l"
+#line 583 "dt_lex.l"
 return (DT_TOK_EQU);
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 581 "dt_lex.l"
+#line 584 "dt_lex.l"
 return (DT_TOK_NEQ);
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 582 "dt_lex.l"
+#line 585 "dt_lex.l"
 return (DT_TOK_LT);
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 583 "dt_lex.l"
+#line 586 "dt_lex.l"
 return (DT_TOK_LE);
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 584 "dt_lex.l"
+#line 587 "dt_lex.l"
 return (DT_TOK_GT);
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 585 "dt_lex.l"
+#line 588 "dt_lex.l"
 return (DT_TOK_GE);
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 586 "dt_lex.l"
+#line 589 "dt_lex.l"
 return (DT_TOK_LSH);
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 587 "dt_lex.l"
+#line 590 "dt_lex.l"
 return (DT_TOK_RSH);
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 588 "dt_lex.l"
+#line 591 "dt_lex.l"
 return (DT_TOK_ADD);
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 589 "dt_lex.l"
+#line 592 "dt_lex.l"
 return (DT_TOK_SUB);
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 590 "dt_lex.l"
+#line 593 "dt_lex.l"
 return (DT_TOK_MUL);
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 591 "dt_lex.l"
+#line 594 "dt_lex.l"
 return (DT_TOK_MOD);
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 592 "dt_lex.l"
+#line 595 "dt_lex.l"
 return (DT_TOK_BNEG);
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 593 "dt_lex.l"
+#line 596 "dt_lex.l"
 return (DT_TOK_LNEG);
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 594 "dt_lex.l"
+#line 597 "dt_lex.l"
 return (DT_TOK_QUESTION);
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 595 "dt_lex.l"
+#line 598 "dt_lex.l"
 return (DT_TOK_COLON);
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 596 "dt_lex.l"
+#line 599 "dt_lex.l"
 return (DT_TOK_DOT);
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 597 "dt_lex.l"
+#line 600 "dt_lex.l"
 return (DT_TOK_PTR);
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 598 "dt_lex.l"
+#line 601 "dt_lex.l"
 return (DT_TOK_ASGN);
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 599 "dt_lex.l"
+#line 602 "dt_lex.l"
 return (DT_TOK_ADD_EQ);
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 600 "dt_lex.l"
+#line 603 "dt_lex.l"
 return (DT_TOK_SUB_EQ);
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 601 "dt_lex.l"
+#line 604 "dt_lex.l"
 return (DT_TOK_MUL_EQ);
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 602 "dt_lex.l"
+#line 605 "dt_lex.l"
 return (DT_TOK_DIV_EQ);
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 603 "dt_lex.l"
+#line 606 "dt_lex.l"
 return (DT_TOK_MOD_EQ);
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 604 "dt_lex.l"
+#line 607 "dt_lex.l"
 return (DT_TOK_AND_EQ);
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 605 "dt_lex.l"
+#line 608 "dt_lex.l"
 return (DT_TOK_XOR_EQ);
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 606 "dt_lex.l"
+#line 609 "dt_lex.l"
 return (DT_TOK_OR_EQ);
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 607 "dt_lex.l"
+#line 610 "dt_lex.l"
 return (DT_TOK_LSH_EQ);
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 608 "dt_lex.l"
+#line 611 "dt_lex.l"
 return (DT_TOK_RSH_EQ);
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 609 "dt_lex.l"
+#line 612 "dt_lex.l"
 return (DT_TOK_ADDADD);
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 610 "dt_lex.l"
+#line 613 "dt_lex.l"
 return (DT_TOK_SUBSUB);
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 611 "dt_lex.l"
+#line 614 "dt_lex.l"
 return (DT_TOK_ELLIPSIS);
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 612 "dt_lex.l"
+#line 615 "dt_lex.l"
 return (DT_TOK_COMMA);
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 613 "dt_lex.l"
+#line 616 "dt_lex.l"
 return (';');
 	YY_BREAK
 case 147:
-/* rule 147 can match eol */
-YY_RULE_SETUP
-#line 614 "dt_lex.l"
+YY_RULE_SETUP
+#line 617 "dt_lex.l"
 ; /* discard */
 	YY_BREAK
 case 148:
-/* rule 148 can match eol */
-YY_RULE_SETUP
-#line 615 "dt_lex.l"
+YY_RULE_SETUP
+#line 618 "dt_lex.l"
 ; /* discard */
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 616 "dt_lex.l"
+#line 619 "dt_lex.l"
 yyerror("syntax error near \"%c\"\n", yytext[0]);
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 618 "dt_lex.l"
+#line 621 "dt_lex.l"
 yyerror("/* encountered inside a comment\n");
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 619 "dt_lex.l"
+#line 622 "dt_lex.l"
 BEGIN(yypcb->pcb_cstate);
 	YY_BREAK
 /* VBOX - START */
 case YY_STATE_EOF(S1):
-#line 621 "dt_lex.l"
+#line 624 "dt_lex.l"
 yyerror("end-of-file encountered before matching */\n");
 	YY_BREAK
 /* VBOX - END */
 case 152:
-/* rule 152 can match eol */
-YY_RULE_SETUP
-#line 623 "dt_lex.l"
+YY_RULE_SETUP
+#line 626 "dt_lex.l"
 ; /* discard */
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 625 "dt_lex.l"
+#line 628 "dt_lex.l"
 {
 			/*
@@ -2500,27 +2348,25 @@
 case 154:
 YY_RULE_SETUP
-#line 678 "dt_lex.l"
+#line 681 "dt_lex.l"
 return (DT_TOK_DIV);
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 679 "dt_lex.l"
+#line 682 "dt_lex.l"
 return (DT_TOK_COMMA);
 	YY_BREAK
 case 156:
-/* rule 156 can match eol */
-YY_RULE_SETUP
-#line 681 "dt_lex.l"
+YY_RULE_SETUP
+#line 684 "dt_lex.l"
 ; /* discard */
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 682 "dt_lex.l"
+#line 685 "dt_lex.l"
 yyerror("syntax error near \"%c\"\n", yytext[0]);
 	YY_BREAK
 case 158:
-/* rule 158 can match eol */
-YY_RULE_SETUP
-#line 684 "dt_lex.l"
+YY_RULE_SETUP
+#line 687 "dt_lex.l"
 {
 			dt_pragma(yypragma);
@@ -2531,10 +2377,10 @@
 case 159:
 YY_RULE_SETUP
-#line 690 "dt_lex.l"
+#line 693 "dt_lex.l"
 ; /* discard */
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 692 "dt_lex.l"
+#line 695 "dt_lex.l"
 {
 			dt_node_t *dnp;
@@ -2558,5 +2404,5 @@
 /* VBOX - BEGIN */
 case YY_STATE_EOF(S3):
-#line 712 "dt_lex.l"
+#line 715 "dt_lex.l"
 yyerror("end-of-file encountered before end of control line\n");
 	YY_BREAK
@@ -2564,13 +2410,13 @@
 case 161:
 YY_RULE_SETUP
-#line 714 "dt_lex.l"
+#line 717 "dt_lex.l"
 yyerror("syntax error near \"%c\"\n", yytext[0]);
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 716 "dt_lex.l"
+#line 719 "dt_lex.l"
 ECHO;
 	YY_BREAK
-#line 2575 "dt_lex.c"
+#line 2421 "dt_lex.c"
 			case YY_STATE_EOF(INITIAL):
 			case YY_STATE_EOF(S0):
@@ -2582,11 +2428,11 @@
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
+		*yy_cp = yy_hold_char;
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
@@ -2594,12 +2440,12 @@
 			 * just pointed yyin at a new source and called
 			 * yylex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
+			 * consistency between yy_current_buffer and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			yy_n_chars = yy_current_buffer->yy_n_chars;
+			yy_current_buffer->yy_input_file = yyin;
+			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
@@ -2611,11 +2457,11 @@
 		 * in input().
 		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state(  );
+			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state();
 
 			/* Okay, we're now positioned to make the NUL
@@ -2630,10 +2476,10 @@
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+			yy_bp = yytext_ptr + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
+				yy_cp = ++yy_c_buf_p;
 				yy_current_state = yy_next_state;
 				goto yy_match;
@@ -2642,16 +2488,16 @@
 			else
 				{
-				yy_cp = (yy_c_buf_p);
+				yy_cp = yy_c_buf_p;
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer(  ) )
+		else switch ( yy_get_next_buffer() )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				(yy_did_buffer_switch_on_eof) = 0;
-
-				if ( yywrap( ) )
+				yy_did_buffer_switch_on_eof = 0;
+
+				if ( yywrap() )
 					{
 					/* Note: because we've taken care in
@@ -2664,5 +2510,5 @@
 					 * YY_NULL will get returned.
 					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
@@ -2672,5 +2518,5 @@
 				else
 					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
+					if ( ! yy_did_buffer_switch_on_eof )
 						YY_NEW_FILE;
 					}
@@ -2679,21 +2525,21 @@
 
 			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				yy_c_buf_p =
+					yytext_ptr + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state();
+
+				yy_cp = yy_c_buf_p;
+				yy_bp = yytext_ptr + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				yy_c_buf_p =
+				&yy_current_buffer->yy_ch_buf[yy_n_chars];
+
+				yy_current_state = yy_get_previous_state();
+
+				yy_cp = yy_c_buf_p;
+				yy_bp = yytext_ptr + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
@@ -2706,5 +2552,6 @@
 	} /* end of action switch */
 		} /* end of scanning one token */
-} /* end of yylex */
+	} /* end of yylex */
+
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -2715,18 +2562,19 @@
  *	EOB_ACT_END_OF_FILE - end of file
  */
-static int yy_get_next_buffer (void)
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
+
+static int yy_get_next_buffer()
+	{
+	register char *dest = yy_current_buffer->yy_ch_buf;
+	register char *source = yytext_ptr;
 	register int number_to_move, i;
 	int ret_val;
 
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+	if ( yy_current_buffer->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
@@ -2748,26 +2596,60 @@
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
 
 	else
 		{
-			yy_size_t num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+		int num_to_read =
+			yy_current_buffer->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
-
+#ifdef YY_USES_REJECT
 			YY_FATAL_ERROR(
 "input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-
+#else
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = yy_current_buffer;
+
+			int yy_c_buf_p_offset =
+				(int) (yy_c_buf_p - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				int new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yy_flex_realloc( (void *) b->yy_ch_buf,
+							 b->yy_buf_size + 2 );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = yy_current_buffer->yy_buf_size -
+						number_to_move - 1;
+#endif
 			}
 
@@ -2776,16 +2658,16 @@
 
 		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
+			yy_n_chars, num_to_read );
+
+		yy_current_buffer->yy_n_chars = yy_n_chars;
 		}
 
-	if ( (yy_n_chars) == 0 )
+	if ( yy_n_chars == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart(yyin  );
+			yyrestart( yyin );
 			}
 
@@ -2793,5 +2675,5 @@
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+			yy_current_buffer->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
@@ -2801,35 +2683,27 @@
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	yy_n_chars += number_to_move;
+	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+
+	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+
+	return ret_val;
 	}
 
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
-	return ret_val;
-}
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-    static yy_state_type yy_get_previous_state (void)
-{
+static yy_state_type yy_get_previous_state()
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
-	yy_current_state = (yy_start);
+
+	yy_current_state = yy_start;
 	yy_current_state += YY_AT_BOL();
-
-	(yy_state_ptr) = (yy_state_buf);
-	*(yy_state_ptr)++ = yy_current_state;
-
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+	yy_state_ptr = yy_state_buf;
+	*yy_state_ptr++ = yy_current_state;
+
+	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
@@ -2841,9 +2715,10 @@
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		*(yy_state_ptr)++ = yy_current_state;
+		*yy_state_ptr++ = yy_current_state;
 		}
 
 	return yy_current_state;
-}
+	}
+
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
@@ -2852,8 +2727,14 @@
  *	next_state = yy_try_NUL_trans( current_state );
  */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-{
+
+#ifdef YY_USE_PROTOS
+static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
+#else
+static yy_state_type yy_try_NUL_trans( yy_current_state )
+yy_state_type yy_current_state;
+#endif
+	{
 	register int yy_is_jam;
-    
+
 	register YY_CHAR yy_c = 1;
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
@@ -2866,36 +2747,42 @@
 	yy_is_jam = (yy_current_state == 509);
 	if ( ! yy_is_jam )
-		*(yy_state_ptr)++ = yy_current_state;
+		*yy_state_ptr++ = yy_current_state;
 
 	return yy_is_jam ? 0 : yy_current_state;
-}
-
-    static void yyunput (int c, register char * yy_bp )
-{
-	register char *yy_cp;
-    
-    yy_cp = (yy_c_buf_p);
+	}
+
+
+#ifndef YY_NO_UNPUT
+#ifdef YY_USE_PROTOS
+static void yyunput( int c, register char *yy_bp )
+#else
+static void yyunput( c, yy_bp )
+int c;
+register char *yy_bp;
+#endif
+	{
+	register char *yy_cp = yy_c_buf_p;
 
 	/* undo effects of setting up yytext */
-	*yy_cp = (yy_hold_char);
-
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+	*yy_cp = yy_hold_char;
+
+	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register yy_size_t number_to_move = (yy_n_chars) + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register int number_to_move = yy_n_chars + 2;
+		register char *dest = &yy_current_buffer->yy_ch_buf[
+					yy_current_buffer->yy_buf_size + 2];
 		register char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
-
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+				&yy_current_buffer->yy_ch_buf[number_to_move];
+
+		while ( source > yy_current_buffer->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
-
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		yy_current_buffer->yy_n_chars =
+			yy_n_chars = yy_current_buffer->yy_buf_size;
+
+		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
@@ -2903,26 +2790,25 @@
 	*--yy_cp = (char) c;
 
-    if ( c == '\n' ){
-        --yylineno;
-    }
-
-	(yytext_ptr) = yy_bp;
-	(yy_hold_char) = *yy_cp;
-	(yy_c_buf_p) = yy_cp;
-}
-
-#ifndef YY_NO_INPUT
+	if ( c == '\n' )
+		--yylineno;
+
+	yytext_ptr = yy_bp;
+	yy_hold_char = *yy_cp;
+	yy_c_buf_p = yy_cp;
+	}
+#endif	/* ifndef YY_NO_UNPUT */
+
+
 #ifdef __cplusplus
-    static int yyinput (void)
-#else
-    static int input  (void)
-#endif
-
-{
+static int yyinput()
+#else
+static int input()
+#endif
+	{
 	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
-
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+
+	*yy_c_buf_p = yy_hold_char;
+
+	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
@@ -2930,14 +2816,14 @@
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
 			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
+			*yy_c_buf_p = '\0';
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
-			++(yy_c_buf_p);
-
-			switch ( yy_get_next_buffer(  ) )
+			int offset = yy_c_buf_p - yytext_ptr;
+			++yy_c_buf_p;
+
+			switch ( yy_get_next_buffer() )
 				{
 				case EOB_ACT_LAST_MATCH:
@@ -2953,14 +2839,14 @@
 
 					/* Reset buffer status. */
-					yyrestart(yyin );
-
-					/*FALLTHROUGH*/
+					yyrestart( yyin );
+
+					/* fall through */
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap( ) )
-						return 0;
-
-					if ( ! (yy_did_buffer_switch_on_eof) )
+					if ( yywrap() )
+						return EOF;
+
+					if ( ! yy_did_buffer_switch_on_eof )
 						YY_NEW_FILE;
 #ifdef __cplusplus
@@ -2972,5 +2858,5 @@
 
 				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
+					yy_c_buf_p = yytext_ptr + offset;
 					break;
 				}
@@ -2978,62 +2864,51 @@
 		}
 
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve yytext */
-	(yy_hold_char) = *++(yy_c_buf_p);
-
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_at_bol )
-		   
-    yylineno++;
-;
+	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
+	*yy_c_buf_p = '\0';	/* preserve yytext */
+	yy_hold_char = *++yy_c_buf_p;
+
+	yy_current_buffer->yy_at_bol = (c == '\n');
+	if ( yy_current_buffer->yy_at_bol )
+		++yylineno;
 
 	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void yyrestart  (FILE * input_file )
-{
-    
-	if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE );
 	}
 
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-{
-    
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		yypop_buffer_state();
-	 *		yypush_buffer_state(new_buffer);
-     */
-	yyensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
+
+#ifdef YY_USE_PROTOS
+void yyrestart( FILE *input_file )
+#else
+void yyrestart( input_file )
+FILE *input_file;
+#endif
+	{
+	if ( ! yy_current_buffer )
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+
+	yy_init_buffer( yy_current_buffer, input_file );
+	yy_load_buffer_state();
+	}
+
+
+#ifdef YY_USE_PROTOS
+void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
+#else
+void yy_switch_to_buffer( new_buffer )
+YY_BUFFER_STATE new_buffer;
+#endif
+	{
+	if ( yy_current_buffer == new_buffer )
 		return;
 
-	if ( YY_CURRENT_BUFFER )
+	if ( yy_current_buffer )
 		{
 		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		*yy_c_buf_p = yy_hold_char;
+		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
+		yy_current_buffer->yy_n_chars = yy_n_chars;
 		}
 
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
+	yy_current_buffer = new_buffer;
+	yy_load_buffer_state();
 
 	/* We don't actually know whether we did this switch during
@@ -3042,26 +2917,32 @@
 	 * to go ahead and always set it.
 	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-static void yy_load_buffer_state  (void)
-{
-    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
-{
+	yy_did_buffer_switch_on_eof = 1;
+	}
+
+
+#ifdef YY_USE_PROTOS
+void yy_load_buffer_state( void )
+#else
+void yy_load_buffer_state()
+#endif
+	{
+	yy_n_chars = yy_current_buffer->yy_n_chars;
+	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
+	yyin = yy_current_buffer->yy_input_file;
+	yy_hold_char = *yy_c_buf_p;
+	}
+
+
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
+#else
+YY_BUFFER_STATE yy_create_buffer( file, size )
+FILE *file;
+int size;
+#endif
+	{
 	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -3072,5 +2953,5 @@
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -3078,67 +2959,72 @@
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer(b,file );
+	yy_init_buffer( b, file );
 
 	return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
+	}
+
+
+#ifdef YY_USE_PROTOS
+void yy_delete_buffer( YY_BUFFER_STATE b )
+#else
+void yy_delete_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+	{
 	if ( ! b )
 		return;
 
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+	if ( b == yy_current_buffer )
+		yy_current_buffer = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf  );
-
-	yyfree((void *) b  );
-}
-
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-    
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
-
-{
-	int oerrno = errno;
-    
-	yy_flush_buffer(b );
+		yy_flex_free( (void *) b->yy_ch_buf );
+
+	yy_flex_free( (void *) b );
+	}
+
+
+#ifndef YY_ALWAYS_INTERACTIVE
+#ifndef YY_NEVER_INTERACTIVE
+extern int isatty YY_PROTO(( int ));
+#endif
+#endif
+
+#ifdef YY_USE_PROTOS
+void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
+#else
+void yy_init_buffer( b, file )
+YY_BUFFER_STATE b;
+FILE *file;
+#endif
+
+
+	{
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* If b is the current buffer, then yy_init_buffer was _probably_
-     * called from yyrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
-	errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
-    void yy_flush_buffer (YY_BUFFER_STATE  b )
-{
-    	if ( ! b )
+#if YY_ALWAYS_INTERACTIVE
+	b->yy_is_interactive = 1;
+#else
+#if YY_NEVER_INTERACTIVE
+	b->yy_is_interactive = 0;
+#else
+	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+#endif
+#endif
+	}
+
+
+#ifdef YY_USE_PROTOS
+void yy_flush_buffer( YY_BUFFER_STATE b )
+#else
+void yy_flush_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+
+	{
+	if ( ! b )
 		return;
 
@@ -3157,116 +3043,20 @@
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
-    	if (new_buffer == NULL)
-		return;
-
-	yyensure_buffer_stack();
-
-	/* This block is copied from yy_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state( );
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  
- */
-void yypop_buffer_state (void)
-{
-    	if (!YY_CURRENT_BUFFER)
-		return;
-
-	yy_delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state( );
-		(yy_did_buffer_switch_on_eof) = 1;
+	if ( b == yy_current_buffer )
+		yy_load_buffer_state();
 	}
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (void)
-{
-	yy_size_t num_to_alloc;
-    
-	if (!(yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-								  
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
-	}
-
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
-{
+
+
+#ifndef YY_NO_SCAN_BUFFER
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
+#else
+YY_BUFFER_STATE yy_scan_buffer( base, size )
+char *base;
+yy_size_t size;
+#endif
+	{
 	YY_BUFFER_STATE b;
-    
+
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
@@ -3275,5 +3065,5 @@
 		return 0;
 
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
@@ -3289,48 +3079,54 @@
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer(b  );
+	yy_switch_to_buffer( b );
 
 	return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
-{
-    
-	return yy_scan_bytes(yystr,strlen(yystr) );
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
-{
+	}
+#endif
+
+
+#ifndef YY_NO_SCAN_STRING
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
+#else
+YY_BUFFER_STATE yy_scan_string( yy_str )
+yyconst char *yy_str;
+#endif
+	{
+	int len;
+	for ( len = 0; yy_str[len]; ++len )
+		;
+
+	return yy_scan_bytes( yy_str, len );
+	}
+#endif
+
+
+#ifndef YY_NO_SCAN_BYTES
+#ifdef YY_USE_PROTOS
+YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
+#else
+YY_BUFFER_STATE yy_scan_bytes( bytes, len )
+yyconst char *bytes;
+int len;
+#endif
+	{
 	YY_BUFFER_STATE b;
 	char *buf;
-	yy_size_t n, i;
-    
+	yy_size_t n;
+	int i;
+
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) yyalloc(n  );
+	n = len + 2;
+	buf = (char *) yy_flex_alloc( n );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
-
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer(buf,n );
+	for ( i = 0; i < len; ++i )
+		buf[i] = bytes[i];
+
+	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = yy_scan_buffer( buf, n );
 	if ( ! b )
 		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
@@ -3342,5 +3138,59 @@
 
 	return b;
-}
+	}
+#endif
+
+
+#ifndef YY_NO_PUSH_STATE
+#ifdef YY_USE_PROTOS
+static void yy_push_state( int new_state )
+#else
+static void yy_push_state( new_state )
+int new_state;
+#endif
+	{
+	if ( yy_start_stack_ptr >= yy_start_stack_depth )
+		{
+		yy_size_t new_size;
+
+		yy_start_stack_depth += YY_START_STACK_INCR;
+		new_size = yy_start_stack_depth * sizeof( int );
+
+		if ( ! yy_start_stack )
+			yy_start_stack = (int *) yy_flex_alloc( new_size );
+
+		else
+			yy_start_stack = (int *) yy_flex_realloc(
+					(void *) yy_start_stack, new_size );
+
+		if ( ! yy_start_stack )
+			YY_FATAL_ERROR(
+			"out of memory expanding start-condition stack" );
+		}
+
+	yy_start_stack[yy_start_stack_ptr++] = YY_START;
+
+	BEGIN(new_state);
+	}
+#endif
+
+
+#ifndef YY_NO_POP_STATE
+static void yy_pop_state()
+	{
+	if ( --yy_start_stack_ptr < 0 )
+		YY_FATAL_ERROR( "start-condition stack underflow" );
+
+	BEGIN(yy_start_stack[yy_start_stack_ptr]);
+	}
+#endif
+
+
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state()
+	{
+	return yy_start_stack[yy_start_stack_ptr - 1];
+	}
+#endif
 
 #ifndef YY_EXIT_FAILURE
@@ -3348,9 +3198,16 @@
 #endif
 
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
+#ifdef YY_USE_PROTOS
+static void yy_fatal_error( yyconst char msg[] )
+#else
+static void yy_fatal_error( msg )
+char msg[];
+#endif
+	{
+	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
-}
+	}
+
+
 
 /* Redefine yyless() so it works in section 3 code. */
@@ -3361,171 +3218,39 @@
 		{ \
 		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = (yy_hold_char); \
-		(yy_c_buf_p) = yytext + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		yyleng = yyless_macro_arg; \
+		yytext[yyleng] = yy_hold_char; \
+		yy_c_buf_p = yytext + n; \
+		yy_hold_char = *yy_c_buf_p; \
+		*yy_c_buf_p = '\0'; \
+		yyleng = n; \
 		} \
 	while ( 0 )
 
-/* Accessor  methods (get/set functions) to struct members. */
-
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
-
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
-
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
-
-/** Get the length of the current token.
- * 
- */
-yy_size_t yyget_leng  (void)
-{
-        return yyleng;
-}
-
-/** Get the current token.
- * 
- */
-
-char *yyget_text  (void)
-{
-        return yytext;
-}
-
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE *  in_str )
-{
-        yyin = in_str ;
-}
-
-void yyset_out (FILE *  out_str )
-{
-        yyout = out_str ;
-}
-
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
-
-void yyset_debug (int  bdebug )
-{
-        yy_flex_debug = bdebug ;
-}
-
-static int yy_init_globals (void)
-{
-        /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from yylex_destroy(), so don't allocate here.
-     */
-
-    /* We do not touch yylineno unless the option is enabled. */
-    yylineno =  1;
-    
-    (yy_buffer_stack) = 0;
-    (yy_buffer_stack_top) = 0;
-    (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
-    (yy_init) = 0;
-    (yy_start) = 0;
-
-    (yy_state_buf) = 0;
-    (yy_state_ptr) = 0;
-    (yy_full_match) = 0;
-    (yy_lp) = 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    yyin = stdin;
-    yyout = stdout;
-#else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
-#endif
-
-    /* For future reference: Set errno on error, since we are called by
-     * yylex_init()
-     */
-    return 0;
-}
-
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
-{
-    
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer(YY_CURRENT_BUFFER  );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypop_buffer_state();
-	}
-
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
-
-    yyfree ( (yy_state_buf) );
-    (yy_state_buf)  = NULL;
-
-    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * yylex() is called, initialization will occur. */
-    yy_init_globals( );
-
-    return 0;
-}
-
-/*
- * Internal utility routines.
- */
+
+/* Internal utility routines. */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
+#ifdef YY_USE_PROTOS
+static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
+#else
+static void yy_flex_strncpy( s1, s2, n )
+char *s1;
+yyconst char *s2;
+int n;
+#endif
+	{
 	register int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-}
+	}
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
+#ifdef YY_USE_PROTOS
+static int yy_flex_strlen( yyconst char *s )
+#else
+static int yy_flex_strlen( s )
+yyconst char *s;
+#endif
+	{
 	register int n;
 	for ( n = 0; s[n]; ++n )
@@ -3533,14 +3258,26 @@
 
 	return n;
-}
-#endif
-
-void *yyalloc (yy_size_t  size )
-{
+	}
+#endif
+
+
+#ifdef YY_USE_PROTOS
+static void *yy_flex_alloc( yy_size_t size )
+#else
+static void *yy_flex_alloc( size )
+yy_size_t size;
+#endif
+	{
 	return (void *) malloc( size );
-}
-
-void *yyrealloc  (void * ptr, yy_size_t  size )
-{
+	}
+
+#ifdef YY_USE_PROTOS
+static void *yy_flex_realloc( void *ptr, yy_size_t size )
+#else
+static void *yy_flex_realloc( ptr, size )
+void *ptr;
+yy_size_t size;
+#endif
+	{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
@@ -3551,15 +3288,24 @@
 	 */
 	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#line 716 "dt_lex.l"
-
+	}
+
+#ifdef YY_USE_PROTOS
+static void yy_flex_free( void *ptr )
+#else
+static void yy_flex_free( ptr )
+void *ptr;
+#endif
+	{
+	free( ptr );
+	}
+
+#if YY_MAIN
+int main()
+	{
+	yylex();
+	return 0;
+	}
+#endif
+#line 719 "dt_lex.l"
 
 
@@ -3619,5 +3365,5 @@
 	yysptr = yysbuf;
 #else
-   yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE));
+   yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
 #endif
 }
@@ -3761,3 +3507,2 @@
 
 #endif /* USING_FLEX */
-
