Add support for GCC9, update warnhist script, and clean up warnings.

1 files changed, 272 insertions, 260 deletions

diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index 5835dcc..193ba1f 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -1,4 +1,4 @@
-#if __GNUC__ >= 4 && __GNUC_MINOR__ >=2                           
+#if defined __GNUC__ && 402 <= __GNUC__ * 100 + __GNUC_MINOR__    
 #pragma GCC diagnostic ignored "-Wconversion"                     
 #pragma GCC diagnostic ignored "-Wimplicit-function-declaration"  
 #pragma GCC diagnostic ignored "-Wlarger-than="                   
@@ -20,11 +20,12 @@
 #elif defined _MSC_VER                                            
 #pragma warning(push, 1)                                          
 #endif                                                            
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.4.1.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -62,11 +63,14 @@
    define necessary library symbols; they are noted "INFRINGES ON
    USER NAME SPACE" below.  */
 
+/* Undocumented macros, especially those whose name start with YY_,
+   are private implementation details.  Do not rely on them.  */
+
 /* Identify Bison output.  */
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "3.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -91,8 +95,8 @@
 #define yylval          H5LTyylval
 #define yychar          H5LTyychar
 
-/* Copy the first part of user declarations.  */
-#line 22 "hl/src/H5LTparse.y" /* yacc.c:339  */
+/* First part of user prologue.  */
+#line 20 "hl/src/H5LTparse.y"
 
 #include <stdio.h>
 #include <string.h>
@@ -145,13 +149,17 @@ hbool_t is_opq_size = 0;            /*flag to lexer for opaque type size*/
 hbool_t is_opq_tag = 0;             /*flag to lexer for opaque type tag*/
 
 
-#line 127 "hl/src/H5LTparse.c" /* yacc.c:339  */
+#line 131 "hl/src/H5LTparse.c"
 
 # ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
+#  if defined __cplusplus
+#   if 201103L <= __cplusplus
+#    define YY_NULLPTR nullptr
+#   else
+#    define YY_NULLPTR 0
+#   endif
 #  else
-#   define YY_NULLPTR 0
+#   define YY_NULLPTR ((void*)0)
 #  endif
 # endif
 
@@ -163,8 +171,8 @@ hbool_t is_opq_tag = 0;             /*flag to lexer for opaque type tag*/
 # define YYERROR_VERBOSE 0
 #endif
 
-/* In a future release of Bison, this section will be replaced
-   by #include "H5LTparse.h".  */
+/* Use api.header.include to #include this header
+   instead of duplicating it here.  */
 #ifndef YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED
 # define YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED
 /* Debug traces.  */
@@ -241,17 +249,18 @@ extern int H5LTyydebug;
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
 union YYSTYPE
 {
-#line 74 "hl/src/H5LTparse.y" /* yacc.c:355  */
+#line 72 "hl/src/H5LTparse.y"
 
     int     ival;         /*for integer token*/
     char    *sval;        /*for name string*/
     hid_t   hid;          /*for hid_t token*/
 
-#line 232 "hl/src/H5LTparse.c" /* yacc.c:355  */
+#line 239 "hl/src/H5LTparse.c"
+
 };
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
@@ -263,9 +272,7 @@ hid_t H5LTyyparse (void);
 
 #endif /* !YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED  */
 
-/* Copy the second part of user declarations.  */
 
-#line 247 "hl/src/H5LTparse.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -286,13 +293,13 @@ typedef signed char yytype_int8;
 #ifdef YYTYPE_UINT16
 typedef YYTYPE_UINT16 yytype_uint16;
 #else
-typedef unsigned short int yytype_uint16;
+typedef unsigned short yytype_uint16;
 #endif
 
 #ifdef YYTYPE_INT16
 typedef YYTYPE_INT16 yytype_int16;
 #else
-typedef short int yytype_int16;
+typedef short yytype_int16;
 #endif
 
 #ifndef YYSIZE_T
@@ -304,7 +311,7 @@ typedef short int yytype_int16;
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
-#  define YYSIZE_T unsigned int
+#  define YYSIZE_T unsigned
 # endif
 #endif
 
@@ -340,15 +347,6 @@ typedef short int yytype_int16;
 # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
 #endif
 
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
-#endif
-
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
 # define YYUSE(E) ((void) (E))
@@ -356,7 +354,7 @@ typedef short int yytype_int16;
 # define YYUSE(E) /* empty */
 #endif
 
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
 # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
     _Pragma ("GCC diagnostic push") \
@@ -376,6 +374,8 @@ typedef short int yytype_int16;
 #endif
 
 
+#define YY_ASSERT(E) ((void) (0 && (E)))
+
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
@@ -518,16 +518,16 @@ union yyalloc
 /* YYNSTATES -- Number of states.  */
 #define YYNSTATES  143
 
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   313
 
+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, with out-of-bounds checking.  */
 #define YYTRANSLATE(YYX)                                                \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
+   as returned by yylex.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -568,16 +568,16 @@ static const yytype_uint8 yytranslate[] =
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   107,   107,   108,   110,   111,   112,   113,   115,   116,
-     117,   118,   119,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     151,   152,   153,   154,   155,   156,   157,   161,   160,   169,
-     170,   172,   172,   209,   217,   218,   221,   223,   223,   232,
-     233,   235,   236,   235,   243,   246,   252,   253,   258,   259,
-     250,   267,   269,   273,   274,   282,   291,   298,   271,   322,
-     323,   325,   326,   327,   329,   330,   332,   333,   337,   336,
-     341,   342,   344,   344,   398,   400
+       0,   105,   105,   106,   108,   109,   110,   111,   113,   114,
+     115,   116,   117,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     149,   150,   151,   152,   153,   154,   155,   159,   158,   167,
+     168,   170,   170,   207,   215,   216,   219,   221,   221,   230,
+     231,   233,   234,   233,   241,   244,   250,   251,   256,   257,
+     248,   265,   267,   271,   272,   280,   289,   296,   269,   320,
+     321,   323,   324,   325,   327,   328,   330,   331,   335,   334,
+     339,   340,   342,   342,   396,   398
 };
 #endif
 
@@ -823,22 +823,22 @@ static const yytype_uint8 yyr2[] =
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (0)
+#define YYBACKUP(Token, Value)                                    \
+  do                                                              \
+    if (yychar == YYEMPTY)                                        \
+      {                                                           \
+        yychar = (Token);                                         \
+        yylval = (Value);                                         \
+        YYPOPSTACK (yylen);                                       \
+        yystate = *yyssp;                                         \
+        goto yybackup;                                            \
+      }                                                           \
+    else                                                          \
+      {                                                           \
+        yyerror (YY_("syntax error: cannot back up")); \
+        YYERROR;                                                  \
+      }                                                           \
+  while (0)
 
 /* Error token number */
 #define YYTERROR        1
@@ -878,37 +878,37 @@ do {                                                                      \
 } while (0)
 
 
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT.  |
-`----------------------------------------*/
+/*-----------------------------------.
+| Print this symbol's value on YYO.  |
+`-----------------------------------*/
 
 static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
+  FILE *yyoutput = yyo;
+  YYUSE (yyoutput);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+    YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
 # endif
   YYUSE (yytype);
 }
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+/*---------------------------.
+| Print this symbol on YYO.  |
+`---------------------------*/
 
 static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
 {
-  YYFPRINTF (yyoutput, "%s %s (",
+  YYFPRINTF (yyo, "%s %s (",
              yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-  YYFPRINTF (yyoutput, ")");
+  yy_symbol_value_print (yyo, yytype, yyvaluep);
+  YYFPRINTF (yyo, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -942,7 +942,7 @@ do {                                                            \
 static void
 yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
-  unsigned long int yylno = yyrline[yyrule];
+  unsigned long yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
@@ -953,7 +953,7 @@ yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr,
                        yystos[yyssp[yyi + 1 - yynrhs]],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                       &yyvsp[(yyi + 1) - (yynrhs)]
                                               );
       YYFPRINTF (stderr, "\n");
     }
@@ -1057,7 +1057,10 @@ yytnamerr (char *yyres, const char *yystr)
           case '\\':
             if (*++yyp != '\\')
               goto do_not_strip_quotes;
-            /* Fall through.  */
+            else
+              goto append;
+
+          append:
           default:
             if (yyres)
               yyres[yyn] = *yyp;
@@ -1075,7 +1078,7 @@ yytnamerr (char *yyres, const char *yystr)
   if (! yyres)
     return yystrlen (yystr);
 
-  return yystpcpy (yyres, yystr) - yyres;
+  return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
 }
 # endif
 
@@ -1153,10 +1156,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                 yyarg[yycount++] = yytname[yyx];
                 {
                   YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                  if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+                    yysize = yysize1;
+                  else
                     return 2;
-                  yysize = yysize1;
                 }
               }
         }
@@ -1168,6 +1171,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
       case N:                               \
         yyformat = S;                       \
       break
+    default: /* Avoid compiler warnings. */
       YYCASE_(0, YY_("syntax error"));
       YYCASE_(1, YY_("syntax error, unexpected %s"));
       YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
@@ -1179,9 +1183,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 
   {
     YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+      yysize = yysize1;
+    else
       return 2;
-    yysize = yysize1;
   }
 
   if (*yymsg_alloc < yysize)
@@ -1307,23 +1312,33 @@ yyparse (void)
   yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
+
 /*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
+| yynewstate -- push a new state, which is found in yystate.  |
 `------------------------------------------------------------*/
- yynewstate:
+yynewstate:
   /* In all cases, when you get here, the value and location stacks
      have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
- yysetstate:
-  *yyssp = yystate;
+
+/*--------------------------------------------------------------------.
+| yynewstate -- set current state (the top of the stack) to yystate.  |
+`--------------------------------------------------------------------*/
+yysetstate:
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+  YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
+  *yyssp = (yytype_int16) yystate;
 
   if (yyss + yystacksize - 1 <= yyssp)
+#if !defined yyoverflow && !defined YYSTACK_RELOCATE
+    goto yyexhaustedlab;
+#else
     {
       /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
+      YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
 
-#ifdef yyoverflow
+# if defined yyoverflow
       {
         /* Give user a chance to reallocate the stack.  Use copies of
            these so that the &'s don't force the real ones into
@@ -1339,14 +1354,10 @@ yyparse (void)
                     &yyss1, yysize * sizeof (*yyssp),
                     &yyvs1, yysize * sizeof (*yyvsp),
                     &yystacksize);
-
         yyss = yyss1;
         yyvs = yyvs1;
       }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
+# else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
         goto yyexhaustedlab;
@@ -1362,35 +1373,33 @@ yyparse (void)
           goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-#  undef YYSTACK_RELOCATE
+# undef YYSTACK_RELOCATE
         if (yyss1 != yyssa)
           YYSTACK_FREE (yyss1);
       }
 # endif
-#endif /* no yyoverflow */
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
+                  (unsigned long) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
         YYABORT;
     }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
   if (yystate == YYFINAL)
     YYACCEPT;
 
   goto yybackup;
 
+
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
-
   /* Do appropriate processing given the current state.  Read a
      lookahead token if we need one and don't already have one.  */
 
@@ -1448,7 +1457,6 @@ yybackup:
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
   YY_IGNORE_MAYBE_UNINITIALIZED_END
-
   goto yynewstate;
 
 
@@ -1463,7 +1471,7 @@ yydefault:
 
 
 /*-----------------------------.
-| yyreduce -- Do a reduction.  |
+| yyreduce -- do a reduction.  |
 `-----------------------------*/
 yyreduce:
   /* yyn is the number of a rule to reduce with.  */
@@ -1483,246 +1491,246 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-        case 2:
-#line 107 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+  case 2:
+#line 105 "hl/src/H5LTparse.y"
     { memset(arr_stack, 0, STACK_SIZE*sizeof(struct arr_info)); /*initialize here?*/ }
-#line 1468 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1476 "hl/src/H5LTparse.c"
     break;
 
   case 3:
-#line 108 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 106 "hl/src/H5LTparse.y"
     { return (yyval.hid);}
-#line 1474 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1482 "hl/src/H5LTparse.c"
     break;
 
   case 13:
-#line 122 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 120 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I8BE); }
-#line 1480 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1488 "hl/src/H5LTparse.c"
     break;
 
   case 14:
-#line 123 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 121 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I8LE); }
-#line 1486 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1494 "hl/src/H5LTparse.c"
     break;
 
   case 15:
-#line 124 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 122 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I16BE); }
-#line 1492 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1500 "hl/src/H5LTparse.c"
     break;
 
   case 16:
-#line 125 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 123 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I16LE); }
-#line 1498 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1506 "hl/src/H5LTparse.c"
     break;
 
   case 17:
-#line 126 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 124 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I32BE); }
-#line 1504 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1512 "hl/src/H5LTparse.c"
     break;
 
   case 18:
-#line 127 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 125 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I32LE); }
-#line 1510 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1518 "hl/src/H5LTparse.c"
     break;
 
   case 19:
-#line 128 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 126 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I64BE); }
-#line 1516 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1524 "hl/src/H5LTparse.c"
     break;
 
   case 20:
-#line 129 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 127 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_I64LE); }
-#line 1522 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1530 "hl/src/H5LTparse.c"
     break;
 
   case 21:
-#line 130 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 128 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U8BE); }
-#line 1528 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1536 "hl/src/H5LTparse.c"
     break;
 
   case 22:
-#line 131 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 129 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U8LE); }
-#line 1534 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1542 "hl/src/H5LTparse.c"
     break;
 
   case 23:
-#line 132 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 130 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U16BE); }
-#line 1540 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1548 "hl/src/H5LTparse.c"
     break;
 
   case 24:
-#line 133 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 131 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U16LE); }
-#line 1546 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1554 "hl/src/H5LTparse.c"
     break;
 
   case 25:
-#line 134 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 132 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U32BE); }
-#line 1552 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1560 "hl/src/H5LTparse.c"
     break;
 
   case 26:
-#line 135 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 133 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U32LE); }
-#line 1558 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1566 "hl/src/H5LTparse.c"
     break;
 
   case 27:
-#line 136 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 134 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U64BE); }
-#line 1564 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1572 "hl/src/H5LTparse.c"
     break;
 
   case 28:
-#line 137 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 135 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_STD_U64LE); }
-#line 1570 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1578 "hl/src/H5LTparse.c"
     break;
 
   case 29:
-#line 138 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 136 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_CHAR); }
-#line 1576 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1584 "hl/src/H5LTparse.c"
     break;
 
   case 30:
-#line 139 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 137 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_SCHAR); }
-#line 1582 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1590 "hl/src/H5LTparse.c"
     break;
 
   case 31:
-#line 140 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 138 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_UCHAR); }
-#line 1588 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1596 "hl/src/H5LTparse.c"
     break;
 
   case 32:
-#line 141 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 139 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_SHORT); }
-#line 1594 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1602 "hl/src/H5LTparse.c"
     break;
 
   case 33:
-#line 142 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 140 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_USHORT); }
-#line 1600 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1608 "hl/src/H5LTparse.c"
     break;
 
   case 34:
-#line 143 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 141 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_INT); }
-#line 1606 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1614 "hl/src/H5LTparse.c"
     break;
 
   case 35:
-#line 144 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 142 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_UINT); }
-#line 1612 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1620 "hl/src/H5LTparse.c"
     break;
 
   case 36:
-#line 145 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 143 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LONG); }
-#line 1618 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1626 "hl/src/H5LTparse.c"
     break;
 
   case 37:
-#line 146 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 144 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULONG); }
-#line 1624 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1632 "hl/src/H5LTparse.c"
     break;
 
   case 38:
-#line 147 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 145 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LLONG); }
-#line 1630 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1638 "hl/src/H5LTparse.c"
     break;
 
   case 39:
-#line 148 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 146 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULLONG); }
-#line 1636 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1644 "hl/src/H5LTparse.c"
     break;
 
   case 40:
-#line 151 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 149 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F32BE); }
-#line 1642 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1650 "hl/src/H5LTparse.c"
     break;
 
   case 41:
-#line 152 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 150 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F32LE); }
-#line 1648 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1656 "hl/src/H5LTparse.c"
     break;
 
   case 42:
-#line 153 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 151 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F64BE); }
-#line 1654 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1662 "hl/src/H5LTparse.c"
     break;
 
   case 43:
-#line 154 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 152 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_IEEE_F64LE); }
-#line 1660 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1668 "hl/src/H5LTparse.c"
     break;
 
   case 44:
-#line 155 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 153 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_FLOAT); }
-#line 1666 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1674 "hl/src/H5LTparse.c"
     break;
 
   case 45:
-#line 156 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 154 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_DOUBLE); }
-#line 1672 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1680 "hl/src/H5LTparse.c"
     break;
 
   case 46:
-#line 157 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 155 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tcopy(H5T_NATIVE_LDOUBLE); }
-#line 1678 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1686 "hl/src/H5LTparse.c"
     break;
 
   case 47:
-#line 161 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 159 "hl/src/H5LTparse.y"
     { csindex++; cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/ }
-#line 1684 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1692 "hl/src/H5LTparse.c"
     break;
 
   case 48:
-#line 163 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 161 "hl/src/H5LTparse.y"
     { (yyval.hid) = cmpd_stack[csindex].id; 
                               cmpd_stack[csindex].id = 0;
                               cmpd_stack[csindex].first_memb = 1; 
                               csindex--;
                             }
-#line 1694 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1702 "hl/src/H5LTparse.c"
     break;
 
   case 51:
-#line 172 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 170 "hl/src/H5LTparse.y"
     { cmpd_stack[csindex].is_field = 1; /*notify lexer a compound member is parsed*/ }
-#line 1700 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1708 "hl/src/H5LTparse.c"
     break;
 
   case 52:
-#line 174 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 172 "hl/src/H5LTparse.y"
     {   
                             size_t origin_size, new_size;
                             hid_t dtype_id = cmpd_stack[csindex].id;
@@ -1757,117 +1765,117 @@ yyreduce:
                              
                             new_size = H5Tget_size(dtype_id);
                         }
-#line 1739 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1747 "hl/src/H5LTparse.c"
     break;
 
   case 53:
-#line 210 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 208 "hl/src/H5LTparse.y"
     {
                             (yyval.sval) = strdup(yylval.sval);
                             free(yylval.sval);
                             yylval.sval = NULL;
                         }
-#line 1749 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1757 "hl/src/H5LTparse.c"
     break;
 
   case 54:
-#line 217 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 215 "hl/src/H5LTparse.y"
     { (yyval.ival) = 0; }
-#line 1755 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1763 "hl/src/H5LTparse.c"
     break;
 
   case 55:
-#line 219 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 217 "hl/src/H5LTparse.y"
     { (yyval.ival) = yylval.ival; }
-#line 1761 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1769 "hl/src/H5LTparse.c"
     break;
 
   case 57:
-#line 223 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 221 "hl/src/H5LTparse.y"
     { asindex++; /*pushd onto the stack*/ }
-#line 1767 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1775 "hl/src/H5LTparse.c"
     break;
 
   case 58:
-#line 225 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 223 "hl/src/H5LTparse.y"
     { 
                           (yyval.hid) = H5Tarray_create2((yyvsp[-1].hid), arr_stack[asindex].ndims, arr_stack[asindex].dims);
                           arr_stack[asindex].ndims = 0;
                           asindex--;
                           H5Tclose((yyvsp[-1].hid));
                         }
-#line 1778 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1786 "hl/src/H5LTparse.c"
     break;
 
   case 61:
-#line 235 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 233 "hl/src/H5LTparse.y"
     { arr_stack[asindex].is_dim = 1; /*notice lexer of dimension size*/ }
-#line 1784 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1792 "hl/src/H5LTparse.c"
     break;
 
   case 62:
-#line 236 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 234 "hl/src/H5LTparse.y"
     { 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 1794 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1802 "hl/src/H5LTparse.c"
     break;
 
   case 65:
-#line 247 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 245 "hl/src/H5LTparse.y"
     { (yyval.hid) = H5Tvlen_create((yyvsp[-1].hid)); H5Tclose((yyvsp[-1].hid)); }
-#line 1800 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1808 "hl/src/H5LTparse.c"
     break;
 
   case 66:
-#line 252 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 250 "hl/src/H5LTparse.y"
     { is_opq_size = 1; }
-#line 1806 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1814 "hl/src/H5LTparse.c"
     break;
 
   case 67:
-#line 253 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 251 "hl/src/H5LTparse.y"
     {   
                                 size_t size = (size_t)yylval.ival;
                                 (yyval.hid) = H5Tcreate(H5T_OPAQUE, size);
                                 is_opq_size = 0;    
                             }
-#line 1816 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1824 "hl/src/H5LTparse.c"
     break;
 
   case 68:
-#line 258 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 256 "hl/src/H5LTparse.y"
     { is_opq_tag = 1; }
-#line 1822 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1830 "hl/src/H5LTparse.c"
     break;
 
   case 69:
-#line 259 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 257 "hl/src/H5LTparse.y"
     {  
                                 H5Tset_tag((yyvsp[-6].hid), yylval.sval);
                                 free(yylval.sval);
                                 yylval.sval = NULL;
                                 is_opq_tag = 0;
                             }
-#line 1833 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1841 "hl/src/H5LTparse.c"
     break;
 
   case 70:
-#line 265 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 263 "hl/src/H5LTparse.y"
     { (yyval.hid) = (yyvsp[-8].hid); }
-#line 1839 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1847 "hl/src/H5LTparse.c"
     break;
 
   case 73:
-#line 273 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 271 "hl/src/H5LTparse.y"
     { is_str_size = 1; }
-#line 1845 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1853 "hl/src/H5LTparse.c"
     break;
 
   case 74:
-#line 274 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 272 "hl/src/H5LTparse.y"
     {  
                                 if((yyvsp[-1].ival) == H5T_VARIABLE_TOKEN)
                                     is_variable = 1;
@@ -1875,11 +1883,11 @@ yyreduce:
                                     str_size = yylval.ival;
                                 is_str_size = 0; 
                             }
-#line 1857 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1865 "hl/src/H5LTparse.c"
     break;
 
   case 75:
-#line 282 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 280 "hl/src/H5LTparse.y"
     {
                                 if((yyvsp[-1].ival) == H5T_STR_NULLTERM_TOKEN)
                                     str_pad = H5T_STR_NULLTERM;
@@ -1888,33 +1896,33 @@ yyreduce:
                                 else if((yyvsp[-1].ival) == H5T_STR_SPACEPAD_TOKEN)
                                     str_pad = H5T_STR_SPACEPAD;
                             }
-#line 1870 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1878 "hl/src/H5LTparse.c"
     break;
 
   case 76:
-#line 291 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 289 "hl/src/H5LTparse.y"
     {  
                                 if((yyvsp[-1].ival) == H5T_CSET_ASCII_TOKEN)
                                     str_cset = H5T_CSET_ASCII;
                                 else if((yyvsp[-1].ival) == H5T_CSET_UTF8_TOKEN)
                                     str_cset = H5T_CSET_UTF8;
                             }
-#line 1881 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1889 "hl/src/H5LTparse.c"
     break;
 
   case 77:
-#line 298 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 296 "hl/src/H5LTparse.y"
     {
                                 if((yyvsp[-1].hid) == H5T_C_S1_TOKEN)
                                     (yyval.hid) = H5Tcopy(H5T_C_S1);
                                 else if((yyvsp[-1].hid) == H5T_FORTRAN_S1_TOKEN)
                                     (yyval.hid) = H5Tcopy(H5T_FORTRAN_S1);
                             }
-#line 1892 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1900 "hl/src/H5LTparse.c"
     break;
 
   case 78:
-#line 305 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 303 "hl/src/H5LTparse.y"
     {   
                                 hid_t str_id = (yyvsp[-1].hid);
 
@@ -1931,71 +1939,71 @@ yyreduce:
 
                                 (yyval.hid) = str_id; 
                             }
-#line 1913 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1921 "hl/src/H5LTparse.c"
     break;
 
   case 79:
-#line 322 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 320 "hl/src/H5LTparse.y"
     {(yyval.ival) = H5T_VARIABLE_TOKEN;}
-#line 1919 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1927 "hl/src/H5LTparse.c"
     break;
 
   case 81:
-#line 325 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 323 "hl/src/H5LTparse.y"
     {(yyval.ival) = H5T_STR_NULLTERM_TOKEN;}
-#line 1925 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1933 "hl/src/H5LTparse.c"
     break;
 
   case 82:
-#line 326 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 324 "hl/src/H5LTparse.y"
     {(yyval.ival) = H5T_STR_NULLPAD_TOKEN;}
-#line 1931 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1939 "hl/src/H5LTparse.c"
     break;
 
   case 83:
-#line 327 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 325 "hl/src/H5LTparse.y"
     {(yyval.ival) = H5T_STR_SPACEPAD_TOKEN;}
-#line 1937 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1945 "hl/src/H5LTparse.c"
     break;
 
   case 84:
-#line 329 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 327 "hl/src/H5LTparse.y"
     {(yyval.ival) = H5T_CSET_ASCII_TOKEN;}
-#line 1943 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1951 "hl/src/H5LTparse.c"
     break;
 
   case 85:
-#line 330 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 328 "hl/src/H5LTparse.y"
     {(yyval.ival) = H5T_CSET_UTF8_TOKEN;}
-#line 1949 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1957 "hl/src/H5LTparse.c"
     break;
 
   case 86:
-#line 332 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 330 "hl/src/H5LTparse.y"
     {(yyval.hid) = H5T_C_S1_TOKEN;}
-#line 1955 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1963 "hl/src/H5LTparse.c"
     break;
 
   case 87:
-#line 333 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 331 "hl/src/H5LTparse.y"
     {(yyval.hid) = H5T_FORTRAN_S1_TOKEN;}
-#line 1961 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1969 "hl/src/H5LTparse.c"
     break;
 
   case 88:
-#line 337 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 335 "hl/src/H5LTparse.y"
     { is_enum = 1; enum_id = H5Tenum_create((yyvsp[-1].hid)); H5Tclose((yyvsp[-1].hid)); }
-#line 1967 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1975 "hl/src/H5LTparse.c"
     break;
 
   case 89:
-#line 339 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 337 "hl/src/H5LTparse.y"
     { is_enum = 0; /*reset*/ (yyval.hid) = enum_id; }
-#line 1973 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1981 "hl/src/H5LTparse.c"
     break;
 
   case 92:
-#line 344 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 342 "hl/src/H5LTparse.y"
     {
                                                 is_enum_memb = 1; /*indicate member of enum*/
 #ifdef H5_HAVE_WIN32_API
@@ -2006,11 +2014,11 @@ yyreduce:
                                                 free(yylval.sval);
                                                 yylval.sval = NULL;
                                             }
-#line 1988 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 1996 "hl/src/H5LTparse.c"
     break;
 
   case 93:
-#line 355 "hl/src/H5LTparse.y" /* yacc.c:1646  */
+#line 353 "hl/src/H5LTparse.y"
     {
                                 char char_val=(char)yylval.ival;
                                 short short_val=(short)yylval.ival;
@@ -2053,11 +2061,12 @@ yyreduce:
                                 H5Tclose(super);
                                 H5Tclose(native);
                             }
-#line 2035 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 2043 "hl/src/H5LTparse.c"
     break;
 
 
-#line 2039 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+#line 2047 "hl/src/H5LTparse.c"
+
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2082,14 +2091,13 @@ yyreduce:
   /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
+  {
+    const int yylhs = yyr1[yyn] - YYNTOKENS;
+    const int yyi = yypgoto[yylhs] + *yyssp;
+    yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
+               ? yytable[yyi]
+               : yydefgoto[yylhs]);
+  }
 
   goto yynewstate;
 
@@ -2172,12 +2180,10 @@ yyerrlab:
 | yyerrorlab -- error raised explicitly by YYERROR.  |
 `---------------------------------------------------*/
 yyerrorlab:
-
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
+  /* Pacify compilers when the user code never invokes YYERROR and the
+     label yyerrorlab therefore never appears in user code.  */
+  if (0)
+    YYERROR;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -2239,6 +2245,7 @@ yyacceptlab:
   yyresult = 0;
   goto yyreturn;
 
+
 /*-----------------------------------.
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
@@ -2246,6 +2253,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
+
 #if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
@@ -2256,6 +2264,10 @@ yyexhaustedlab:
   /* Fall through.  */
 #endif
 
+
+/*-----------------------------------------------------.
+| yyreturn -- parsing is finished, return the result.  |
+`-----------------------------------------------------*/
 yyreturn:
   if (yychar != YYEMPTY)
     {