Update h5LT files with latest flex and Bison available on jelly (#502)

* Modify temporary rpath for testing in java example scripts.

* Update URL in source file Copyright headers for web copy of COPYING (license) file.

* Add release_docs/code-conventions.md file.

* Add script to test h5py.

* Fix script error.

* Add file h5pytest.yml.

* Test declaration of counter variables in for loops.

* Committing clang-format changes

* Committing clang-format changes

* Added [] to line 126 of H5LTanalyze.l.
Ran bin/genparser with flex v2.6.4 and Bison v3.0.4 on jelly.

* Revert "Added [] to line 126 of H5LTanalyze.l."

This reverts commit e4a9cee441efa75b16a8ee030c86189e186dd266.

* Revert extra commits to match canonical develop.

* Added [] to H5LTanalyze.l line 126 to eliminate warning "rule could not be
matched".
Ran bin/genparser hl/src with flex v2.6.4 and Bison v3.0.4 on jelly.

* Added HD to strdup in H5LTparse.y line 338.
Ran bin/genparser hlsrc again.

* Removed line 126 from H5LTanalyze.l - previous line matches.
Added previously removed line 318 of H5LTparse.y to fix hl_test_lite
failure.
Ran bin/genparser.

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

1 files changed, 551 insertions, 712 deletions

diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index eec7c64..7f552d8 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -28,22 +28,22 @@
 #elif defined _MSC_VER                                            
 #pragma warning(push, 1)                                          
 #endif                                                            
-/* A Bison parser, made by GNU Bison 2.7.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-   
+
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    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, see <http://www.gnu.org/licenses/>.  */
 
@@ -56,7 +56,7 @@
    special exception, which will cause the skeleton and the resulting
    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.  */
 
@@ -74,7 +74,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.7"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -93,14 +93,14 @@
 #define yyparse         H5LTyyparse
 #define yylex           H5LTyylex
 #define yyerror         H5LTyyerror
-#define yylval          H5LTyylval
-#define yychar          H5LTyychar
 #define yydebug         H5LTyydebug
 #define yynerrs         H5LTyynerrs
 
+#define yylval          H5LTyylval
+#define yychar          H5LTyychar
+
 /* Copy the first part of user declarations.  */
-/* Line 371 of yacc.c  */
-#line 20 "hl/src//H5LTparse.y"
+#line 20 "hl/src/H5LTparse.y" /* yacc.c:339  */
 
 #include <stdio.h>
 #include <string.h>
@@ -150,14 +150,13 @@ static hbool_t     is_enum_memb = 0;       /*flag to lexer for enum member*/
 static char*       enum_memb_symbol;       /*enum member symbol string*/
 
 
-/* Line 371 of yacc.c  */
-#line 125 "hl/src//H5LTparse.c"
+#line 124 "hl/src/H5LTparse.c" /* yacc.c:339  */
 
-# ifndef YY_NULL
+# ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULL nullptr
+#   define YY_NULLPTR nullptr
 #  else
-#   define YY_NULL 0
+#   define YY_NULLPTR 0
 #  endif
 # endif
 
@@ -173,7 +172,7 @@ static char*       enum_memb_symbol;       /*enum member symbol string*/
    by #include "H5LTparse.h".  */
 #ifndef YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED
 # define YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED
-/* Enabling traces.  */
+/* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
 #endif
@@ -181,113 +180,99 @@ static char*       enum_memb_symbol;       /*enum member symbol string*/
 extern int H5LTyydebug;
 #endif
 
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     H5T_STD_I8BE_TOKEN = 258,
-     H5T_STD_I8LE_TOKEN = 259,
-     H5T_STD_I16BE_TOKEN = 260,
-     H5T_STD_I16LE_TOKEN = 261,
-     H5T_STD_I32BE_TOKEN = 262,
-     H5T_STD_I32LE_TOKEN = 263,
-     H5T_STD_I64BE_TOKEN = 264,
-     H5T_STD_I64LE_TOKEN = 265,
-     H5T_STD_U8BE_TOKEN = 266,
-     H5T_STD_U8LE_TOKEN = 267,
-     H5T_STD_U16BE_TOKEN = 268,
-     H5T_STD_U16LE_TOKEN = 269,
-     H5T_STD_U32BE_TOKEN = 270,
-     H5T_STD_U32LE_TOKEN = 271,
-     H5T_STD_U64BE_TOKEN = 272,
-     H5T_STD_U64LE_TOKEN = 273,
-     H5T_NATIVE_CHAR_TOKEN = 274,
-     H5T_NATIVE_SCHAR_TOKEN = 275,
-     H5T_NATIVE_UCHAR_TOKEN = 276,
-     H5T_NATIVE_SHORT_TOKEN = 277,
-     H5T_NATIVE_USHORT_TOKEN = 278,
-     H5T_NATIVE_INT_TOKEN = 279,
-     H5T_NATIVE_UINT_TOKEN = 280,
-     H5T_NATIVE_LONG_TOKEN = 281,
-     H5T_NATIVE_ULONG_TOKEN = 282,
-     H5T_NATIVE_LLONG_TOKEN = 283,
-     H5T_NATIVE_ULLONG_TOKEN = 284,
-     H5T_IEEE_F32BE_TOKEN = 285,
-     H5T_IEEE_F32LE_TOKEN = 286,
-     H5T_IEEE_F64BE_TOKEN = 287,
-     H5T_IEEE_F64LE_TOKEN = 288,
-     H5T_NATIVE_FLOAT_TOKEN = 289,
-     H5T_NATIVE_DOUBLE_TOKEN = 290,
-     H5T_NATIVE_LDOUBLE_TOKEN = 291,
-     H5T_STRING_TOKEN = 292,
-     STRSIZE_TOKEN = 293,
-     STRPAD_TOKEN = 294,
-     CSET_TOKEN = 295,
-     CTYPE_TOKEN = 296,
-     H5T_VARIABLE_TOKEN = 297,
-     H5T_STR_NULLTERM_TOKEN = 298,
-     H5T_STR_NULLPAD_TOKEN = 299,
-     H5T_STR_SPACEPAD_TOKEN = 300,
-     H5T_CSET_ASCII_TOKEN = 301,
-     H5T_CSET_UTF8_TOKEN = 302,
-     H5T_C_S1_TOKEN = 303,
-     H5T_FORTRAN_S1_TOKEN = 304,
-     H5T_OPAQUE_TOKEN = 305,
-     OPQ_SIZE_TOKEN = 306,
-     OPQ_TAG_TOKEN = 307,
-     H5T_COMPOUND_TOKEN = 308,
-     H5T_ENUM_TOKEN = 309,
-     H5T_ARRAY_TOKEN = 310,
-     H5T_VLEN_TOKEN = 311,
-     STRING = 312,
-     NUMBER = 313
-   };
+  enum yytokentype
+  {
+    H5T_STD_I8BE_TOKEN = 258,
+    H5T_STD_I8LE_TOKEN = 259,
+    H5T_STD_I16BE_TOKEN = 260,
+    H5T_STD_I16LE_TOKEN = 261,
+    H5T_STD_I32BE_TOKEN = 262,
+    H5T_STD_I32LE_TOKEN = 263,
+    H5T_STD_I64BE_TOKEN = 264,
+    H5T_STD_I64LE_TOKEN = 265,
+    H5T_STD_U8BE_TOKEN = 266,
+    H5T_STD_U8LE_TOKEN = 267,
+    H5T_STD_U16BE_TOKEN = 268,
+    H5T_STD_U16LE_TOKEN = 269,
+    H5T_STD_U32BE_TOKEN = 270,
+    H5T_STD_U32LE_TOKEN = 271,
+    H5T_STD_U64BE_TOKEN = 272,
+    H5T_STD_U64LE_TOKEN = 273,
+    H5T_NATIVE_CHAR_TOKEN = 274,
+    H5T_NATIVE_SCHAR_TOKEN = 275,
+    H5T_NATIVE_UCHAR_TOKEN = 276,
+    H5T_NATIVE_SHORT_TOKEN = 277,
+    H5T_NATIVE_USHORT_TOKEN = 278,
+    H5T_NATIVE_INT_TOKEN = 279,
+    H5T_NATIVE_UINT_TOKEN = 280,
+    H5T_NATIVE_LONG_TOKEN = 281,
+    H5T_NATIVE_ULONG_TOKEN = 282,
+    H5T_NATIVE_LLONG_TOKEN = 283,
+    H5T_NATIVE_ULLONG_TOKEN = 284,
+    H5T_IEEE_F32BE_TOKEN = 285,
+    H5T_IEEE_F32LE_TOKEN = 286,
+    H5T_IEEE_F64BE_TOKEN = 287,
+    H5T_IEEE_F64LE_TOKEN = 288,
+    H5T_NATIVE_FLOAT_TOKEN = 289,
+    H5T_NATIVE_DOUBLE_TOKEN = 290,
+    H5T_NATIVE_LDOUBLE_TOKEN = 291,
+    H5T_STRING_TOKEN = 292,
+    STRSIZE_TOKEN = 293,
+    STRPAD_TOKEN = 294,
+    CSET_TOKEN = 295,
+    CTYPE_TOKEN = 296,
+    H5T_VARIABLE_TOKEN = 297,
+    H5T_STR_NULLTERM_TOKEN = 298,
+    H5T_STR_NULLPAD_TOKEN = 299,
+    H5T_STR_SPACEPAD_TOKEN = 300,
+    H5T_CSET_ASCII_TOKEN = 301,
+    H5T_CSET_UTF8_TOKEN = 302,
+    H5T_C_S1_TOKEN = 303,
+    H5T_FORTRAN_S1_TOKEN = 304,
+    H5T_OPAQUE_TOKEN = 305,
+    OPQ_SIZE_TOKEN = 306,
+    OPQ_TAG_TOKEN = 307,
+    H5T_COMPOUND_TOKEN = 308,
+    H5T_ENUM_TOKEN = 309,
+    H5T_ARRAY_TOKEN = 310,
+    H5T_VLEN_TOKEN = 311,
+    STRING = 312,
+    NUMBER = 313
+  };
 #endif
 
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+
+union YYSTYPE
 {
-/* Line 387 of yacc.c  */
-#line 69 "hl/src//H5LTparse.y"
+#line 69 "hl/src/H5LTparse.y" /* yacc.c:355  */
 
     int     ival;         /*for integer token*/
     char    *sval;        /*for name string*/
     hid_t   hid;          /*for hid_t token*/
 
+#line 229 "hl/src/H5LTparse.c" /* yacc.c:355  */
+};
 
-/* Line 387 of yacc.c  */
-#line 233 "hl/src//H5LTparse.c"
-} YYSTYPE;
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
+
 extern YYSTYPE H5LTyylval;
 
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-hid_t H5LTyyparse (void *YYPARSE_PARAM);
-#else
-hid_t H5LTyyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
 hid_t H5LTyyparse (void);
-#else
-hid_t H5LTyyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
 #endif /* !YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
-/* Line 390 of yacc.c  */
-#line 261 "hl/src//H5LTparse.c"
+#line 246 "hl/src/H5LTparse.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -301,11 +286,8 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
 #else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -325,8 +307,7 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -348,6 +329,33 @@ typedef short int yytype_int16;
 # endif
 #endif
 
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
 # define YYUSE(E) ((void) (E))
@@ -355,23 +363,25 @@ typedef short int yytype_int16;
 # define YYUSE(E) /* empty */
 #endif
 
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(N) (N)
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
 #else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return yyi;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
 #endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
 
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
@@ -390,8 +400,7 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
       /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
 #     ifndef EXIT_SUCCESS
@@ -403,8 +412,8 @@ YYID (yyi)
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
@@ -420,7 +429,7 @@ YYID (yyi)
 #  endif
 #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   ifndef EXIT_SUCCESS
 #    define EXIT_SUCCESS 0
@@ -428,15 +437,13 @@ YYID (yyi)
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -446,7 +453,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
@@ -471,16 +478,16 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
 
 #endif
 
@@ -499,7 +506,7 @@ union yyalloc
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)[yyi] = (Src)[yyi];            \
         }                                       \
-      while (YYID (0))
+      while (0)
 #  endif
 # endif
 #endif /* !YYCOPY_NEEDED */
@@ -515,17 +522,19 @@ union yyalloc
 #define YYNNTS  43
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  92
-/* YYNRULES -- Number of states.  */
+/* YYNSTATES -- Number of states.  */
 #define YYNSTATES  134
 
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   313
 
-#define YYTRANSLATE(YYX)						\
+#define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -563,51 +572,7 @@ static const yytype_uint8 yytranslate[] =
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint8 yyprhs[] =
-{
-       0,     0,     3,     4,     6,     8,    10,    12,    14,    16,
-      18,    20,    22,    24,    26,    28,    30,    32,    34,    36,
-      38,    40,    42,    44,    46,    48,    50,    52,    54,    56,
-      58,    60,    62,    64,    66,    68,    70,    72,    74,    76,
-      78,    80,    82,    84,    86,    88,    90,    92,    93,    99,
-     100,   103,   104,   110,   112,   113,   116,   118,   119,   126,
-     127,   130,   131,   132,   138,   140,   145,   146,   147,   159,
-     161,   163,   164,   165,   166,   167,   187,   189,   191,   193,
-     195,   197,   199,   201,   203,   205,   206,   214,   215,   218,
-     219,   224,   226
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      66,     0,    -1,    -1,    67,    -1,    68,    -1,    71,    -1,
-      79,    -1,    86,    -1,    69,    -1,    70,    -1,    92,    -1,
-     101,    -1,    87,    -1,     3,    -1,     4,    -1,     5,    -1,
-       6,    -1,     7,    -1,     8,    -1,     9,    -1,    10,    -1,
-      11,    -1,    12,    -1,    13,    -1,    14,    -1,    15,    -1,
-      16,    -1,    17,    -1,    18,    -1,    19,    -1,    20,    -1,
-      21,    -1,    22,    -1,    23,    -1,    24,    -1,    25,    -1,
-      26,    -1,    27,    -1,    28,    -1,    29,    -1,    30,    -1,
-      31,    -1,    32,    -1,    33,    -1,    34,    -1,    35,    -1,
-      36,    -1,    -1,    53,    72,    59,    73,    60,    -1,    -1,
-      73,    74,    -1,    -1,    67,    75,    76,    77,    64,    -1,
-      57,    -1,    -1,    63,    78,    -1,    58,    -1,    -1,    55,
-      80,    59,    81,    67,    60,    -1,    -1,    81,    82,    -1,
-      -1,    -1,    61,    83,    85,    84,    62,    -1,    58,    -1,
-      56,    59,    67,    60,    -1,    -1,    -1,    50,    59,    51,
-      90,    64,    88,    52,    91,    64,    89,    60,    -1,    58,
-      -1,    57,    -1,    -1,    -1,    -1,    -1,    37,    59,    38,
-      97,    64,    93,    39,    98,    64,    94,    40,    99,    64,
-      95,    41,   100,    64,    96,    60,    -1,    42,    -1,    58,
-      -1,    43,    -1,    44,    -1,    45,    -1,    46,    -1,    47,
-      -1,    48,    -1,    49,    -1,    -1,    54,    59,    69,    64,
-     102,   103,    60,    -1,    -1,   103,   104,    -1,    -1,   106,
-     105,   107,    64,    -1,    57,    -1,    58,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
        0,   102,   102,   103,   105,   106,   107,   108,   110,   111,
@@ -656,13 +621,13 @@ static const char *const yytname[] =
   "dimsize", "vlen_type", "opaque_type", "@6", "$@7", "opaque_size",
   "opaque_tag", "string_type", "$@8", "$@9", "$@10", "@11", "strsize",
   "strpad", "cset", "ctype", "enum_type", "$@12", "enum_list", "enum_def",
-  "$@13", "enum_symbol", "enum_val", YY_NULL
+  "$@13", "enum_symbol", "enum_val", YY_NULLPTR
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
@@ -675,70 +640,18 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    65,    66,    66,    67,    67,    67,    67,    68,    68,
-      68,    68,    68,    69,    69,    69,    69,    69,    69,    69,
-      69,    69,    69,    69,    69,    69,    69,    69,    69,    69,
-      69,    69,    69,    69,    69,    69,    69,    69,    69,    69,
-      70,    70,    70,    70,    70,    70,    70,    72,    71,    73,
-      73,    75,    74,    76,    77,    77,    78,    80,    79,    81,
-      81,    83,    84,    82,    85,    86,    88,    89,    87,    90,
-      91,    93,    94,    95,    96,    92,    97,    97,    98,    98,
-      98,    99,    99,   100,   100,   102,   101,   103,   103,   105,
-     104,   106,   107
-};
+#define YYPACT_NINF -25
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     0,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     0,     5,     0,
-       2,     0,     5,     1,     0,     2,     1,     0,     6,     0,
-       2,     0,     0,     5,     1,     4,     0,     0,    11,     1,
-       1,     0,     0,     0,     0,    19,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     7,     0,     2,     0,
-       4,     1,     1
-};
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-25)))
 
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint8 yydefact[] =
-{
-       2,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,     0,     0,    47,     0,    57,
-       0,     0,     3,     4,     8,     9,     5,     6,     7,    12,
-      10,    11,     0,     0,     0,     0,     0,     0,     1,     0,
-       0,    49,     0,    59,     0,    76,    77,     0,    69,     0,
-       0,    85,     0,    65,    71,    66,    48,    51,    50,    87,
-      61,     0,    60,     0,     0,     0,     0,     0,    58,     0,
-       0,    53,    54,    91,    86,    88,    89,    64,    62,    78,
-      79,    80,     0,    70,     0,     0,     0,     0,     0,    72,
-      67,    56,    55,    52,    92,     0,    63,     0,     0,    90,
-       0,    68,    81,    82,     0,    73,     0,     0,    83,    84,
-       0,    74,     0,    75
-};
+#define YYTABLE_NINF -1
 
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -1,    41,    42,    43,    44,    45,    46,    54,    70,    78,
-      85,    92,   106,   112,    47,    56,    72,    82,    87,   108,
-      98,    48,    49,    84,   118,    69,   104,    50,    83,   117,
-     126,   132,    67,   102,   124,   130,    51,    79,    86,    95,
-     107,    96,   115
-};
+#define yytable_value_is_error(Yytable_value) \
+  0
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -25
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
      114,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
