diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2014-07-30 20:55:14 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-07-30 20:55:14 (GMT) |
commit | 33ea1ada248725e4cce6316c503e5c760bcca49c (patch) | |
tree | 3fd7e951132e6aa9b7d241a418505d3ae6e33587 /hl/src/H5LTparse.c | |
parent | 3f701fda6528be0844afa2315c2a28357591349a (diff) | |
download | hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.zip hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.tar.gz hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.tar.bz2 |
[svn-r25496] Description:
Merge 64-bit ID changes from branch to trunk. (Plus a few minor cleanups
that aren't on the branch)
Tested on:
Mac OSX/64 10.9.4 (amazon) w/C++ & FORTRAN
(h5committested on branch already for a week)
Diffstat (limited to 'hl/src/H5LTparse.c')
-rw-r--r-- | hl/src/H5LTparse.c | 318 |
1 files changed, 160 insertions, 158 deletions
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c index 240a8d3..e9a3ec9 100644 --- a/hl/src/H5LTparse.c +++ b/hl/src/H5LTparse.c @@ -226,12 +226,13 @@ typedef union YYSTYPE /* Line 387 of yacc.c */ #line 68 "H5LTparse.y" - int ival; /*for integer token*/ - char *sval; /*for name string*/ + int ival; /*for integer token*/ + char *sval; /*for name string*/ + hid_t hid; /*for hid_t token*/ /* Line 387 of yacc.c */ -#line 235 "H5LTparse.c" +#line 236 "H5LTparse.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -242,15 +243,15 @@ extern YYSTYPE H5LTyylval; #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus -int H5LTyyparse (void *YYPARSE_PARAM); +hid_t H5LTyyparse (void *YYPARSE_PARAM); #else -int H5LTyyparse (); +hid_t H5LTyyparse (); #endif #else /* ! YYPARSE_PARAM */ #if defined __STDC__ || defined __cplusplus -int H5LTyyparse (void); +hid_t H5LTyyparse (void); #else -int H5LTyyparse (); +hid_t H5LTyyparse (); #endif #endif /* ! YYPARSE_PARAM */ @@ -259,7 +260,7 @@ int H5LTyyparse (); /* Copy the second part of user declarations. */ /* Line 390 of yacc.c */ -#line 263 "H5LTparse.c" +#line 264 "H5LTparse.c" #ifdef short # undef short @@ -583,16 +584,16 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 100, 100, 101, 103, 104, 105, 106, 108, 109, - 110, 111, 112, 115, 116, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, - 144, 145, 146, 147, 148, 149, 150, 154, 153, 162, - 163, 165, 165, 199, 205, 206, 209, 211, 211, 220, - 221, 223, 224, 223, 231, 234, 240, 241, 246, 247, - 238, 253, 255, 259, 260, 268, 277, 284, 257, 308, - 309, 311, 312, 313, 315, 316, 318, 319, 323, 322, - 327, 328, 330, 330, 382, 384 + 0, 101, 101, 102, 104, 105, 106, 107, 109, 110, + 111, 112, 113, 116, 117, 118, 119, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, + 145, 146, 147, 148, 149, 150, 151, 155, 154, 163, + 164, 166, 166, 200, 206, 207, 210, 212, 212, 221, + 222, 224, 225, 224, 232, 235, 241, 242, 247, 248, + 239, 254, 256, 260, 261, 269, 278, 285, 258, 309, + 310, 312, 313, 314, 316, 317, 319, 320, 324, 323, + 328, 329, 331, 331, 383, 385 }; #endif @@ -625,11 +626,12 @@ static const char *const yytname[] = "NUMBER", "'{'", "'}'", "'['", "']'", "'\"'", "':'", "';'", "$accept", "start", "ddl_type", "atomic_type", "integer_type", "fp_type", "compound_type", "$@1", "memb_list", "memb_def", "$@2", "field_name", - "field_offset", "offset", "array_type", "$@3", "dim_list", "dim", "$@4", - "$@5", "dimsize", "vlen_type", "opaque_type", "$@6", "@7", "$@8", "$@9", - "opaque_size", "opaque_tag", "string_type", "$@10", "$@11", "$@12", - "$@13", "@14", "strsize", "strpad", "cset", "ctype", "enum_type", "$@15", - "enum_list", "enum_def", "$@16", "enum_symbol", "enum_val", YY_NULL + "field_offset", "offset", "array_type", "$@3", "dim_list", "dim", + "$@4", "$@5", "dimsize", "vlen_type", "opaque_type", "$@6", "@7", + "$@8", "$@9", "opaque_size", "opaque_tag", "string_type", "$@10", + "$@11", "$@12", "$@13", "@14", "strsize", "strpad", "cset", "ctype", + "enum_type", "$@15", "enum_list", "enum_def", "$@16", "enum_symbol", + "enum_val", YY_NULL }; #endif @@ -1369,20 +1371,20 @@ int yynerrs; #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) -int +hid_t yyparse (void *YYPARSE_PARAM) #else -int +hid_t yyparse (YYPARSE_PARAM) void *YYPARSE_PARAM; #endif #else /* ! YYPARSE_PARAM */ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) -int +hid_t yyparse (void) #else -int +hid_t yyparse () #endif @@ -1622,230 +1624,230 @@ yyreduce: { case 2: /* Line 1807 of yacc.c */ -#line 100 "H5LTparse.y" +#line 101 "H5LTparse.y" { memset(arr_stack, 0, STACK_SIZE*sizeof(struct arr_info)); /*initialize here?*/ } break; case 3: /* Line 1807 of yacc.c */ -#line 101 "H5LTparse.y" - { return (yyval.ival);} +#line 102 "H5LTparse.y" + { return (yyval.hid);} break; case 13: /* Line 1807 of yacc.c */ -#line 115 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_I8BE); } +#line 116 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_I8BE); } break; case 14: /* Line 1807 of yacc.c */ -#line 116 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_I8LE); } +#line 117 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_I8LE); } break; case 15: /* Line 1807 of yacc.c */ -#line 117 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_I16BE); } +#line 118 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_I16BE); } break; case 16: /* Line 1807 of yacc.c */ -#line 118 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_I16LE); } +#line 119 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_I16LE); } break; case 17: /* Line 1807 of yacc.c */ -#line 119 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_I32BE); } +#line 120 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_I32BE); } break; case 18: /* Line 1807 of yacc.c */ -#line 120 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_I32LE); } +#line 121 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_I32LE); } break; case 19: /* Line 1807 of yacc.c */ -#line 121 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_I64BE); } +#line 122 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_I64BE); } break; case 20: /* Line 1807 of yacc.c */ -#line 122 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_I64LE); } +#line 123 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_I64LE); } break; case 21: /* Line 1807 of yacc.c */ -#line 123 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_U8BE); } +#line 124 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_U8BE); } break; case 22: /* Line 1807 of yacc.c */ -#line 124 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_U8LE); } +#line 125 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_U8LE); } break; case 23: /* Line 1807 of yacc.c */ -#line 125 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_U16BE); } +#line 126 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_U16BE); } break; case 24: /* Line 1807 of yacc.c */ -#line 126 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_U16LE); } +#line 127 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_U16LE); } break; case 25: /* Line 1807 of yacc.c */ -#line 127 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_U32BE); } +#line 128 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_U32BE); } break; case 26: /* Line 1807 of yacc.c */ -#line 128 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_U32LE); } +#line 129 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_U32LE); } break; case 27: /* Line 1807 of yacc.c */ -#line 129 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_U64BE); } +#line 130 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_U64BE); } break; case 28: /* Line 1807 of yacc.c */ -#line 130 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_STD_U64LE); } +#line 131 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_STD_U64LE); } break; case 29: /* Line 1807 of yacc.c */ -#line 131 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_CHAR); } +#line 132 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_CHAR); } break; case 30: /* Line 1807 of yacc.c */ -#line 132 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_SCHAR); } +#line 133 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_SCHAR); } break; case 31: /* Line 1807 of yacc.c */ -#line 133 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_UCHAR); } +#line 134 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_UCHAR); } break; case 32: /* Line 1807 of yacc.c */ -#line 134 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_SHORT); } +#line 135 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_SHORT); } break; case 33: /* Line 1807 of yacc.c */ -#line 135 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_USHORT); } +#line 136 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_USHORT); } break; case 34: /* Line 1807 of yacc.c */ -#line 136 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_INT); } +#line 137 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_INT); } break; case 35: /* Line 1807 of yacc.c */ -#line 137 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_UINT); } +#line 138 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_UINT); } break; case 36: /* Line 1807 of yacc.c */ -#line 138 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_LONG); } +#line 139 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_LONG); } break; case 37: /* Line 1807 of yacc.c */ -#line 139 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_ULONG); } +#line 140 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULONG); } break; case 38: /* Line 1807 of yacc.c */ -#line 140 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_LLONG); } +#line 141 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_LLONG); } break; case 39: /* Line 1807 of yacc.c */ -#line 141 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_ULLONG); } +#line 142 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULLONG); } break; case 40: /* Line 1807 of yacc.c */ -#line 144 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_IEEE_F32BE); } +#line 145 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_IEEE_F32BE); } break; case 41: /* Line 1807 of yacc.c */ -#line 145 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_IEEE_F32LE); } +#line 146 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_IEEE_F32LE); } break; case 42: /* Line 1807 of yacc.c */ -#line 146 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_IEEE_F64BE); } +#line 147 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_IEEE_F64BE); } break; case 43: /* Line 1807 of yacc.c */ -#line 147 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_IEEE_F64LE); } +#line 148 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_IEEE_F64LE); } break; case 44: /* Line 1807 of yacc.c */ -#line 148 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_FLOAT); } +#line 149 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_FLOAT); } break; case 45: /* Line 1807 of yacc.c */ -#line 149 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_DOUBLE); } +#line 150 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_DOUBLE); } break; case 46: /* Line 1807 of yacc.c */ -#line 150 "H5LTparse.y" - { (yyval.ival) = H5Tcopy(H5T_NATIVE_LDOUBLE); } +#line 151 "H5LTparse.y" + { (yyval.hid) = H5Tcopy(H5T_NATIVE_LDOUBLE); } break; case 47: /* Line 1807 of yacc.c */ -#line 154 "H5LTparse.y" +#line 155 "H5LTparse.y" { csindex++; cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/ } break; case 48: /* Line 1807 of yacc.c */ -#line 156 "H5LTparse.y" - { (yyval.ival) = cmpd_stack[csindex].id; +#line 157 "H5LTparse.y" + { (yyval.hid) = cmpd_stack[csindex].id; cmpd_stack[csindex].id = 0; cmpd_stack[csindex].first_memb = 1; csindex--; @@ -1854,41 +1856,41 @@ yyreduce: case 51: /* Line 1807 of yacc.c */ -#line 165 "H5LTparse.y" +#line 166 "H5LTparse.y" { cmpd_stack[csindex].is_field = 1; /*notify lexer a compound member is parsed*/ } break; case 52: /* Line 1807 of yacc.c */ -#line 167 "H5LTparse.y" +#line 168 "H5LTparse.y" { 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) - (7)].ival)) + (yyvsp[(6) - (7)].ival); + new_size = H5Tget_size((yyvsp[(1) - (7)].hid)) + (yyvsp[(6) - (7)].ival); H5Tset_size(dtype_id, new_size); /*member name is saved in yylval.sval by lexer*/ - H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), (yyvsp[(6) - (7)].ival), (yyvsp[(1) - (7)].ival)); + H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), (yyvsp[(6) - (7)].ival), (yyvsp[(1) - (7)].hid)); cmpd_stack[csindex].first_memb = 0; } else { origin_size = H5Tget_size(dtype_id); if((yyvsp[(6) - (7)].ival) == 0) { - new_size = origin_size + H5Tget_size((yyvsp[(1) - (7)].ival)); + new_size = origin_size + H5Tget_size((yyvsp[(1) - (7)].hid)); H5Tset_size(dtype_id, new_size); - H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), origin_size, (yyvsp[(1) - (7)].ival)); + H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), origin_size, (yyvsp[(1) - (7)].hid)); } else { - new_size = (yyvsp[(6) - (7)].ival) + H5Tget_size((yyvsp[(1) - (7)].ival)); + new_size = (yyvsp[(6) - (7)].ival) + H5Tget_size((yyvsp[(1) - (7)].hid)); H5Tset_size(dtype_id, new_size); - H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), (yyvsp[(6) - (7)].ival), (yyvsp[(1) - (7)].ival)); + H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), (yyvsp[(6) - (7)].ival), (yyvsp[(1) - (7)].hid)); } } cmpd_stack[csindex].is_field = 0; - H5Tclose((yyvsp[(1) - (7)].ival)); + H5Tclose((yyvsp[(1) - (7)].hid)); new_size = H5Tget_size(dtype_id); } @@ -1896,7 +1898,7 @@ yyreduce: case 53: /* Line 1807 of yacc.c */ -#line 200 "H5LTparse.y" +#line 201 "H5LTparse.y" { (yyval.sval) = yylval.sval; } @@ -1904,42 +1906,42 @@ yyreduce: case 54: /* Line 1807 of yacc.c */ -#line 205 "H5LTparse.y" +#line 206 "H5LTparse.y" { (yyval.ival) = 0; } break; case 55: /* Line 1807 of yacc.c */ -#line 207 "H5LTparse.y" +#line 208 "H5LTparse.y" { (yyval.ival) = yylval.ival; } break; case 57: /* Line 1807 of yacc.c */ -#line 211 "H5LTparse.y" +#line 212 "H5LTparse.y" { asindex++; /*pushd onto the stack*/ } break; case 58: /* Line 1807 of yacc.c */ -#line 213 "H5LTparse.y" +#line 214 "H5LTparse.y" { - (yyval.ival) = H5Tarray_create2((yyvsp[(5) - (6)].ival), arr_stack[asindex].ndims, arr_stack[asindex].dims); + (yyval.hid) = H5Tarray_create2((yyvsp[(5) - (6)].hid), arr_stack[asindex].ndims, arr_stack[asindex].dims); arr_stack[asindex].ndims = 0; asindex--; - H5Tclose((yyvsp[(5) - (6)].ival)); + H5Tclose((yyvsp[(5) - (6)].hid)); } break; case 61: /* Line 1807 of yacc.c */ -#line 223 "H5LTparse.y" +#line 224 "H5LTparse.y" { arr_stack[asindex].is_dim = 1; /*notice lexer of dimension size*/ } break; case 62: /* Line 1807 of yacc.c */ -#line 224 "H5LTparse.y" +#line 225 "H5LTparse.y" { unsigned ndims = arr_stack[asindex].ndims; arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; arr_stack[asindex].ndims++; @@ -1949,56 +1951,56 @@ yyreduce: case 65: /* Line 1807 of yacc.c */ -#line 235 "H5LTparse.y" - { (yyval.ival) = H5Tvlen_create((yyvsp[(3) - (4)].ival)); H5Tclose((yyvsp[(3) - (4)].ival)); } +#line 236 "H5LTparse.y" + { (yyval.hid) = H5Tvlen_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); } break; case 66: /* Line 1807 of yacc.c */ -#line 240 "H5LTparse.y" +#line 241 "H5LTparse.y" { is_opq_size = 1; } break; case 67: /* Line 1807 of yacc.c */ -#line 241 "H5LTparse.y" +#line 242 "H5LTparse.y" { size_t size = (size_t)yylval.ival; - (yyval.ival) = H5Tcreate(H5T_OPAQUE, size); + (yyval.hid) = H5Tcreate(H5T_OPAQUE, size); is_opq_size = 0; } break; case 68: /* Line 1807 of yacc.c */ -#line 246 "H5LTparse.y" +#line 247 "H5LTparse.y" { is_opq_tag = 1; } break; case 69: /* Line 1807 of yacc.c */ -#line 247 "H5LTparse.y" +#line 248 "H5LTparse.y" { - H5Tset_tag((yyvsp[(7) - (13)].ival), yylval.sval); + H5Tset_tag((yyvsp[(7) - (13)].hid), yylval.sval); is_opq_tag = 0; } break; case 70: /* Line 1807 of yacc.c */ -#line 251 "H5LTparse.y" - { (yyval.ival) = (yyvsp[(7) - (15)].ival); } +#line 252 "H5LTparse.y" + { (yyval.hid) = (yyvsp[(7) - (15)].hid); } break; case 73: /* Line 1807 of yacc.c */ -#line 259 "H5LTparse.y" +#line 260 "H5LTparse.y" { is_str_size = 1; } break; case 74: /* Line 1807 of yacc.c */ -#line 260 "H5LTparse.y" +#line 261 "H5LTparse.y" { if((yyvsp[(5) - (6)].ival) == H5T_VARIABLE_TOKEN) is_variable = 1; @@ -2010,7 +2012,7 @@ yyreduce: case 75: /* Line 1807 of yacc.c */ -#line 268 "H5LTparse.y" +#line 269 "H5LTparse.y" { if((yyvsp[(9) - (10)].ival) == H5T_STR_NULLTERM_TOKEN) str_pad = H5T_STR_NULLTERM; @@ -2023,7 +2025,7 @@ yyreduce: case 76: /* Line 1807 of yacc.c */ -#line 277 "H5LTparse.y" +#line 278 "H5LTparse.y" { if((yyvsp[(13) - (14)].ival) == H5T_CSET_ASCII_TOKEN) str_cset = H5T_CSET_ASCII; @@ -2034,20 +2036,20 @@ yyreduce: case 77: /* Line 1807 of yacc.c */ -#line 284 "H5LTparse.y" +#line 285 "H5LTparse.y" { - if((yyvsp[(17) - (18)].ival) == H5T_C_S1_TOKEN) - (yyval.ival) = H5Tcopy(H5T_C_S1); - else if((yyvsp[(17) - (18)].ival) == H5T_FORTRAN_S1_TOKEN) - (yyval.ival) = H5Tcopy(H5T_FORTRAN_S1); + if((yyvsp[(17) - (18)].hid) == H5T_C_S1_TOKEN) + (yyval.hid) = H5Tcopy(H5T_C_S1); + else if((yyvsp[(17) - (18)].hid) == H5T_FORTRAN_S1_TOKEN) + (yyval.hid) = H5Tcopy(H5T_FORTRAN_S1); } break; case 78: /* Line 1807 of yacc.c */ -#line 291 "H5LTparse.y" +#line 292 "H5LTparse.y" { - hid_t str_id = (yyvsp[(19) - (20)].ival); + hid_t str_id = (yyvsp[(19) - (20)].hid); /*set string size*/ if(is_variable) { @@ -2060,73 +2062,73 @@ yyreduce: H5Tset_strpad(str_id, str_pad); H5Tset_cset(str_id, str_cset); - (yyval.ival) = str_id; + (yyval.hid) = str_id; } break; case 79: /* Line 1807 of yacc.c */ -#line 308 "H5LTparse.y" +#line 309 "H5LTparse.y" {(yyval.ival) = H5T_VARIABLE_TOKEN;} break; case 81: /* Line 1807 of yacc.c */ -#line 311 "H5LTparse.y" +#line 312 "H5LTparse.y" {(yyval.ival) = H5T_STR_NULLTERM_TOKEN;} break; case 82: /* Line 1807 of yacc.c */ -#line 312 "H5LTparse.y" +#line 313 "H5LTparse.y" {(yyval.ival) = H5T_STR_NULLPAD_TOKEN;} break; case 83: /* Line 1807 of yacc.c */ -#line 313 "H5LTparse.y" +#line 314 "H5LTparse.y" {(yyval.ival) = H5T_STR_SPACEPAD_TOKEN;} break; case 84: /* Line 1807 of yacc.c */ -#line 315 "H5LTparse.y" +#line 316 "H5LTparse.y" {(yyval.ival) = H5T_CSET_ASCII_TOKEN;} break; case 85: /* Line 1807 of yacc.c */ -#line 316 "H5LTparse.y" +#line 317 "H5LTparse.y" {(yyval.ival) = H5T_CSET_UTF8_TOKEN;} break; case 86: /* Line 1807 of yacc.c */ -#line 318 "H5LTparse.y" - {(yyval.ival) = H5T_C_S1_TOKEN;} +#line 319 "H5LTparse.y" + {(yyval.hid) = H5T_C_S1_TOKEN;} break; case 87: /* Line 1807 of yacc.c */ -#line 319 "H5LTparse.y" - {(yyval.ival) = H5T_FORTRAN_S1_TOKEN;} +#line 320 "H5LTparse.y" + {(yyval.hid) = H5T_FORTRAN_S1_TOKEN;} break; case 88: /* Line 1807 of yacc.c */ -#line 323 "H5LTparse.y" - { is_enum = 1; enum_id = H5Tenum_create((yyvsp[(3) - (4)].ival)); H5Tclose((yyvsp[(3) - (4)].ival)); } +#line 324 "H5LTparse.y" + { is_enum = 1; enum_id = H5Tenum_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); } break; case 89: /* Line 1807 of yacc.c */ -#line 325 "H5LTparse.y" - { is_enum = 0; /*reset*/ (yyval.ival) = enum_id; } +#line 326 "H5LTparse.y" + { is_enum = 0; /*reset*/ (yyval.hid) = enum_id; } break; case 92: /* Line 1807 of yacc.c */ -#line 330 "H5LTparse.y" +#line 331 "H5LTparse.y" { is_enum_memb = 1; /*indicate member of enum*/ #ifdef H5_HAVE_WIN32_API @@ -2139,7 +2141,7 @@ yyreduce: case 93: /* Line 1807 of yacc.c */ -#line 339 "H5LTparse.y" +#line 340 "H5LTparse.y" { char char_val=(char)yylval.ival; short short_val=(short)yylval.ival; @@ -2186,7 +2188,7 @@ yyreduce: /* Line 1807 of yacc.c */ -#line 2190 "H5LTparse.c" +#line 2192 "H5LTparse.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires |