From 5855f5d431b266ccb3568d2a70ba95725ba1cfc0 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Wed, 9 Dec 2015 21:36:22 -0500 Subject: [svn-r28553] Merge of r28436 from revise_chunks. Cleans up warnings exposed by gcc 5.2 in the flex/bison code. Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1 serial only --- bin/genparser | 4 +- hl/src/H5LTanalyze.c | 159 ++++++++++++++------------- hl/src/H5LTanalyze.l | 5 + hl/src/H5LTparse.c | 300 ++++++++++++++++++++++++++------------------------- hl/src/H5LTparse.h | 4 +- 5 files changed, 244 insertions(+), 228 deletions(-) diff --git a/bin/genparser b/bin/genparser index 77eab35..71a8ae2 100755 --- a/bin/genparser +++ b/bin/genparser @@ -227,14 +227,16 @@ do echo '#pragma GCC diagnostic ignored "-Wmissing-prototypes" ' >> tmp.out echo '#pragma GCC diagnostic ignored "-Wnested-externs" ' >> tmp.out echo '#pragma GCC diagnostic ignored "-Wold-style-definition" ' >> tmp.out + echo '#pragma GCC diagnostic ignored "-Wredundant-decls" ' >> tmp.out echo '#pragma GCC diagnostic ignored "-Wsign-compare" ' >> tmp.out echo '#pragma GCC diagnostic ignored "-Wsign-conversion" ' >> tmp.out + echo '#pragma GCC diagnostic ignored "-Wstrict-overflow" ' >> tmp.out echo '#pragma GCC diagnostic ignored "-Wstrict-prototypes" ' >> tmp.out + echo '#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure" ' >> tmp.out echo '#pragma GCC diagnostic ignored "-Wswitch-default" ' >> tmp.out echo '#pragma GCC diagnostic ignored "-Wunused-function" ' >> tmp.out echo '#pragma GCC diagnostic ignored "-Wunused-macros" ' >> tmp.out echo '#pragma GCC diagnostic ignored "-Wunused-parameter" ' >> tmp.out - echo '#pragma GCC diagnostic ignored "-Wredundant-decls" ' >> tmp.out echo '#elif defined __SUNPRO_CC ' >> tmp.out echo '#pragma disable_warn ' >> tmp.out echo '#elif defined _MSC_VER ' >> tmp.out diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c index 8c0707c..022e24f 100644 --- a/hl/src/H5LTanalyze.c +++ b/hl/src/H5LTanalyze.c @@ -5,22 +5,24 @@ #pragma GCC diagnostic ignored "-Wmissing-prototypes" #pragma GCC diagnostic ignored "-Wnested-externs" #pragma GCC diagnostic ignored "-Wold-style-definition" +#pragma GCC diagnostic ignored "-Wredundant-decls" #pragma GCC diagnostic ignored "-Wsign-compare" #pragma GCC diagnostic ignored "-Wsign-conversion" +#pragma GCC diagnostic ignored "-Wstrict-overflow" #pragma GCC diagnostic ignored "-Wstrict-prototypes" +#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure" #pragma GCC diagnostic ignored "-Wswitch-default" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-macros" #pragma GCC diagnostic ignored "-Wunused-parameter" -#pragma GCC diagnostic ignored "-Wredundant-decls" #elif defined __SUNPRO_CC #pragma disable_warn #elif defined _MSC_VER #pragma warning(push, 1) #endif -#line 2 "hl/src//H5LTanalyze.c" +#line 2 "hl/src/H5LTanalyze.c" -#line 4 "hl/src//H5LTanalyze.c" +#line 4 "hl/src/H5LTanalyze.c" #define YY_INT_ALIGNED short int @@ -873,7 +875,7 @@ goto find_rule; \ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *H5LTyytext; -#line 1 "hl/src//H5LTanalyze.l" +#line 1 "hl/src/H5LTanalyze.l" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Copyright by The HDF Group. * * Copyright by the Board of Trustees of the University of Illinois. * @@ -893,12 +895,17 @@ char *H5LTyytext; * If you make any changes to H5LTanalyze.l, please run bin/genparser to * recreate the output files. */ -#line 23 "hl/src//H5LTanalyze.l" +#line 23 "hl/src/H5LTanalyze.l" #include #include #include #include "H5LTparse.h" +/* Turn off suggest const attribute warning in gcc */ +#if __GNUC__ >= 4 && __GNUC_MINOR__ >=2 +#pragma GCC diagnostic ignored "-Wsuggest-attribute=const" +#endif + int my_yyinput(char *, int); #undef YY_INPUT #define YY_INPUT(b, r, ms) (r=my_yyinput(b, ms)) @@ -947,7 +954,7 @@ extern hbool_t is_opq_tag; hbool_t first_quote = 1; -#line 931 "hl/src//H5LTanalyze.c" +#line 936 "hl/src/H5LTanalyze.c" #define INITIAL 0 #define TAG_STRING 1 @@ -1160,10 +1167,10 @@ YY_DECL } { -#line 79 "hl/src//H5LTanalyze.l" +#line 84 "hl/src/H5LTanalyze.l" -#line 1147 "hl/src//H5LTanalyze.c" +#line 1152 "hl/src/H5LTanalyze.c" while ( 1 ) /* loops until end-of-file is reached */ { @@ -1225,277 +1232,277 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 81 "hl/src//H5LTanalyze.l" +#line 86 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_I8BE_TOKEN);} YY_BREAK case 2: YY_RULE_SETUP -#line 82 "hl/src//H5LTanalyze.l" +#line 87 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_I8LE_TOKEN);} YY_BREAK case 3: YY_RULE_SETUP -#line 83 "hl/src//H5LTanalyze.l" +#line 88 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_I16BE_TOKEN);} YY_BREAK case 4: YY_RULE_SETUP -#line 84 "hl/src//H5LTanalyze.l" +#line 89 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_I16LE_TOKEN);} YY_BREAK case 5: YY_RULE_SETUP -#line 85 "hl/src//H5LTanalyze.l" +#line 90 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_I32BE_TOKEN);} YY_BREAK case 6: YY_RULE_SETUP -#line 86 "hl/src//H5LTanalyze.l" +#line 91 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_I32LE_TOKEN);} YY_BREAK case 7: YY_RULE_SETUP -#line 87 "hl/src//H5LTanalyze.l" +#line 92 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_I64BE_TOKEN);} YY_BREAK case 8: YY_RULE_SETUP -#line 88 "hl/src//H5LTanalyze.l" +#line 93 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_I64LE_TOKEN);} YY_BREAK case 9: YY_RULE_SETUP -#line 90 "hl/src//H5LTanalyze.l" +#line 95 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_U8BE_TOKEN);} YY_BREAK case 10: YY_RULE_SETUP -#line 91 "hl/src//H5LTanalyze.l" +#line 96 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_U8LE_TOKEN);} YY_BREAK case 11: YY_RULE_SETUP -#line 92 "hl/src//H5LTanalyze.l" +#line 97 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_U16BE_TOKEN);} YY_BREAK case 12: YY_RULE_SETUP -#line 93 "hl/src//H5LTanalyze.l" +#line 98 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_U16LE_TOKEN);} YY_BREAK case 13: YY_RULE_SETUP -#line 94 "hl/src//H5LTanalyze.l" +#line 99 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_U32BE_TOKEN);} YY_BREAK case 14: YY_RULE_SETUP -#line 95 "hl/src//H5LTanalyze.l" +#line 100 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_U32LE_TOKEN);} YY_BREAK case 15: YY_RULE_SETUP -#line 96 "hl/src//H5LTanalyze.l" +#line 101 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_U64BE_TOKEN);} YY_BREAK case 16: YY_RULE_SETUP -#line 97 "hl/src//H5LTanalyze.l" +#line 102 "hl/src/H5LTanalyze.l" {return hid(H5T_STD_U64LE_TOKEN);} YY_BREAK case 17: YY_RULE_SETUP -#line 99 "hl/src//H5LTanalyze.l" +#line 104 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_CHAR_TOKEN);} YY_BREAK case 18: YY_RULE_SETUP -#line 100 "hl/src//H5LTanalyze.l" +#line 105 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_SCHAR_TOKEN);} YY_BREAK case 19: YY_RULE_SETUP -#line 101 "hl/src//H5LTanalyze.l" +#line 106 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_UCHAR_TOKEN);} YY_BREAK case 20: YY_RULE_SETUP -#line 102 "hl/src//H5LTanalyze.l" +#line 107 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_SHORT_TOKEN);} YY_BREAK case 21: YY_RULE_SETUP -#line 103 "hl/src//H5LTanalyze.l" +#line 108 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_USHORT_TOKEN);} YY_BREAK case 22: YY_RULE_SETUP -#line 104 "hl/src//H5LTanalyze.l" +#line 109 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_INT_TOKEN);} YY_BREAK case 23: YY_RULE_SETUP -#line 105 "hl/src//H5LTanalyze.l" +#line 110 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_UINT_TOKEN);} YY_BREAK case 24: YY_RULE_SETUP -#line 106 "hl/src//H5LTanalyze.l" +#line 111 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_LONG_TOKEN);} YY_BREAK case 25: YY_RULE_SETUP -#line 107 "hl/src//H5LTanalyze.l" +#line 112 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_ULONG_TOKEN);} YY_BREAK case 26: YY_RULE_SETUP -#line 108 "hl/src//H5LTanalyze.l" +#line 113 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_LLONG_TOKEN);} YY_BREAK case 27: YY_RULE_SETUP -#line 109 "hl/src//H5LTanalyze.l" +#line 114 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_ULLONG_TOKEN);} YY_BREAK case 28: YY_RULE_SETUP -#line 111 "hl/src//H5LTanalyze.l" +#line 116 "hl/src/H5LTanalyze.l" {return hid(H5T_IEEE_F32BE_TOKEN);} YY_BREAK case 29: YY_RULE_SETUP -#line 112 "hl/src//H5LTanalyze.l" +#line 117 "hl/src/H5LTanalyze.l" {return hid(H5T_IEEE_F32LE_TOKEN);} YY_BREAK case 30: YY_RULE_SETUP -#line 113 "hl/src//H5LTanalyze.l" +#line 118 "hl/src/H5LTanalyze.l" {return hid(H5T_IEEE_F64BE_TOKEN);} YY_BREAK case 31: YY_RULE_SETUP -#line 114 "hl/src//H5LTanalyze.l" +#line 119 "hl/src/H5LTanalyze.l" {return hid(H5T_IEEE_F64LE_TOKEN);} YY_BREAK case 32: YY_RULE_SETUP -#line 115 "hl/src//H5LTanalyze.l" +#line 120 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_FLOAT_TOKEN);} YY_BREAK case 33: YY_RULE_SETUP -#line 116 "hl/src//H5LTanalyze.l" +#line 121 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_DOUBLE_TOKEN);} YY_BREAK case 34: YY_RULE_SETUP -#line 117 "hl/src//H5LTanalyze.l" +#line 122 "hl/src/H5LTanalyze.l" {return hid(H5T_NATIVE_LDOUBLE_TOKEN);} YY_BREAK case 35: YY_RULE_SETUP -#line 119 "hl/src//H5LTanalyze.l" +#line 124 "hl/src/H5LTanalyze.l" {return token(H5T_STRING_TOKEN);} YY_BREAK case 36: YY_RULE_SETUP -#line 120 "hl/src//H5LTanalyze.l" +#line 125 "hl/src/H5LTanalyze.l" {return token(STRSIZE_TOKEN);} YY_BREAK case 37: YY_RULE_SETUP -#line 121 "hl/src//H5LTanalyze.l" +#line 126 "hl/src/H5LTanalyze.l" {return token(STRPAD_TOKEN);} YY_BREAK case 38: YY_RULE_SETUP -#line 122 "hl/src//H5LTanalyze.l" +#line 127 "hl/src/H5LTanalyze.l" {return token(CSET_TOKEN);} YY_BREAK case 39: YY_RULE_SETUP -#line 123 "hl/src//H5LTanalyze.l" +#line 128 "hl/src/H5LTanalyze.l" {return token(CTYPE_TOKEN);} YY_BREAK case 40: YY_RULE_SETUP -#line 124 "hl/src//H5LTanalyze.l" +#line 129 "hl/src/H5LTanalyze.l" {return token(H5T_STR_NULLTERM_TOKEN);} YY_BREAK case 41: YY_RULE_SETUP -#line 125 "hl/src//H5LTanalyze.l" +#line 130 "hl/src/H5LTanalyze.l" {return token(H5T_STR_NULLPAD_TOKEN);} YY_BREAK case 42: YY_RULE_SETUP -#line 126 "hl/src//H5LTanalyze.l" +#line 131 "hl/src/H5LTanalyze.l" {return token(H5T_STR_SPACEPAD_TOKEN);} YY_BREAK case 43: YY_RULE_SETUP -#line 127 "hl/src//H5LTanalyze.l" +#line 132 "hl/src/H5LTanalyze.l" {return token(H5T_CSET_ASCII_TOKEN);} YY_BREAK case 44: YY_RULE_SETUP -#line 128 "hl/src//H5LTanalyze.l" +#line 133 "hl/src/H5LTanalyze.l" {return token(H5T_CSET_UTF8_TOKEN);} YY_BREAK case 45: YY_RULE_SETUP -#line 129 "hl/src//H5LTanalyze.l" +#line 134 "hl/src/H5LTanalyze.l" {return token(H5T_C_S1_TOKEN);} YY_BREAK case 46: YY_RULE_SETUP -#line 130 "hl/src//H5LTanalyze.l" +#line 135 "hl/src/H5LTanalyze.l" {return token(H5T_FORTRAN_S1_TOKEN);} YY_BREAK case 47: YY_RULE_SETUP -#line 131 "hl/src//H5LTanalyze.l" +#line 136 "hl/src/H5LTanalyze.l" {return token(H5T_VARIABLE_TOKEN);} YY_BREAK case 48: YY_RULE_SETUP -#line 133 "hl/src//H5LTanalyze.l" +#line 138 "hl/src/H5LTanalyze.l" {return token(H5T_COMPOUND_TOKEN);} YY_BREAK case 49: YY_RULE_SETUP -#line 134 "hl/src//H5LTanalyze.l" +#line 139 "hl/src/H5LTanalyze.l" {return token(H5T_ENUM_TOKEN);} YY_BREAK case 50: YY_RULE_SETUP -#line 135 "hl/src//H5LTanalyze.l" +#line 140 "hl/src/H5LTanalyze.l" {return token(H5T_ARRAY_TOKEN);} YY_BREAK case 51: YY_RULE_SETUP -#line 136 "hl/src//H5LTanalyze.l" +#line 141 "hl/src/H5LTanalyze.l" {return token(H5T_VLEN_TOKEN);} YY_BREAK case 52: YY_RULE_SETUP -#line 138 "hl/src//H5LTanalyze.l" +#line 143 "hl/src/H5LTanalyze.l" {return token(H5T_OPAQUE_TOKEN);} YY_BREAK case 53: YY_RULE_SETUP -#line 139 "hl/src//H5LTanalyze.l" +#line 144 "hl/src/H5LTanalyze.l" {return token(OPQ_SIZE_TOKEN);} YY_BREAK case 54: YY_RULE_SETUP -#line 140 "hl/src//H5LTanalyze.l" +#line 145 "hl/src/H5LTanalyze.l" {return token(OPQ_TAG_TOKEN);} YY_BREAK case 55: YY_RULE_SETUP -#line 142 "hl/src//H5LTanalyze.l" +#line 147 "hl/src/H5LTanalyze.l" { if( is_str_size || (is_enum && is_enum_memb) || is_opq_size || (asindex>-1 && arr_stack[asindex].is_dim) || @@ -1508,7 +1515,7 @@ YY_RULE_SETUP YY_BREAK case 56: YY_RULE_SETUP -#line 152 "hl/src//H5LTanalyze.l" +#line 157 "hl/src/H5LTanalyze.l" { /*if it's first quote, and is a compound field name or an enum symbol*/ if((is_opq_tag || is_enum || (csindex>-1 && cmpd_stack[csindex].is_field)) @@ -1523,7 +1530,7 @@ YY_RULE_SETUP case 57: /* rule 57 can match eol */ YY_RULE_SETUP -#line 162 "hl/src//H5LTanalyze.l" +#line 167 "hl/src/H5LTanalyze.l" { #ifdef H5_HAVE_WIN32_API H5LTyylval.sval = _strdup(H5LTyytext); @@ -1536,52 +1543,52 @@ YY_RULE_SETUP YY_BREAK case 58: YY_RULE_SETUP -#line 172 "hl/src//H5LTanalyze.l" +#line 177 "hl/src/H5LTanalyze.l" {return token('{');} YY_BREAK case 59: YY_RULE_SETUP -#line 173 "hl/src//H5LTanalyze.l" +#line 178 "hl/src/H5LTanalyze.l" {return token('}');} YY_BREAK case 60: YY_RULE_SETUP -#line 174 "hl/src//H5LTanalyze.l" +#line 179 "hl/src/H5LTanalyze.l" {return token('[');} YY_BREAK case 61: YY_RULE_SETUP -#line 175 "hl/src//H5LTanalyze.l" +#line 180 "hl/src/H5LTanalyze.l" {return token(']');} YY_BREAK case 62: YY_RULE_SETUP -#line 176 "hl/src//H5LTanalyze.l" +#line 181 "hl/src/H5LTanalyze.l" {return token(':');} YY_BREAK case 63: YY_RULE_SETUP -#line 177 "hl/src//H5LTanalyze.l" +#line 182 "hl/src/H5LTanalyze.l" {return token(';');} YY_BREAK case 64: /* rule 64 can match eol */ YY_RULE_SETUP -#line 178 "hl/src//H5LTanalyze.l" +#line 183 "hl/src/H5LTanalyze.l" ; YY_BREAK case 65: /* rule 65 can match eol */ YY_RULE_SETUP -#line 179 "hl/src//H5LTanalyze.l" +#line 184 "hl/src/H5LTanalyze.l" { return 0; } YY_BREAK case 66: YY_RULE_SETUP -#line 181 "hl/src//H5LTanalyze.l" +#line 186 "hl/src/H5LTanalyze.l" ECHO; YY_BREAK -#line 1565 "hl/src//H5LTanalyze.c" +#line 1570 "hl/src/H5LTanalyze.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(TAG_STRING): yyterminate(); @@ -2551,7 +2558,7 @@ void H5LTyyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 180 "hl/src//H5LTanalyze.l" +#line 185 "hl/src/H5LTanalyze.l" int my_yyinput(char *buf, int max_size) diff --git a/hl/src/H5LTanalyze.l b/hl/src/H5LTanalyze.l index 29eb3bb..a0c4f42 100644 --- a/hl/src/H5LTanalyze.l +++ b/hl/src/H5LTanalyze.l @@ -25,6 +25,11 @@ #include #include "H5LTparse.h" +/* Turn off suggest const attribute warning in gcc */ +#if __GNUC__ >= 4 && __GNUC_MINOR__ >=2 +#pragma GCC diagnostic ignored "-Wsuggest-attribute=const" +#endif + int my_yyinput(char *, int); #undef YY_INPUT #define YY_INPUT(b, r, ms) (r=my_yyinput(b, ms)) diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c index fbfd823..5835dcc 100644 --- a/hl/src/H5LTparse.c +++ b/hl/src/H5LTparse.c @@ -5,14 +5,16 @@ #pragma GCC diagnostic ignored "-Wmissing-prototypes" #pragma GCC diagnostic ignored "-Wnested-externs" #pragma GCC diagnostic ignored "-Wold-style-definition" +#pragma GCC diagnostic ignored "-Wredundant-decls" #pragma GCC diagnostic ignored "-Wsign-compare" #pragma GCC diagnostic ignored "-Wsign-conversion" +#pragma GCC diagnostic ignored "-Wstrict-overflow" #pragma GCC diagnostic ignored "-Wstrict-prototypes" +#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure" #pragma GCC diagnostic ignored "-Wswitch-default" #pragma GCC diagnostic ignored "-Wunused-function" #pragma GCC diagnostic ignored "-Wunused-macros" #pragma GCC diagnostic ignored "-Wunused-parameter" -#pragma GCC diagnostic ignored "-Wredundant-decls" #elif defined __SUNPRO_CC #pragma disable_warn #elif defined _MSC_VER @@ -90,7 +92,7 @@ #define yychar H5LTyychar /* Copy the first part of user declarations. */ -#line 22 "hl/src//H5LTparse.y" /* yacc.c:339 */ +#line 22 "hl/src/H5LTparse.y" /* yacc.c:339 */ #include #include @@ -143,7 +145,7 @@ 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 127 "hl/src/H5LTparse.c" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -242,13 +244,13 @@ extern int H5LTyydebug; typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 74 "hl/src//H5LTparse.y" /* yacc.c:355 */ +#line 74 "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 232 "hl/src//H5LTparse.c" /* yacc.c:355 */ +#line 232 "hl/src/H5LTparse.c" /* yacc.c:355 */ }; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -263,7 +265,7 @@ hid_t H5LTyyparse (void); /* Copy the second part of user declarations. */ -#line 247 "hl/src//H5LTparse.c" /* yacc.c:358 */ +#line 247 "hl/src/H5LTparse.c" /* yacc.c:358 */ #ifdef short # undef short @@ -1482,245 +1484,245 @@ yyreduce: switch (yyn) { case 2: -#line 107 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 107 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { memset(arr_stack, 0, STACK_SIZE*sizeof(struct arr_info)); /*initialize here?*/ } -#line 1468 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1468 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 3: -#line 108 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 108 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { return (yyval.hid);} -#line 1474 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1474 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 13: -#line 122 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 122 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_I8BE); } -#line 1480 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1480 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 14: -#line 123 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 123 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_I8LE); } -#line 1486 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1486 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 15: -#line 124 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 124 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_I16BE); } -#line 1492 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1492 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 16: -#line 125 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 125 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_I16LE); } -#line 1498 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1498 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 17: -#line 126 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 126 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_I32BE); } -#line 1504 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1504 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 18: -#line 127 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 127 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_I32LE); } -#line 1510 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1510 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 19: -#line 128 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 128 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_I64BE); } -#line 1516 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1516 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 20: -#line 129 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 129 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_I64LE); } -#line 1522 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1522 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 21: -#line 130 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 130 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_U8BE); } -#line 1528 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1528 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 22: -#line 131 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 131 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_U8LE); } -#line 1534 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1534 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 23: -#line 132 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 132 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_U16BE); } -#line 1540 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1540 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 24: -#line 133 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 133 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_U16LE); } -#line 1546 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1546 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 25: -#line 134 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 134 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_U32BE); } -#line 1552 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1552 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 26: -#line 135 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 135 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_U32LE); } -#line 1558 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1558 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 27: -#line 136 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 136 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_U64BE); } -#line 1564 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1564 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 28: -#line 137 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 137 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_STD_U64LE); } -#line 1570 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1570 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 29: -#line 138 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 138 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_CHAR); } -#line 1576 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1576 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 30: -#line 139 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 139 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_SCHAR); } -#line 1582 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1582 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 31: -#line 140 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 140 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_UCHAR); } -#line 1588 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1588 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 32: -#line 141 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 141 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_SHORT); } -#line 1594 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1594 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 33: -#line 142 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 142 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_USHORT); } -#line 1600 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1600 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 34: -#line 143 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 143 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_INT); } -#line 1606 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1606 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 35: -#line 144 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 144 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_UINT); } -#line 1612 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1612 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 36: -#line 145 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 145 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_LONG); } -#line 1618 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1618 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 37: -#line 146 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 146 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULONG); } -#line 1624 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1624 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 38: -#line 147 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 147 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_LLONG); } -#line 1630 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1630 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 39: -#line 148 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 148 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULLONG); } -#line 1636 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1636 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 40: -#line 151 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 151 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_IEEE_F32BE); } -#line 1642 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1642 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 41: -#line 152 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 152 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_IEEE_F32LE); } -#line 1648 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1648 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 42: -#line 153 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 153 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_IEEE_F64BE); } -#line 1654 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1654 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 43: -#line 154 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 154 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_IEEE_F64LE); } -#line 1660 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1660 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 44: -#line 155 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 155 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_FLOAT); } -#line 1666 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1666 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 45: -#line 156 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 156 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_DOUBLE); } -#line 1672 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1672 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 46: -#line 157 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 157 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tcopy(H5T_NATIVE_LDOUBLE); } -#line 1678 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1678 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 47: -#line 161 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 161 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { csindex++; cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/ } -#line 1684 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1684 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 48: -#line 163 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 163 "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 1694 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1694 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 51: -#line 172 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 172 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { cmpd_stack[csindex].is_field = 1; /*notify lexer a compound member is parsed*/ } -#line 1700 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1700 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 52: -#line 174 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 174 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { size_t origin_size, new_size; hid_t dtype_id = cmpd_stack[csindex].id; @@ -1755,117 +1757,117 @@ yyreduce: new_size = H5Tget_size(dtype_id); } -#line 1739 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1739 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 53: -#line 210 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 210 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.sval) = strdup(yylval.sval); free(yylval.sval); yylval.sval = NULL; } -#line 1749 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1749 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 54: -#line 217 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 217 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.ival) = 0; } -#line 1755 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1755 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 55: -#line 219 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 219 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.ival) = yylval.ival; } -#line 1761 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1761 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 57: -#line 223 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 223 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { asindex++; /*pushd onto the stack*/ } -#line 1767 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1767 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 58: -#line 225 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 225 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (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 1778 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 61: -#line 235 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 235 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { arr_stack[asindex].is_dim = 1; /*notice lexer of dimension size*/ } -#line 1784 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1784 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 62: -#line 236 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 236 "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 1794 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1794 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 65: -#line 247 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 247 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = H5Tvlen_create((yyvsp[-1].hid)); H5Tclose((yyvsp[-1].hid)); } -#line 1800 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1800 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 66: -#line 252 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 252 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { is_opq_size = 1; } -#line 1806 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1806 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 67: -#line 253 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 253 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { 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 1816 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 68: -#line 258 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 258 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { is_opq_tag = 1; } -#line 1822 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1822 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 69: -#line 259 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 259 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { 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 1833 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 70: -#line 265 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 265 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { (yyval.hid) = (yyvsp[-8].hid); } -#line 1839 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1839 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 73: -#line 273 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 273 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { is_str_size = 1; } -#line 1845 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1845 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 74: -#line 274 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 274 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { if((yyvsp[-1].ival) == H5T_VARIABLE_TOKEN) is_variable = 1; @@ -1873,11 +1875,11 @@ yyreduce: str_size = yylval.ival; is_str_size = 0; } -#line 1857 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1857 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 75: -#line 282 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 282 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { if((yyvsp[-1].ival) == H5T_STR_NULLTERM_TOKEN) str_pad = H5T_STR_NULLTERM; @@ -1886,33 +1888,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 1870 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 76: -#line 291 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 291 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { 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 1881 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 77: -#line 298 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 298 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { 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 1892 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 78: -#line 305 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 305 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { hid_t str_id = (yyvsp[-1].hid); @@ -1929,71 +1931,71 @@ yyreduce: (yyval.hid) = str_id; } -#line 1913 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1913 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 79: -#line 322 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 322 "hl/src/H5LTparse.y" /* yacc.c:1646 */ {(yyval.ival) = H5T_VARIABLE_TOKEN;} -#line 1919 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1919 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 81: -#line 325 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 325 "hl/src/H5LTparse.y" /* yacc.c:1646 */ {(yyval.ival) = H5T_STR_NULLTERM_TOKEN;} -#line 1925 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1925 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 82: -#line 326 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 326 "hl/src/H5LTparse.y" /* yacc.c:1646 */ {(yyval.ival) = H5T_STR_NULLPAD_TOKEN;} -#line 1931 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1931 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 83: -#line 327 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 327 "hl/src/H5LTparse.y" /* yacc.c:1646 */ {(yyval.ival) = H5T_STR_SPACEPAD_TOKEN;} -#line 1937 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1937 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 84: -#line 329 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 329 "hl/src/H5LTparse.y" /* yacc.c:1646 */ {(yyval.ival) = H5T_CSET_ASCII_TOKEN;} -#line 1943 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1943 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 85: -#line 330 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 330 "hl/src/H5LTparse.y" /* yacc.c:1646 */ {(yyval.ival) = H5T_CSET_UTF8_TOKEN;} -#line 1949 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1949 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 86: -#line 332 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 332 "hl/src/H5LTparse.y" /* yacc.c:1646 */ {(yyval.hid) = H5T_C_S1_TOKEN;} -#line 1955 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1955 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 87: -#line 333 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 333 "hl/src/H5LTparse.y" /* yacc.c:1646 */ {(yyval.hid) = H5T_FORTRAN_S1_TOKEN;} -#line 1961 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1961 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 88: -#line 337 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 337 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { is_enum = 1; enum_id = H5Tenum_create((yyvsp[-1].hid)); H5Tclose((yyvsp[-1].hid)); } -#line 1967 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1967 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 89: -#line 339 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 339 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { is_enum = 0; /*reset*/ (yyval.hid) = enum_id; } -#line 1973 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1973 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 92: -#line 344 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 344 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { is_enum_memb = 1; /*indicate member of enum*/ #ifdef H5_HAVE_WIN32_API @@ -2004,11 +2006,11 @@ yyreduce: free(yylval.sval); yylval.sval = NULL; } -#line 1988 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 1988 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; case 93: -#line 355 "hl/src//H5LTparse.y" /* yacc.c:1646 */ +#line 355 "hl/src/H5LTparse.y" /* yacc.c:1646 */ { char char_val=(char)yylval.ival; short short_val=(short)yylval.ival; @@ -2051,11 +2053,11 @@ yyreduce: H5Tclose(super); H5Tclose(native); } -#line 2035 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 2035 "hl/src/H5LTparse.c" /* yacc.c:1646 */ break; -#line 2039 "hl/src//H5LTparse.c" /* yacc.c:1646 */ +#line 2039 "hl/src/H5LTparse.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires diff --git a/hl/src/H5LTparse.h b/hl/src/H5LTparse.h index c4ce22d..3d7b4e8 100644 --- a/hl/src/H5LTparse.h +++ b/hl/src/H5LTparse.h @@ -109,13 +109,13 @@ extern int H5LTyydebug; typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 74 "hl/src//H5LTparse.y" /* yacc.c:1909 */ +#line 74 "hl/src/H5LTparse.y" /* yacc.c:1909 */ int ival; /*for integer token*/ char *sval; /*for name string*/ hid_t hid; /*for hid_t token*/ -#line 119 "hl/src//H5LTparse.h" /* yacc.c:1909 */ +#line 119 "hl/src/H5LTparse.h" /* yacc.c:1909 */ }; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 -- cgit v0.12