@@ -757,7 +670,28 @@ static const yytype_int16 yypact[] =
      101,   -25,   103,   -25
 };
 
-/* YYPGOTO[NTERM-NUM].  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       2,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,     0,     0,    47,     0,    57,
+       0,     0,     3,     4,     8,     9,     5,     6,     7,    12,
+      10,    11,     0,     0,     0,     0,     0,     0,     1,     0,
+       0,    49,     0,    59,     0,    76,    77,     0,    69,     0,
+       0,    85,     0,    65,    71,    66,    48,    51,    50,    87,
+      61,     0,    60,     0,     0,     0,     0,     0,    58,     0,
+       0,    53,    54,    91,    86,    88,    89,    64,    62,    78,
+      79,    80,     0,    70,     0,     0,     0,     0,     0,    72,
+      67,    56,    55,    52,    92,     0,    63,     0,     0,    90,
+       0,    68,    81,    82,     0,    73,     0,     0,    83,    84,
+       0,    74,     0,    75
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
      -25,   -25,   -15,   -25,   111,   -25,   -25,   -25,   -25,   -25,
@@ -767,10 +701,19 @@ static const yytype_int8 yypgoto[] =
      -25,   -25,   -25
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -1
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,    41,    42,    43,    44,    45,    46,    54,    70,    78,
+      85,    92,   106,   112,    47,    56,    72,    82,    87,   108,
+      98,    48,    49,    84,   118,    69,   104,    50,    83,   117,
+     126,   132,    67,   102,   124,   130,    51,    79,    86,    95,
+     107,    96,   115
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_uint8 yytable[] =
 {
        1,     2,     3,     4,     5,     6,     7,     8,     9,    10,
@@ -795,12 +738,6 @@ static const yytype_uint8 yytable[] =
       20,    21,    22,    23,    24,    25,    26,    27
 };
 
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-25)))
-
-#define yytable_value_is_error(Yytable_value) \
-  YYID (0)
-
 static const yytype_uint8 yycheck[] =
 {
        3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
@@ -825,8 +762,8 @@ static const yytype_uint8 yycheck[] =
       22,    23,    24,    25,    26,    27,    28,    29
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
        0,     3,     4,     5,     6,     7,     8,     9,    10,    11,
@@ -845,30 +782,46 @@ static const yytype_uint8 yystos[] =
      100,    64,    96,    60
 };
 
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
-
-#define YYFAIL		goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    65,    66,    66,    67,    67,    67,    67,    68,    68,
+      68,    68,    68,    69,    69,    69,    69,    69,    69,    69,
+      69,    69,    69,    69,    69,    69,    69,    69,    69,    69,
+      69,    69,    69,    69,    69,    69,    69,    69,    69,    69,
+      70,    70,    70,    70,    70,    70,    70,    72,    71,    73,
+      73,    75,    74,    76,    77,    77,    78,    80,    79,    81,
+      81,    83,    84,    82,    85,    86,    88,    89,    87,    90,
+      91,    93,    94,    95,    96,    92,    97,    97,    98,    98,
+      98,    99,    99,   100,   100,   102,   101,   103,   103,   105,
+     104,   106,   107
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     5,     0,
+       2,     0,     5,     1,     0,     2,     1,     0,     6,     0,
+       2,     0,     0,     5,     1,     4,     0,     0,    11,     1,
+       1,     0,     0,     0,     0,    19,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     0,     7,     0,     2,     0,
+       4,     1,     1
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -885,28 +838,16 @@ do                                                              \
   else                                                          \
     {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
-while (YYID (0))
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
 
 /* Error token number */
-#define YYTERROR	1
-#define YYERRCODE	256
-
+#define YYTERROR        1
+#define YYERRCODE       256
 
-/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
 
 
-/* YYLEX -- calling `yylex' with the right arguments.  */
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
-
 /* Enable debugging if requested.  */
 #if YYDEBUG
 
@@ -915,40 +856,36 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (YYID (0))
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
 
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
 static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
   FILE *yyo = yyoutput;
   YYUSE (yyo);
@@ -957,14 +894,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-        break;
-    }
+  YYUSE (yytype);
 }
 
 
@@ -972,22 +903,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
   yy_symbol_value_print (yyoutput, yytype, yyvaluep);
   YYFPRINTF (yyoutput, ")");
@@ -998,16 +918,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -1018,49 +930,42 @@ yy_stack_print (yybottom, yytop)
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
 static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
+  unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -1074,7 +979,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -1097,15 +1002,8 @@ int yydebug;
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
@@ -1121,16 +1019,8 @@ yystrlen (yystr)
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
 {
   char *yyd = yydest;
   const char *yys = yysrc;
@@ -1160,27 +1050,27 @@ yytnamerr (char *yyres, const char *yystr)
       char const *yyp = yystr;
 
       for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
 
@@ -1203,11 +1093,11 @@ static int
 yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                 yytype_int16 *yyssp, int yytoken)
 {
-  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
-  const char *yyformat = YY_NULL;
+  const char *yyformat = YY_NULLPTR;
   /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
   /* Number of reported tokens (one for the "unexpected", one per
@@ -1215,10 +1105,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
   int yycount = 0;
 
   /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
      - If this state is a consistent state with a default action, then
        the only way this function was invoked is if the default action
        is an error action.  In that case, don't check for expected
@@ -1268,7 +1154,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                   }
                 yyarg[yycount++] = yytname[yyx];
                 {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
                   if (! (yysize <= yysize1
                          && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
                     return 2;
@@ -1335,31 +1221,17 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  switch (yytype)
-    {
-
-      default:
-        break;
-    }
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
@@ -1368,18 +1240,8 @@ yydestruct (yymsg, yytype, yyvaluep)
 /* The lookahead symbol.  */
 int yychar;
 
-
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-
 /* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
-
+YYSTYPE yylval;
 /* Number of syntax errors so far.  */
 int yynerrs;
 
@@ -1388,35 +1250,16 @@ int yynerrs;
 | yyparse.  |
 `----------*/
 
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-hid_t
-yyparse (void *YYPARSE_PARAM)
-#else
-hid_t
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 hid_t
 yyparse (void)
-#else
-hid_t
-yyparse ()
-
-#endif
-#endif
 {
     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.
+       'yyss': related to states.
+       'yyvs': related to semantic values.
 
        Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
@@ -1484,23 +1327,23 @@ yyparse ()
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack.  Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	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
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        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
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
@@ -1508,22 +1351,22 @@ yyparse ()
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -1532,10 +1375,10 @@ yyparse ()
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
+        YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1564,7 +1407,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex ();
     }
 
   if (yychar <= YYEOF)
@@ -1629,7 +1472,7 @@ yyreduce:
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+     '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison
@@ -1643,419 +1486,418 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-/* Line 1792 of yacc.c  */
-#line 102 "hl/src//H5LTparse.y"
+#line 102 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { memset(arr_stack, 0, STACK_SIZE*sizeof(struct arr_info)); /*initialize here?*/ }
+#line 1462 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 3:
-/* Line 1792 of yacc.c  */
-#line 103 "hl/src//H5LTparse.y"
+#line 103 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { return (yyval.hid);}
+#line 1468 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 13:
-/* Line 1792 of yacc.c  */
-#line 117 "hl/src//H5LTparse.y"
+#line 117 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_I8BE); }
+#line 1474 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 14:
-/* Line 1792 of yacc.c  */
-#line 118 "hl/src//H5LTparse.y"
+#line 118 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_I8LE); }
+#line 1480 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 15:
-/* Line 1792 of yacc.c  */
-#line 119 "hl/src//H5LTparse.y"
+#line 119 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_I16BE); }
+#line 1486 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 16:
-/* Line 1792 of yacc.c  */
-#line 120 "hl/src//H5LTparse.y"
+#line 120 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_I16LE); }
+#line 1492 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 17:
-/* Line 1792 of yacc.c  */
-#line 121 "hl/src//H5LTparse.y"
+#line 121 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_I32BE); }
+#line 1498 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 18:
-/* Line 1792 of yacc.c  */
-#line 122 "hl/src//H5LTparse.y"
+#line 122 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_I32LE); }
+#line 1504 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 19:
-/* Line 1792 of yacc.c  */
-#line 123 "hl/src//H5LTparse.y"
+#line 123 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_I64BE); }
+#line 1510 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 20:
-/* Line 1792 of yacc.c  */
-#line 124 "hl/src//H5LTparse.y"
+#line 124 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_I64LE); }
+#line 1516 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 21:
-/* Line 1792 of yacc.c  */
-#line 125 "hl/src//H5LTparse.y"
+#line 125 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_U8BE); }
+#line 1522 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 22:
-/* Line 1792 of yacc.c  */
-#line 126 "hl/src//H5LTparse.y"
+#line 126 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_U8LE); }
+#line 1528 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 23:
-/* Line 1792 of yacc.c  */
-#line 127 "hl/src//H5LTparse.y"
+#line 127 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_U16BE); }
+#line 1534 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 24:
-/* Line 1792 of yacc.c  */
-#line 128 "hl/src//H5LTparse.y"
+#line 128 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_U16LE); }
+#line 1540 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 25:
-/* Line 1792 of yacc.c  */
-#line 129 "hl/src//H5LTparse.y"
+#line 129 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_U32BE); }
+#line 1546 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 26:
-/* Line 1792 of yacc.c  */
-#line 130 "hl/src//H5LTparse.y"
+#line 130 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_U32LE); }
+#line 1552 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 27:
-/* Line 1792 of yacc.c  */
-#line 131 "hl/src//H5LTparse.y"
+#line 131 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_U64BE); }
+#line 1558 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 28:
-/* Line 1792 of yacc.c  */
-#line 132 "hl/src//H5LTparse.y"
+#line 132 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_STD_U64LE); }
+#line 1564 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 29:
-/* Line 1792 of yacc.c  */
-#line 133 "hl/src//H5LTparse.y"
+#line 133 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_CHAR); }
+#line 1570 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 30:
-/* Line 1792 of yacc.c  */
-#line 134 "hl/src//H5LTparse.y"
+#line 134 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_SCHAR); }
+#line 1576 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 31:
-/* Line 1792 of yacc.c  */
-#line 135 "hl/src//H5LTparse.y"
+#line 135 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_UCHAR); }
+#line 1582 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 32:
-/* Line 1792 of yacc.c  */
-#line 136 "hl/src//H5LTparse.y"
+#line 136 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_SHORT); }
+#line 1588 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 33:
-/* Line 1792 of yacc.c  */
-#line 137 "hl/src//H5LTparse.y"
+#line 137 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_USHORT); }
+#line 1594 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 34:
-/* Line 1792 of yacc.c  */
-#line 138 "hl/src//H5LTparse.y"
+#line 138 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_INT); }
+#line 1600 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 35:
-/* Line 1792 of yacc.c  */
-#line 139 "hl/src//H5LTparse.y"
+#line 139 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_UINT); }
+#line 1606 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 36:
-/* Line 1792 of yacc.c  */
-#line 140 "hl/src//H5LTparse.y"
+#line 140 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LONG); }
+#line 1612 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 37:
-/* Line 1792 of yacc.c  */
-#line 141 "hl/src//H5LTparse.y"
+#line 141 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULONG); }
+#line 1618 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 38:
-/* Line 1792 of yacc.c  */
-#line 142 "hl/src//H5LTparse.y"
+#line 142 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LLONG); }
+#line 1624 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 39:
-/* Line 1792 of yacc.c  */
-#line 143 "hl/src//H5LTparse.y"
+#line 143 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULLONG); }
+#line 1630 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 40:
-/* Line 1792 of yacc.c  */
-#line 146 "hl/src//H5LTparse.y"
+#line 146 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F32BE); }
+#line 1636 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 41:
-/* Line 1792 of yacc.c  */
-#line 147 "hl/src//H5LTparse.y"
+#line 147 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F32LE); }
+#line 1642 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 42:
-/* Line 1792 of yacc.c  */
-#line 148 "hl/src//H5LTparse.y"
+#line 148 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F64BE); }
+#line 1648 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 43:
-/* Line 1792 of yacc.c  */
-#line 149 "hl/src//H5LTparse.y"
+#line 149 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F64LE); }
+#line 1654 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 44:
-/* Line 1792 of yacc.c  */
-#line 150 "hl/src//H5LTparse.y"
+#line 150 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_FLOAT); }
+#line 1660 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 45:
-/* Line 1792 of yacc.c  */
-#line 151 "hl/src//H5LTparse.y"
+#line 151 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_DOUBLE); }
+#line 1666 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 46:
-/* Line 1792 of yacc.c  */
-#line 152 "hl/src//H5LTparse.y"
+#line 152 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LDOUBLE); }
+#line 1672 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 47:
-/* Line 1792 of yacc.c  */
-#line 156 "hl/src//H5LTparse.y"
+#line 156 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { csindex++; cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/ }
+#line 1678 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 48:
-/* Line 1792 of yacc.c  */
-#line 158 "hl/src//H5LTparse.y"
+#line 158 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.hid) = cmpd_stack[csindex].id; 
                               cmpd_stack[csindex].id = 0;
                               cmpd_stack[csindex].first_memb = 1; 
                               csindex--;
                             }
+#line 1688 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 51:
-/* Line 1792 of yacc.c  */
-#line 167 "hl/src//H5LTparse.y"
+#line 167 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { cmpd_stack[csindex].is_field = 1; /*notify lexer a compound member is parsed*/ }
+#line 1694 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 52:
-/* Line 1792 of yacc.c  */
-#line 169 "hl/src//H5LTparse.y"
+#line 169 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {   
                             size_t origin_size, new_size;
                             hid_t dtype_id = cmpd_stack[csindex].id;
 
                             /*Adjust size and insert member, consider both member size and offset.*/
                             if(cmpd_stack[csindex].first_memb) { /*reclaim the size 1 temporarily set*/
-                                new_size = H5Tget_size((yyvsp[(1) - (5)].hid)) + (yyvsp[(4) - (5)].ival);
+                                new_size = H5Tget_size((yyvsp[-4].hid)) + (yyvsp[-1].ival);
                                 H5Tset_size(dtype_id, new_size);
                                 /*member name is saved in yylval.sval by lexer*/
-                                H5Tinsert(dtype_id, (yyvsp[(3) - (5)].sval), (yyvsp[(4) - (5)].ival), (yyvsp[(1) - (5)].hid));
+                                H5Tinsert(dtype_id, (yyvsp[-2].sval), (yyvsp[-1].ival), (yyvsp[-4].hid));
 
                                 cmpd_stack[csindex].first_memb = 0;
                             } else {
                                 origin_size = H5Tget_size(dtype_id);
                                 
-                                if((yyvsp[(4) - (5)].ival) == 0) {
-                                    new_size = origin_size + H5Tget_size((yyvsp[(1) - (5)].hid));
+                                if((yyvsp[-1].ival) == 0) {
+                                    new_size = origin_size + H5Tget_size((yyvsp[-4].hid));
                                     H5Tset_size(dtype_id, new_size);
-                                    H5Tinsert(dtype_id, (yyvsp[(3) - (5)].sval), origin_size, (yyvsp[(1) - (5)].hid));
+                                    H5Tinsert(dtype_id, (yyvsp[-2].sval), origin_size, (yyvsp[-4].hid));
                                 } else {
-                                    new_size = (yyvsp[(4) - (5)].ival) + H5Tget_size((yyvsp[(1) - (5)].hid));
+                                    new_size = (yyvsp[-1].ival) + H5Tget_size((yyvsp[-4].hid));
                                     H5Tset_size(dtype_id, new_size);
-                                    H5Tinsert(dtype_id, (yyvsp[(3) - (5)].sval), (yyvsp[(4) - (5)].ival), (yyvsp[(1) - (5)].hid));
+                                    H5Tinsert(dtype_id, (yyvsp[-2].sval), (yyvsp[-1].ival), (yyvsp[-4].hid));
                                 }
                             }
-                            if((yyvsp[(3) - (5)].sval)) {
-                                HDfree((yyvsp[(3) - (5)].sval));
-                                (yyvsp[(3) - (5)].sval) = NULL;
+                            if((yyvsp[-2].sval)) {
+                                HDfree((yyvsp[-2].sval));
+                                (yyvsp[-2].sval) = NULL;
                             }
                             cmpd_stack[csindex].is_field = 0;
-                            H5Tclose((yyvsp[(1) - (5)].hid));
+                            H5Tclose((yyvsp[-4].hid));
                              
                             new_size = H5Tget_size(dtype_id);
                         }
+#line 1733 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 53:
-/* Line 1792 of yacc.c  */
-#line 205 "hl/src//H5LTparse.y"
+#line 205 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {
                             (yyval.sval) = HDstrdup(yylval.sval);
                             HDfree(yylval.sval);
                             yylval.sval = NULL;
                         }
+#line 1743 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 54:
-/* Line 1792 of yacc.c  */
-#line 212 "hl/src//H5LTparse.y"
+#line 212 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.ival) = 0; }
+#line 1749 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 55:
-/* Line 1792 of yacc.c  */
-#line 214 "hl/src//H5LTparse.y"
+#line 214 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { (yyval.ival) = yylval.ival; }
+#line 1755 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 57:
-/* Line 1792 of yacc.c  */
-#line 218 "hl/src//H5LTparse.y"
+#line 218 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { asindex++; /*pushd onto the stack*/ }
+#line 1761 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 58:
-/* Line 1792 of yacc.c  */
-#line 220 "hl/src//H5LTparse.y"
+#line 220 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { 
-                          (yyval.hid) = H5Tarray_create2((yyvsp[(5) - (6)].hid), arr_stack[asindex].ndims, arr_stack[asindex].dims);
+                          (yyval.hid) = H5Tarray_create2((yyvsp[-1].hid), arr_stack[asindex].ndims, arr_stack[asindex].dims);
                           arr_stack[asindex].ndims = 0;
                           asindex--;
-                          H5Tclose((yyvsp[(5) - (6)].hid));
+                          H5Tclose((yyvsp[-1].hid));
                         }
+#line 1772 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 61:
-/* Line 1792 of yacc.c  */
-#line 230 "hl/src//H5LTparse.y"
+#line 230 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { arr_stack[asindex].is_dim = 1; /*notice lexer of dimension size*/ }
+#line 1778 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 62:
-/* Line 1792 of yacc.c  */
-#line 231 "hl/src//H5LTparse.y"
+#line 231 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { unsigned ndims = arr_stack[asindex].ndims;
                                   arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; 
                                   arr_stack[asindex].ndims++;
                                   arr_stack[asindex].is_dim = 0; 
                                 }
+#line 1788 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 65:
-/* Line 1792 of yacc.c  */
-#line 242 "hl/src//H5LTparse.y"
-    { (yyval.hid) = H5Tvlen_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); }
+#line 242 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+    { (yyval.hid) = H5Tvlen_create((yyvsp[-1].hid)); H5Tclose((yyvsp[-1].hid)); }
+#line 1794 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 66:
-/* Line 1792 of yacc.c  */
-#line 248 "hl/src//H5LTparse.y"
+#line 248 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {   
                                 size_t size = (size_t)yylval.ival;
                                 (yyval.hid) = H5Tcreate(H5T_OPAQUE, size);
                             }
+#line 1803 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 67:
-/* Line 1792 of yacc.c  */
-#line 253 "hl/src//H5LTparse.y"
+#line 253 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {  
-                                H5Tset_tag((yyvsp[(6) - (9)].hid), yylval.sval);
+                                H5Tset_tag((yyvsp[-3].hid), yylval.sval);
                                 HDfree(yylval.sval);
                                 yylval.sval = NULL;
                             }
+#line 1813 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 68:
-/* Line 1792 of yacc.c  */
-#line 258 "hl/src//H5LTparse.y"
-    { (yyval.hid) = (yyvsp[(6) - (11)].hid); }
+#line 258 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+    { (yyval.hid) = (yyvsp[-5].hid); }
+#line 1819 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 71:
-/* Line 1792 of yacc.c  */
-#line 267 "hl/src//H5LTparse.y"
+#line 267 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {  
-                                if((yyvsp[(4) - (5)].ival) == H5T_VARIABLE_TOKEN)
+                                if((yyvsp[-1].ival) == H5T_VARIABLE_TOKEN)
                                     is_variable = 1;
                                 else 
                                     str_size = yylval.ival;
                             }
+#line 1830 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 72:
-/* Line 1792 of yacc.c  */
-#line 274 "hl/src//H5LTparse.y"
+#line 274 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {
-                                if((yyvsp[(8) - (9)].ival) == H5T_STR_NULLTERM_TOKEN)
+                                if((yyvsp[-1].ival) == H5T_STR_NULLTERM_TOKEN)
                                     str_pad = H5T_STR_NULLTERM;
-                                else if((yyvsp[(8) - (9)].ival) == H5T_STR_NULLPAD_TOKEN)
+                                else if((yyvsp[-1].ival) == H5T_STR_NULLPAD_TOKEN)
                                     str_pad = H5T_STR_NULLPAD;
-                                else if((yyvsp[(8) - (9)].ival) == H5T_STR_SPACEPAD_TOKEN)
+                                else if((yyvsp[-1].ival) == H5T_STR_SPACEPAD_TOKEN)
                                     str_pad = H5T_STR_SPACEPAD;
                             }
+#line 1843 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 73:
-/* Line 1792 of yacc.c  */
-#line 283 "hl/src//H5LTparse.y"
+#line 283 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {  
-                                if((yyvsp[(12) - (13)].ival) == H5T_CSET_ASCII_TOKEN)
+                                if((yyvsp[-1].ival) == H5T_CSET_ASCII_TOKEN)
                                     str_cset = H5T_CSET_ASCII;
-                                else if((yyvsp[(12) - (13)].ival) == H5T_CSET_UTF8_TOKEN)
+                                else if((yyvsp[-1].ival) == H5T_CSET_UTF8_TOKEN)
                                     str_cset = H5T_CSET_UTF8;
                             }
+#line 1854 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 74:
-/* Line 1792 of yacc.c  */
-#line 290 "hl/src//H5LTparse.y"
+#line 290 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {
-                                if((yyvsp[(16) - (17)].hid) == H5T_C_S1_TOKEN)
+                                if((yyvsp[-1].hid) == H5T_C_S1_TOKEN)
                                     (yyval.hid) = H5Tcopy(H5T_C_S1);
-                                else if((yyvsp[(16) - (17)].hid) == H5T_FORTRAN_S1_TOKEN)
+                                else if((yyvsp[-1].hid) == H5T_FORTRAN_S1_TOKEN)
                                     (yyval.hid) = H5Tcopy(H5T_FORTRAN_S1);
                             }
+#line 1865 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 75:
-/* Line 1792 of yacc.c  */
-#line 297 "hl/src//H5LTparse.y"
+#line 297 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {   
-                                hid_t str_id = (yyvsp[(18) - (19)].hid);
+                                hid_t str_id = (yyvsp[-1].hid);
 
                                 /*set string size*/
                                 if(is_variable) {
@@ -2070,82 +1912,82 @@ yyreduce:
 
                                 (yyval.hid) = str_id; 
                             }
+#line 1886 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 76:
-/* Line 1792 of yacc.c  */
-#line 314 "hl/src//H5LTparse.y"
+#line 314 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {(yyval.ival) = H5T_VARIABLE_TOKEN;}
+#line 1892 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 78:
-/* Line 1792 of yacc.c  */
-#line 317 "hl/src//H5LTparse.y"
+#line 317 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {(yyval.ival) = H5T_STR_NULLTERM_TOKEN;}
+#line 1898 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 79:
-/* Line 1792 of yacc.c  */
-#line 318 "hl/src//H5LTparse.y"
+#line 318 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {(yyval.ival) = H5T_STR_NULLPAD_TOKEN;}
+#line 1904 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 80:
-/* Line 1792 of yacc.c  */
-#line 319 "hl/src//H5LTparse.y"
+#line 319 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {(yyval.ival) = H5T_STR_SPACEPAD_TOKEN;}
+#line 1910 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 81:
-/* Line 1792 of yacc.c  */
-#line 321 "hl/src//H5LTparse.y"
+#line 321 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {(yyval.ival) = H5T_CSET_ASCII_TOKEN;}
+#line 1916 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 82:
-/* Line 1792 of yacc.c  */
-#line 322 "hl/src//H5LTparse.y"
+#line 322 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {(yyval.ival) = H5T_CSET_UTF8_TOKEN;}
+#line 1922 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 83:
-/* Line 1792 of yacc.c  */
-#line 324 "hl/src//H5LTparse.y"
+#line 324 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {(yyval.hid) = H5T_C_S1_TOKEN;}
+#line 1928 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 84:
-/* Line 1792 of yacc.c  */
-#line 325 "hl/src//H5LTparse.y"
+#line 325 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {(yyval.hid) = H5T_FORTRAN_S1_TOKEN;}
+#line 1934 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 85:
-/* Line 1792 of yacc.c  */
-#line 329 "hl/src//H5LTparse.y"
-    { is_enum = 1; enum_id = H5Tenum_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); }
+#line 329 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+    { is_enum = 1; enum_id = H5Tenum_create((yyvsp[-1].hid)); H5Tclose((yyvsp[-1].hid)); }
+#line 1940 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 86:
-/* Line 1792 of yacc.c  */
-#line 331 "hl/src//H5LTparse.y"
+#line 331 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     { is_enum = 0; /*reset*/ (yyval.hid) = enum_id; }
+#line 1946 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 89:
-/* Line 1792 of yacc.c  */
-#line 336 "hl/src//H5LTparse.y"
+#line 336 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {
                                                 is_enum_memb = 1; /*indicate member of enum*/
-                                                enum_memb_symbol = strdup(yylval.sval); 
+                                                enum_memb_symbol = HDstrdup(yylval.sval); 
                                                 HDfree(yylval.sval);
                                                 yylval.sval = NULL;
                                             }
+#line 1957 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
   case 90:
-/* Line 1792 of yacc.c  */
-#line 343 "hl/src//H5LTparse.y"
+#line 343 "hl/src/H5LTparse.y" /* yacc.c:1646  */
     {
                                 char char_val=(char)yylval.ival;
                                 short short_val=(short)yylval.ival;
@@ -2188,11 +2030,11 @@ yyreduce:
                                 H5Tclose(super);
                                 H5Tclose(native);
                             }
+#line 2004 "hl/src/H5LTparse.c" /* yacc.c:1646  */
     break;
 
 
-/* Line 1792 of yacc.c  */
-#line 2166 "hl/src//H5LTparse.c"
+#line 2008 "hl/src/H5LTparse.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2214,7 +2056,7 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-  /* Now `shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
 
@@ -2229,9 +2071,9 @@ yyreduce:
   goto yynewstate;
 
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
 yyerrlab:
   /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */
@@ -2282,20 +2124,20 @@ yyerrlab:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
+         error, discard it.  */
 
       if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-	}
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
       else
-	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
   /* Else will try to reuse lookahead token after shifting the error
@@ -2314,7 +2156,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -2327,29 +2169,29 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-	YYABORT;
+        YYABORT;
 
 
       yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
+                  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -2400,14 +2242,14 @@ yyreturn:
       yydestruct ("Cleanup: discarding lookahead",
                   yytoken, &yylval);
     }
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -2418,8 +2260,5 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-