diff options
| -rw-r--r-- | MANIFEST | 6 | ||||
| -rw-r--r-- | hl/src/H5LT.c | 4 | ||||
| -rw-r--r-- | hl/src/H5LTanalyze.c (renamed from hl/src/lex.yy.c) | 859 | ||||
| -rw-r--r-- | hl/src/H5LTanalyze.l | 22 | ||||
| -rw-r--r-- | hl/src/H5LTparse.c (renamed from hl/src/y.tab.c) | 343 | ||||
| -rw-r--r-- | hl/src/H5LTparse.h (renamed from hl/src/y.tab.h) | 19 | ||||
| -rw-r--r-- | hl/src/H5LTparse.y | 26 | ||||
| -rw-r--r-- | hl/src/Makefile.am | 6 | ||||
| -rw-r--r-- | hl/src/Makefile.in | 12 | ||||
| -rw-r--r-- | hl/test/test_lite.c | 11 |
10 files changed, 619 insertions, 689 deletions
@@ -1285,10 +1285,10 @@ ./hl/src/H5HL_private.c ./hl/src/H5HL_private.h ./hl/src/H5LTanalyze.l +./hl/src/H5LTanalyze.c ./hl/src/H5LTparse.y -./hl/src/lex.yy.c -./hl/src/y.tab.c -./hl/src/y.tab.h +./hl/src/H5LTparse.c +./hl/src/H5LTparse.h ./hl/test/Makefile.am ./hl/test/Makefile.in ./hl/test/test_image.c diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index c3f0870..10ce1c5 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -2479,10 +2479,6 @@ next: sprintf(tmp_str, "OPQ_SIZE %d;\n", H5Tget_size(dtype)); strcat(*dt_str, tmp_str); - indentation(indent + COL, *dt_str); - sprintf(tmp_str, "OPQ_TAG \"%s\";\n", H5Tget_tag(dtype)); - strcat(*dt_str, tmp_str); - /* Print closing */ indent -= COL; indentation(indent + COL, *dt_str); diff --git a/hl/src/lex.yy.c b/hl/src/H5LTanalyze.c index 74213dd..3f58e00 100644 --- a/hl/src/lex.yy.c +++ b/hl/src/H5LTanalyze.c @@ -12,6 +12,13 @@ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* + * This file was generated by Lex with the command "lex -oH5LTanalyze.c H5LTanalyze.l". + * Do NOT modify it by hand, but in line 33, "#ifndef WIN32" should be added because + * Windows doesn't have unistd.h header file. + */ + +#line 2 "H5LTanalyze.c" /* A lexical scanner generated by flex */ /* Scanner skeleton version: @@ -299,60 +306,59 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 64 -#define YY_END_OF_BUFFER 65 -static yyconst short int yy_acclist[426] = +#define YY_NUM_RULES 63 +#define YY_END_OF_BUFFER 64 +static yyconst short int yy_acclist[421] = { 0, - 62, 62, 62, 62, 65, 64, 62, 64, 62, 63, - 64, 55, 64, 54, 64, 61, 64, 64, 64, 64, - 64, 59, 64, 60, 64, 57, 64, 58, 64, 56, - 64, 56, 62, 64, 56, 62, 63, 64, 54, 56, - 64, 56, 61, 64, 56, 64, 56, 64, 56, 64, - 56, 64, 56, 59, 64, 56, 60, 64, 56, 57, - 64, 56, 58, 64, 62, 54, 56, 56, 62, 54, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 38, 38, 56, 56, 56, 56, 56, 56, 39, - 39, 56, 56, 56, 56, 56, 56, 56, 56, 56, - - 56, 56, 56, 56, 56, 37, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 37, 56, 56, 53, 36, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 53, - 56, 36, 56, 44, 48, 50, 52, 56, 56, 56, - 44, 56, 48, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 50, 56, 52, 56, 49, 49, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 51, 35, 56, 56, 56, 56, 56, 51, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 35, 56, - - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 47, 1, 2, 9, 10, 46, 47, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 1, 56, 2, - 56, 56, 56, 56, 56, 56, 56, 9, 56, 10, - 56, 56, 56, 46, 56, 3, 4, 5, 6, 7, - 8, 11, 12, 13, 14, 15, 16, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 3, 56, 4, 56, - - 5, 56, 6, 56, 7, 56, 8, 56, 11, 56, - 12, 56, 13, 56, 14, 56, 15, 56, 16, 56, - 56, 56, 56, 43, 45, 28, 29, 30, 31, 22, - 43, 56, 45, 56, 28, 56, 29, 56, 30, 56, - 31, 56, 56, 56, 56, 22, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 17, 24, 23, 41, 17, 56, 56, 56, 56, 56, - 24, 56, 56, 56, 56, 23, 56, 56, 56, 56, - 41, 56, 56, 56, 32, 26, 18, 20, 19, 25, - 40, 42, 56, 32, 56, 56, 26, 56, 18, 56, - - 20, 56, 19, 56, 56, 25, 56, 56, 40, 56, - 42, 56, 33, 27, 21, 33, 56, 56, 27, 56, - 21, 56, 34, 34, 56 + 61, 61, 61, 61, 64, 63, 61, 63, 61, 62, + 63, 54, 63, 53, 63, 60, 63, 63, 63, 63, + 63, 58, 63, 59, 63, 56, 63, 57, 63, 55, + 63, 55, 61, 63, 55, 61, 62, 63, 53, 55, + 63, 55, 60, 63, 55, 63, 55, 63, 55, 63, + 55, 63, 55, 58, 63, 55, 59, 63, 55, 56, + 63, 55, 57, 63, 61, 53, 55, 55, 61, 53, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 38, 38, 55, 55, 55, 55, 55, 55, 39, + 39, 55, 55, 55, 55, 55, 55, 55, 55, 55, + + 55, 55, 55, 55, 37, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 37, 55, + 55, 36, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 36, 55, 44, 48, + 50, 52, 55, 55, 55, 44, 55, 48, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 50, 55, 52, + 55, 49, 49, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 51, 35, 55, 55, + 55, 55, 55, 51, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 35, 55, 55, 55, 55, 55, 55, + + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 47, 1, 2, + 9, 10, 46, 47, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 1, 55, 2, 55, 55, 55, 55, 55, + 55, 55, 9, 55, 10, 55, 55, 55, 46, 55, + 3, 4, 5, 6, 7, 8, 11, 12, 13, 14, + 15, 16, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 3, 55, 4, 55, 5, 55, 6, 55, 7, + + 55, 8, 55, 11, 55, 12, 55, 13, 55, 14, + 55, 15, 55, 16, 55, 55, 55, 55, 43, 45, + 28, 29, 30, 31, 22, 43, 55, 45, 55, 28, + 55, 29, 55, 30, 55, 31, 55, 55, 55, 55, + 22, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 55, 55, 55, 17, 24, 23, 41, 17, + 55, 55, 55, 55, 55, 24, 55, 55, 55, 55, + 23, 55, 55, 55, 55, 41, 55, 55, 55, 32, + 26, 18, 20, 19, 25, 40, 42, 55, 32, 55, + 55, 26, 55, 18, 55, 20, 55, 19, 55, 55, + + 25, 55, 55, 40, 55, 42, 55, 33, 27, 21, + 33, 55, 55, 27, 55, 21, 55, 34, 34, 55 } ; -static yyconst short int yy_accept[536] = +static yyconst short int yy_accept[530] = { 0, 1, 2, 3, 4, 5, 6, 7, 9, 12, 14, 16, 18, 19, 20, 21, 22, 24, 26, 28, 30, @@ -362,57 +368,56 @@ static yyconst short int yy_accept[536] = 77, 77, 77, 78, 79, 80, 81, 82, 83, 83, 83, 83, 83, 83, 85, 86, 87, 88, 89, 90, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, - 91, 91, 91, 91, 93, 94, 95, 96, 97, 98, - 99, 100, 101, 102, 103, 104, 105, 106, 106, 106, - - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 107, 107, 108, 109, 110, 111, 112, 113, - 114, 115, 116, 117, 118, 119, 120, 121, 123, 124, - 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, - 124, 124, 124, 124, 125, 126, 127, 128, 129, 130, - 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, - 142, 144, 144, 144, 144, 145, 146, 146, 146, 146, - 146, 146, 146, 146, 146, 147, 148, 149, 150, 151, - 153, 155, 156, 157, 158, 159, 160, 161, 162, 163, - 165, 167, 168, 168, 168, 168, 168, 168, 168, 168, - - 168, 168, 168, 168, 168, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 182, 182, - 182, 182, 182, 183, 183, 183, 183, 183, 183, 183, - 183, 183, 184, 184, 184, 184, 185, 186, 187, 188, - 189, 191, 192, 193, 194, 195, 196, 197, 198, 199, - 201, 202, 203, 204, 204, 204, 204, 204, 204, 204, - 204, 204, 204, 204, 204, 204, 204, 204, 204, 204, - 204, 204, 204, 205, 206, 207, 208, 209, 210, 211, - 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, - 222, 223, 224, 224, 224, 224, 224, 224, 224, 224, - - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 225, 226, 226, 226, 226, 226, 226, 226, 227, 228, - 228, 228, 229, 231, 232, 233, 234, 235, 236, 237, - 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, - 248, 250, 252, 253, 254, 255, 256, 257, 258, 260, - 262, 263, 264, 266, 266, 266, 266, 266, 266, 266, - 266, 266, 266, 266, 266, 266, 266, 266, 266, 266, - 266, 266, 266, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 277, 278, 278, 278, 278, 279, 280, - 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, - - 291, 292, 293, 294, 295, 296, 297, 299, 301, 303, - 305, 307, 309, 311, 313, 315, 317, 319, 321, 322, - 323, 324, 325, 326, 327, 328, 329, 330, 330, 330, - 330, 331, 331, 331, 331, 331, 331, 331, 331, 331, - 331, 331, 331, 331, 331, 333, 335, 337, 339, 341, - 343, 344, 345, 346, 348, 349, 350, 351, 352, 353, - 354, 355, 356, 357, 358, 359, 360, 361, 362, 362, - 362, 362, 362, 363, 363, 363, 363, 364, 364, 364, - 364, 365, 365, 365, 367, 368, 369, 370, 371, 373, - 374, 375, 376, 378, 379, 380, 381, 383, 384, 385, - - 385, 386, 386, 387, 388, 389, 390, 390, 391, 391, - 392, 393, 394, 396, 397, 399, 401, 403, 405, 406, - 408, 409, 411, 413, 414, 414, 415, 416, 418, 419, - 421, 423, 424, 426, 426 + 91, 91, 91, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 105, 105, 105, 105, + + 105, 105, 105, 105, 105, 105, 105, 105, 105, 106, + 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 121, 122, 122, 122, 122, 122, + 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 139, 139, 139, 139, 140, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 142, + 143, 144, 145, 146, 148, 150, 151, 152, 153, 154, + 155, 156, 157, 158, 160, 162, 163, 163, 163, 163, + 163, 163, 163, 163, 163, 163, 163, 163, 163, 165, + + 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, + 176, 177, 177, 177, 177, 177, 177, 178, 178, 178, + 178, 178, 178, 178, 178, 178, 179, 179, 179, 179, + 180, 181, 182, 183, 184, 186, 187, 188, 189, 190, + 191, 192, 193, 194, 196, 197, 198, 199, 199, 199, + 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, + 199, 199, 199, 199, 199, 199, 199, 200, 201, 202, + 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, + 213, 214, 215, 216, 217, 218, 219, 219, 219, 219, + 219, 219, 219, 219, 219, 219, 219, 219, 219, 219, + + 219, 219, 219, 219, 220, 221, 221, 221, 221, 221, + 221, 221, 222, 223, 223, 223, 224, 226, 227, 228, + 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, + 239, 240, 241, 242, 243, 245, 247, 248, 249, 250, + 251, 252, 253, 255, 257, 258, 259, 261, 261, 261, + 261, 261, 261, 261, 261, 261, 261, 261, 261, 261, + 261, 261, 261, 261, 261, 261, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 273, + 273, 273, 274, 275, 276, 277, 278, 279, 280, 281, + 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, + + 292, 294, 296, 298, 300, 302, 304, 306, 308, 310, + 312, 314, 316, 317, 318, 319, 320, 321, 322, 323, + 324, 325, 325, 325, 325, 326, 326, 326, 326, 326, + 326, 326, 326, 326, 326, 326, 326, 326, 326, 328, + 330, 332, 334, 336, 338, 339, 340, 341, 343, 344, + 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, + 355, 356, 357, 357, 357, 357, 357, 358, 358, 358, + 358, 359, 359, 359, 359, 360, 360, 360, 362, 363, + 364, 365, 366, 368, 369, 370, 371, 373, 374, 375, + 376, 378, 379, 380, 380, 381, 381, 382, 383, 384, + + 385, 385, 386, 386, 387, 388, 389, 391, 392, 394, + 396, 398, 400, 401, 403, 404, 406, 408, 409, 409, + 410, 411, 413, 414, 416, 418, 419, 421, 421 } ; static yyconst int yy_ec[256] = @@ -455,133 +460,131 @@ static yyconst int yy_meta[41] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst short int yy_base[537] = +static yyconst short int yy_base[531] = { 0, - 0, 0, 40, 0, 600, 601, 79, 81, 601, 0, - 601, 55, 589, 571, 566, 601, 601, 601, 601, 0, - 85, 87, 86, 0, 69, 586, 568, 563, 0, 0, - 0, 0, 99, 0, 575, 558, 560, 562, 560, 0, - 101, 0, 570, 553, 555, 557, 555, 552, 555, 543, - 542, 78, 548, 551, 539, 538, 79, 601, 557, 96, - 86, 560, 551, 0, 554, 116, 89, 557, 548, 601, - 540, 98, 543, 541, 548, 551, 537, 532, 117, 540, - 547, 543, 524, 0, 529, 107, 532, 530, 537, 540, - 526, 521, 125, 529, 536, 532, 513, 518, 522, 527, - - 514, 511, 513, 523, 509, 525, 94, 509, 519, 501, - 515, 601, 516, 504, 508, 513, 500, 497, 499, 509, - 495, 511, 96, 495, 505, 487, 501, 0, 502, 505, - 491, 486, 510, 491, 483, 495, 490, 483, 472, 105, - 487, 483, 489, 601, 601, 492, 478, 473, 497, 478, - 470, 482, 477, 470, 459, 122, 474, 470, 476, 0, - 0, 459, 466, 453, 601, 601, 461, 451, 455, 455, - 125, 461, 125, 471, 601, 601, 450, 457, 444, 0, - 0, 452, 442, 446, 446, 129, 452, 128, 462, 0, - 0, 601, 443, 460, 459, 453, 453, 452, 156, 163, - - 449, 436, 440, 451, 0, 433, 450, 449, 443, 443, - 442, 170, 177, 439, 426, 430, 441, 430, 424, 428, - 148, 414, 601, 440, 443, 440, 150, 437, 440, 437, - 157, 601, 422, 430, 420, 417, 411, 415, 155, 401, - 0, 427, 430, 427, 164, 424, 427, 424, 169, 0, - 409, 417, 407, 412, 412, 389, 419, 416, 177, 175, - 180, 182, 406, 405, 187, 189, 191, 404, 403, 397, - 403, 400, 400, 400, 377, 407, 404, 199, 196, 202, - 205, 394, 393, 209, 211, 212, 392, 391, 385, 391, - 388, 601, 383, 374, 215, 218, 382, 376, 378, 375, - - 219, 170, 221, 381, 380, 379, 378, 377, 376, 601, - 601, 375, 374, 373, 372, 371, 370, 601, 601, 219, - 369, 601, 0, 364, 355, 224, 225, 363, 357, 359, - 356, 232, 192, 237, 362, 361, 360, 359, 358, 357, - 0, 0, 356, 355, 354, 353, 352, 351, 0, 0, - 225, 350, 0, 345, 360, 347, 346, 345, 344, 347, - 328, 333, 327, 331, 330, 330, 333, 327, 331, 326, - 231, 329, 601, 601, 601, 601, 601, 601, 601, 601, - 601, 601, 601, 601, 335, 330, 320, 324, 339, 326, - 325, 324, 323, 326, 307, 312, 306, 310, 309, 309, - - 312, 306, 310, 305, 238, 308, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 314, 309, - 299, 601, 601, 601, 601, 601, 601, 296, 309, 309, - 601, 290, 296, 300, 305, 289, 303, 285, 289, 289, - 287, 295, 282, 296, 0, 0, 0, 0, 0, 0, - 280, 293, 293, 0, 274, 280, 284, 289, 273, 287, - 269, 273, 273, 271, 279, 266, 280, 601, 270, 261, - 276, 270, 601, 260, 257, 258, 601, 261, 265, 255, - 601, 259, 265, 0, 258, 249, 264, 258, 0, 248, - 245, 246, 0, 249, 253, 243, 0, 247, 252, 248, - - 601, 242, 601, 601, 601, 601, 243, 601, 231, 601, - 601, 205, 0, 178, 0, 0, 0, 0, 157, 0, - 139, 0, 0, 601, 136, 601, 601, 0, 134, 0, - 0, 601, 0, 601, 104, 267 + 0, 0, 40, 0, 594, 595, 79, 81, 595, 0, + 595, 55, 583, 565, 560, 595, 595, 595, 595, 0, + 85, 87, 86, 0, 69, 580, 562, 557, 0, 0, + 0, 0, 99, 0, 569, 552, 554, 556, 554, 0, + 101, 0, 564, 547, 549, 551, 549, 546, 549, 537, + 536, 78, 542, 545, 533, 532, 79, 595, 551, 96, + 538, 553, 544, 0, 547, 116, 534, 549, 540, 595, + 532, 81, 535, 533, 540, 543, 529, 524, 102, 532, + 536, 517, 0, 522, 98, 525, 523, 530, 533, 519, + 514, 117, 522, 526, 507, 512, 516, 521, 508, 505, + + 507, 517, 503, 519, 110, 503, 513, 495, 595, 511, + 499, 503, 508, 495, 492, 494, 504, 490, 506, 116, + 490, 500, 482, 0, 498, 501, 487, 482, 506, 487, + 479, 491, 486, 479, 468, 115, 483, 479, 485, 595, + 488, 474, 469, 493, 474, 466, 478, 473, 466, 455, + 121, 470, 466, 472, 0, 455, 462, 449, 595, 595, + 457, 447, 451, 451, 91, 457, 122, 467, 595, 595, + 446, 453, 440, 0, 0, 448, 438, 442, 442, 122, + 448, 125, 458, 0, 0, 595, 439, 456, 455, 449, + 449, 448, 150, 157, 445, 432, 436, 447, 0, 429, + + 446, 445, 439, 439, 438, 164, 171, 435, 422, 426, + 437, 426, 420, 424, 109, 410, 595, 436, 439, 436, + 151, 433, 436, 433, 158, 595, 418, 426, 416, 413, + 407, 411, 140, 397, 0, 423, 426, 423, 163, 420, + 423, 420, 165, 0, 405, 413, 403, 408, 408, 385, + 415, 412, 173, 170, 176, 179, 402, 401, 183, 185, + 186, 400, 399, 393, 399, 396, 396, 396, 373, 403, + 400, 194, 189, 192, 199, 390, 389, 204, 205, 206, + 388, 387, 381, 387, 384, 595, 379, 370, 208, 210, + 378, 372, 374, 371, 213, 216, 218, 377, 376, 375, + + 374, 373, 372, 595, 595, 371, 370, 369, 368, 367, + 366, 595, 595, 133, 365, 595, 0, 360, 351, 220, + 223, 359, 353, 355, 352, 227, 226, 229, 358, 357, + 356, 355, 354, 353, 0, 0, 352, 351, 350, 349, + 348, 347, 0, 0, 140, 346, 0, 341, 356, 343, + 342, 341, 340, 343, 324, 329, 323, 327, 326, 326, + 329, 323, 327, 322, 161, 325, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 331, 326, + 316, 320, 335, 322, 321, 320, 319, 322, 303, 308, + 302, 306, 305, 305, 308, 302, 306, 301, 231, 304, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 310, 305, 295, 595, 595, 595, 595, 595, + 595, 292, 305, 305, 595, 286, 292, 296, 301, 285, + 299, 281, 285, 285, 283, 291, 278, 292, 0, 0, + 0, 0, 0, 0, 276, 289, 289, 0, 270, 276, + 280, 285, 269, 283, 265, 269, 269, 267, 275, 262, + 276, 595, 266, 257, 272, 266, 595, 256, 253, 254, + 595, 257, 261, 251, 595, 255, 261, 0, 254, 245, + 260, 254, 0, 244, 241, 242, 0, 245, 249, 239, + 0, 243, 249, 247, 595, 241, 595, 595, 595, 595, + + 243, 595, 230, 595, 595, 240, 0, 233, 0, 0, + 0, 0, 235, 0, 218, 0, 0, 595, 200, 595, + 595, 0, 179, 0, 0, 595, 0, 595, 154, 259 } ; -static yyconst short int yy_def[537] = +static yyconst short int yy_def[531] = { 0, - 534, 1, 534, 3, 534, 534, 534, 534, 534, 535, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 534, 535, 534, 534, 534, 534, 534, 536, - 536, 23, 536, 536, 536, 536, 536, 534, 534, 534, - 534, 534, 536, 536, 536, 536, 536, 534, 534, 534, - 534, 534, 534, 536, 536, 536, 536, 536, 536, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 534, 534, 534, - - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 534, 534, 534, 534, 534, 534, 534, 534, 534, - - 534, 534, 534, 534, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 534, 534, 534, 534, 534, 534, 534, 534, 534, - - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 536, 536, 536, 536, 536, 536, 534, - - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 536, 536, 536, 536, 536, 536, 536, 536, 536, - 536, 536, 536, 534, 534, 534, 534, 536, 536, 536, - 536, 534, 536, 0, 534, 534 + 528, 1, 528, 3, 528, 528, 528, 528, 528, 529, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 530, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 528, 529, 528, 528, 528, 528, 528, 530, + 530, 23, 530, 530, 530, 530, 530, 528, 528, 528, + 528, 528, 530, 530, 530, 530, 530, 528, 528, 528, + 528, 528, 528, 530, 530, 530, 530, 530, 530, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 528, 528, 528, 528, 528, + + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 530, 530, + + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 530, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 530, 530, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 530, 530, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 530, 530, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 530, 530, 530, + 530, 530, 530, 530, 530, 530, 530, 530, 530, 530, + 530, 530, 530, 528, 528, 528, 528, 528, 528, 528, + + 528, 528, 528, 528, 528, 530, 530, 530, 530, 530, + 530, 530, 530, 530, 530, 530, 530, 528, 528, 528, + 528, 530, 530, 530, 530, 528, 530, 0, 528, 528 } ; -static yyconst short int yy_nxt[642] = +static yyconst short int yy_nxt[636] = { 0, 6, 7, 8, 9, 10, 10, 10, 10, 10, 10, 10, 10, 11, 6, 6, 12, 6, 6, 6, 6, @@ -594,69 +597,68 @@ static yyconst short int yy_nxt[642] = 33, 33, 33, 33, 35, 36, 41, 41, 41, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 44, - 33, 33, 41, 41, 62, 68, 34, 63, 69, 71, - 139, 72, 155, 73, 74, 80, 81, 75, 94, 95, - 76, 77, 140, 99, 156, 78, 172, 100, 79, 85, - 108, 86, 115, 87, 88, 101, 116, 89, 124, 109, - 90, 91, 173, 187, 117, 92, 199, 125, 93, 202, - 212, 533, 215, 532, 203, 257, 200, 216, 258, 188, - 213, 224, 276, 225, 263, 277, 226, 227, 228, 531, - 229, 268, 264, 230, 231, 242, 530, 243, 282, 269, - 244, 245, 246, 287, 247, 367, 283, 248, 249, 304, - 368, 288, 297, 298, 306, 299, 308, 305, 300, 301, - - 529, 312, 307, 314, 309, 316, 302, 401, 303, 313, - 335, 315, 402, 317, 328, 329, 337, 330, 336, 339, - 331, 332, 528, 343, 338, 345, 347, 340, 333, 356, - 334, 344, 358, 346, 348, 364, 369, 357, 390, 392, - 359, 365, 370, 371, 366, 385, 391, 393, 398, 386, - 372, 419, 403, 439, 399, 420, 440, 400, 404, 405, - 462, 527, 526, 463, 525, 524, 406, 40, 523, 40, - 522, 521, 520, 519, 518, 517, 516, 515, 514, 513, + 33, 33, 41, 41, 62, 68, 97, 63, 69, 71, + 98, 72, 193, 73, 74, 106, 251, 75, 99, 252, + 76, 77, 194, 112, 107, 78, 135, 113, 79, 84, + 121, 85, 150, 86, 87, 114, 166, 88, 136, 122, + 89, 90, 181, 206, 151, 91, 196, 270, 92, 209, + 271, 197, 167, 207, 210, 218, 34, 219, 182, 379, + 220, 221, 222, 380, 223, 257, 413, 224, 225, 236, + 414, 237, 262, 258, 238, 239, 240, 276, 241, 281, + 263, 242, 243, 433, 298, 277, 434, 282, 291, 292, + 300, 293, 299, 302, 294, 295, 527, 306, 301, 308, + + 310, 303, 296, 329, 297, 307, 331, 309, 311, 322, + 323, 330, 324, 333, 332, 325, 326, 526, 337, 339, + 341, 334, 350, 327, 352, 328, 338, 340, 342, 358, + 351, 361, 353, 363, 384, 359, 362, 386, 360, 364, + 365, 395, 385, 392, 397, 387, 396, 366, 525, 393, + 398, 399, 394, 456, 524, 523, 457, 522, 400, 40, + 521, 40, 520, 519, 518, 517, 516, 515, 514, 513, 512, 511, 510, 509, 508, 507, 506, 505, 504, 503, 502, 501, 500, 499, 498, 497, 496, 495, 494, 493, - 492, 491, 490, 489, 488, 487, 486, 485, 484, 483, + 482, 481, 480, 479, 478, 477, 476, 475, 474, 473, - 472, 471, 470, 469, 468, 467, 466, 465, 464, 461, - 460, 459, 458, 457, 456, 455, 454, 453, 452, 451, + 472, 471, 470, 469, 468, 467, 466, 465, 464, 463, + 462, 461, 460, 459, 458, 455, 454, 453, 452, 451, 450, 449, 448, 447, 446, 445, 444, 443, 442, 441, - 438, 437, 436, 435, 434, 433, 432, 431, 430, 429, - 428, 427, 426, 425, 424, 423, 422, 421, 418, 417, - 416, 415, 414, 413, 412, 411, 410, 409, 408, 407, - 397, 396, 395, 394, 389, 388, 387, 384, 383, 382, - 381, 380, 379, 378, 377, 376, 375, 374, 373, 363, - - 362, 361, 360, 355, 354, 353, 352, 351, 350, 349, - 342, 341, 327, 326, 325, 324, 323, 322, 321, 320, - 319, 318, 311, 310, 296, 295, 294, 293, 292, 291, - 290, 289, 286, 285, 284, 281, 280, 279, 278, 275, - 274, 273, 272, 271, 270, 267, 266, 265, 262, 261, - 260, 259, 256, 255, 254, 253, 252, 251, 250, 241, - 240, 239, 238, 237, 236, 235, 234, 233, 232, 223, - 222, 221, 220, 219, 218, 217, 214, 211, 210, 209, - 208, 207, 206, 205, 204, 201, 198, 197, 196, 195, - 194, 193, 192, 191, 190, 189, 186, 185, 184, 183, - - 182, 181, 180, 179, 178, 177, 176, 175, 174, 171, - 170, 169, 168, 167, 166, 165, 164, 163, 162, 161, - 160, 159, 158, 157, 154, 153, 152, 151, 150, 149, - 148, 147, 146, 145, 144, 143, 142, 141, 138, 137, - 136, 135, 134, 133, 132, 131, 130, 129, 128, 127, - 126, 123, 122, 121, 120, 119, 118, 114, 113, 112, - 111, 110, 107, 106, 105, 104, 103, 102, 98, 97, - 96, 84, 83, 82, 70, 67, 66, 65, 64, 61, - 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, - 50, 49, 48, 47, 46, 45, 39, 38, 37, 534, - - 5, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534 + 440, 439, 438, 437, 436, 435, 432, 431, 430, 429, + 428, 427, 426, 425, 424, 423, 422, 421, 420, 419, + 418, 417, 416, 415, 412, 411, 410, 409, 408, 407, + 406, 405, 404, 403, 402, 401, 391, 390, 389, 388, + 383, 382, 381, 378, 377, 376, 375, 374, 373, 372, + 371, 370, 369, 368, 367, 357, 356, 355, 354, 349, + + 348, 347, 346, 345, 344, 343, 336, 335, 321, 320, + 319, 318, 317, 316, 315, 314, 313, 312, 305, 304, + 290, 289, 288, 287, 286, 285, 284, 283, 280, 279, + 278, 275, 274, 273, 272, 269, 268, 267, 266, 265, + 264, 261, 260, 259, 256, 255, 254, 253, 250, 249, + 248, 247, 246, 245, 244, 235, 234, 233, 232, 231, + 230, 229, 228, 227, 226, 217, 216, 215, 214, 213, + 212, 211, 208, 205, 204, 203, 202, 201, 200, 199, + 198, 195, 192, 191, 190, 189, 188, 187, 186, 185, + 184, 183, 180, 179, 178, 177, 176, 175, 174, 173, + + 172, 171, 170, 169, 168, 165, 164, 163, 162, 161, + 160, 159, 158, 157, 156, 155, 154, 153, 152, 149, + 148, 147, 146, 145, 144, 143, 142, 141, 140, 139, + 138, 137, 134, 133, 132, 131, 130, 129, 128, 127, + 126, 125, 124, 123, 120, 119, 118, 117, 116, 115, + 111, 110, 109, 108, 105, 104, 103, 102, 101, 100, + 96, 95, 94, 93, 83, 82, 81, 80, 70, 67, + 66, 65, 64, 61, 60, 59, 58, 57, 56, 55, + 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, + 39, 38, 37, 528, 5, 528, 528, 528, 528, 528, + + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528 } ; -static yyconst short int yy_chk[642] = +static yyconst short int yy_chk[636] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -669,66 +671,65 @@ static yyconst short int yy_chk[642] = 7, 7, 8, 8, 12, 12, 21, 21, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 25, 25, - 33, 33, 41, 41, 52, 57, 535, 52, 57, 60, - 107, 60, 123, 60, 60, 61, 61, 60, 67, 67, - 60, 60, 107, 72, 123, 60, 140, 72, 60, 66, - 79, 66, 86, 66, 66, 72, 86, 66, 93, 79, - 66, 66, 140, 156, 86, 66, 171, 93, 66, 173, - 186, 529, 188, 525, 173, 221, 171, 188, 221, 156, - 186, 199, 239, 199, 227, 239, 199, 199, 200, 521, - 200, 231, 227, 200, 200, 212, 519, 212, 245, 231, - 212, 212, 213, 249, 213, 302, 245, 213, 213, 260, - 302, 249, 259, 259, 261, 259, 262, 260, 259, 259, - - 514, 265, 261, 266, 262, 267, 259, 333, 259, 265, - 279, 266, 333, 267, 278, 278, 280, 278, 279, 281, - 278, 278, 512, 284, 280, 285, 286, 281, 278, 295, - 278, 284, 296, 285, 286, 301, 303, 295, 326, 327, - 296, 301, 303, 303, 301, 320, 326, 327, 332, 320, - 303, 351, 334, 371, 332, 351, 371, 332, 334, 334, - 405, 509, 507, 405, 502, 500, 334, 536, 499, 536, - 498, 496, 495, 494, 492, 491, 490, 488, 487, 486, - 485, 483, 482, 480, 479, 478, 476, 475, 474, 472, - 471, 470, 469, 467, 466, 465, 464, 463, 462, 461, - - 460, 459, 458, 457, 456, 455, 453, 452, 451, 444, - 443, 442, 441, 440, 439, 438, 437, 436, 435, 434, - 433, 432, 430, 429, 428, 421, 420, 419, 406, 404, - 403, 402, 401, 400, 399, 398, 397, 396, 395, 394, - 393, 392, 391, 390, 389, 388, 387, 386, 385, 372, - 370, 369, 368, 367, 366, 365, 364, 363, 362, 361, - 360, 359, 358, 357, 356, 355, 354, 352, 348, 347, - 346, 345, 344, 343, 340, 339, 338, 337, 336, 335, - 331, 330, 329, 328, 325, 324, 321, 317, 316, 315, - 314, 313, 312, 309, 308, 307, 306, 305, 304, 300, - - 299, 298, 297, 294, 293, 291, 290, 289, 288, 287, - 283, 282, 277, 276, 275, 274, 273, 272, 271, 270, - 269, 268, 264, 263, 258, 257, 256, 255, 254, 253, - 252, 251, 248, 247, 246, 244, 243, 242, 240, 238, - 237, 236, 235, 234, 233, 230, 229, 228, 226, 225, - 224, 222, 220, 219, 218, 217, 216, 215, 214, 211, - 210, 209, 208, 207, 206, 204, 203, 202, 201, 198, - 197, 196, 195, 194, 193, 189, 187, 185, 184, 183, - 182, 179, 178, 177, 174, 172, 170, 169, 168, 167, - 164, 163, 162, 159, 158, 157, 155, 154, 153, 152, - - 151, 150, 149, 148, 147, 146, 143, 142, 141, 139, - 138, 137, 136, 135, 134, 133, 132, 131, 130, 129, - 127, 126, 125, 124, 122, 121, 120, 119, 118, 117, - 116, 115, 114, 113, 111, 110, 109, 108, 106, 105, - 104, 103, 102, 101, 100, 99, 98, 97, 96, 95, - 94, 92, 91, 90, 89, 88, 87, 85, 83, 82, - 81, 80, 78, 77, 76, 75, 74, 73, 71, 69, - 68, 65, 63, 62, 59, 56, 55, 54, 53, 51, - 50, 49, 48, 47, 46, 45, 44, 43, 39, 38, - 37, 36, 35, 28, 27, 26, 15, 14, 13, 5, - - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534 + 33, 33, 41, 41, 52, 57, 72, 52, 57, 60, + 72, 60, 165, 60, 60, 79, 215, 60, 72, 215, + 60, 60, 165, 85, 79, 60, 105, 85, 60, 66, + 92, 66, 120, 66, 66, 85, 136, 66, 105, 92, + 66, 66, 151, 180, 120, 66, 167, 233, 66, 182, + 233, 167, 136, 180, 182, 193, 529, 193, 151, 314, + 193, 193, 194, 314, 194, 221, 345, 194, 194, 206, + 345, 206, 225, 221, 206, 206, 207, 239, 207, 243, + 225, 207, 207, 365, 254, 239, 365, 243, 253, 253, + 255, 253, 254, 256, 253, 253, 523, 259, 255, 260, + + 261, 256, 253, 273, 253, 259, 274, 260, 261, 272, + 272, 273, 272, 275, 274, 272, 272, 519, 278, 279, + 280, 275, 289, 272, 290, 272, 278, 279, 280, 295, + 289, 296, 290, 297, 320, 295, 296, 321, 295, 297, + 297, 327, 320, 326, 328, 321, 327, 297, 515, 326, + 328, 328, 326, 399, 513, 508, 399, 506, 328, 530, + 503, 530, 501, 496, 494, 493, 492, 490, 489, 488, + 486, 485, 484, 482, 481, 480, 479, 477, 476, 474, + 473, 472, 470, 469, 468, 466, 465, 464, 463, 461, + 460, 459, 458, 457, 456, 455, 454, 453, 452, 451, + + 450, 449, 447, 446, 445, 438, 437, 436, 435, 434, + 433, 432, 431, 430, 429, 428, 427, 426, 424, 423, + 422, 415, 414, 413, 400, 398, 397, 396, 395, 394, + 393, 392, 391, 390, 389, 388, 387, 386, 385, 384, + 383, 382, 381, 380, 379, 366, 364, 363, 362, 361, + 360, 359, 358, 357, 356, 355, 354, 353, 352, 351, + 350, 349, 348, 346, 342, 341, 340, 339, 338, 337, + 334, 333, 332, 331, 330, 329, 325, 324, 323, 322, + 319, 318, 315, 311, 310, 309, 308, 307, 306, 303, + 302, 301, 300, 299, 298, 294, 293, 292, 291, 288, + + 287, 285, 284, 283, 282, 281, 277, 276, 271, 270, + 269, 268, 267, 266, 265, 264, 263, 262, 258, 257, + 252, 251, 250, 249, 248, 247, 246, 245, 242, 241, + 240, 238, 237, 236, 234, 232, 231, 230, 229, 228, + 227, 224, 223, 222, 220, 219, 218, 216, 214, 213, + 212, 211, 210, 209, 208, 205, 204, 203, 202, 201, + 200, 198, 197, 196, 195, 192, 191, 190, 189, 188, + 187, 183, 181, 179, 178, 177, 176, 173, 172, 171, + 168, 166, 164, 163, 162, 161, 158, 157, 156, 154, + 153, 152, 150, 149, 148, 147, 146, 145, 144, 143, + + 142, 141, 139, 138, 137, 135, 134, 133, 132, 131, + 130, 129, 128, 127, 126, 125, 123, 122, 121, 119, + 118, 117, 116, 115, 114, 113, 112, 111, 110, 108, + 107, 106, 104, 103, 102, 101, 100, 99, 98, 97, + 96, 95, 94, 93, 91, 90, 89, 88, 87, 86, + 84, 82, 81, 80, 78, 77, 76, 75, 74, 73, + 71, 69, 68, 67, 65, 63, 62, 61, 59, 56, + 55, 54, 53, 51, 50, 49, 48, 47, 46, 45, + 44, 43, 39, 38, 37, 36, 35, 28, 27, 26, + 15, 14, 13, 5, 528, 528, 528, 528, 528, 528, + + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528, 528, 528, 528, 528, 528, + 528, 528, 528, 528, 528 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -747,11 +748,11 @@ goto find_rule; \ char *yytext; #line 1 "H5LTanalyze.l" #define INITIAL 0 -#line 3 "H5LTanalyze.l" +#line 2 "H5LTanalyze.l" #include <stdlib.h> #include <string.h> #include<hdf5.h> -#include "y.tab.h" +#include "H5LTparse.h" int my_yyinput(char *, int); #undef YY_INPUT @@ -790,7 +791,6 @@ extern hbool_t is_str_pad; /*variables for opaque type*/ extern hbool_t is_opq_size; -extern hbool_t is_opq_tag; hbool_t first_quote = 1; @@ -800,7 +800,7 @@ char *myinput;*/ #define TAG_STRING 1 -#line 789 "lex.yy.c" +#line 783 "H5LTanalyze.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -951,10 +951,10 @@ YY_DECL register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 57 "H5LTanalyze.l" +#line 55 "H5LTanalyze.l" -#line 943 "lex.yy.c" +#line 937 "H5LTanalyze.c" if ( yy_init ) { @@ -1002,14 +1002,14 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 535 ) + if ( yy_current_state >= 529 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; *yy_state_ptr++ = yy_current_state; ++yy_cp; } - while ( yy_base[yy_current_state] != 601 ); + while ( yy_base[yy_current_state] != 595 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -1040,272 +1040,267 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 59 "H5LTanalyze.l" +#line 57 "H5LTanalyze.l" {return token(H5T_STD_I8BE_TOKEN);} YY_BREAK case 2: YY_RULE_SETUP -#line 60 "H5LTanalyze.l" +#line 58 "H5LTanalyze.l" {return token(H5T_STD_I8LE_TOKEN);} YY_BREAK case 3: YY_RULE_SETUP -#line 61 "H5LTanalyze.l" +#line 59 "H5LTanalyze.l" {return token(H5T_STD_I16BE_TOKEN);} YY_BREAK case 4: YY_RULE_SETUP -#line 62 "H5LTanalyze.l" +#line 60 "H5LTanalyze.l" {return token(H5T_STD_I16LE_TOKEN);} YY_BREAK case 5: YY_RULE_SETUP -#line 63 "H5LTanalyze.l" +#line 61 "H5LTanalyze.l" {return token(H5T_STD_I32BE_TOKEN);} YY_BREAK case 6: YY_RULE_SETUP -#line 64 "H5LTanalyze.l" +#line 62 "H5LTanalyze.l" {return token(H5T_STD_I32LE_TOKEN);} YY_BREAK case 7: YY_RULE_SETUP -#line 65 "H5LTanalyze.l" +#line 63 "H5LTanalyze.l" {return token(H5T_STD_I64BE_TOKEN);} YY_BREAK case 8: YY_RULE_SETUP -#line 66 "H5LTanalyze.l" +#line 64 "H5LTanalyze.l" {return token(H5T_STD_I64LE_TOKEN);} YY_BREAK case 9: YY_RULE_SETUP -#line 68 "H5LTanalyze.l" +#line 66 "H5LTanalyze.l" {return token(H5T_STD_U8BE_TOKEN);} YY_BREAK case 10: YY_RULE_SETUP -#line 69 "H5LTanalyze.l" +#line 67 "H5LTanalyze.l" {return token(H5T_STD_U8LE_TOKEN);} YY_BREAK case 11: YY_RULE_SETUP -#line 70 "H5LTanalyze.l" +#line 68 "H5LTanalyze.l" {return token(H5T_STD_U16BE_TOKEN);} YY_BREAK case 12: YY_RULE_SETUP -#line 71 "H5LTanalyze.l" +#line 69 "H5LTanalyze.l" {return token(H5T_STD_U16LE_TOKEN);} YY_BREAK case 13: YY_RULE_SETUP -#line 72 "H5LTanalyze.l" +#line 70 "H5LTanalyze.l" {return token(H5T_STD_U32BE_TOKEN);} YY_BREAK case 14: YY_RULE_SETUP -#line 73 "H5LTanalyze.l" +#line 71 "H5LTanalyze.l" {return token(H5T_STD_U32LE_TOKEN);} YY_BREAK case 15: YY_RULE_SETUP -#line 74 "H5LTanalyze.l" +#line 72 "H5LTanalyze.l" {return token(H5T_STD_U64BE_TOKEN);} YY_BREAK case 16: YY_RULE_SETUP -#line 75 "H5LTanalyze.l" +#line 73 "H5LTanalyze.l" {return token(H5T_STD_U64LE_TOKEN);} YY_BREAK case 17: YY_RULE_SETUP -#line 77 "H5LTanalyze.l" +#line 75 "H5LTanalyze.l" {return token(H5T_NATIVE_CHAR_TOKEN);} YY_BREAK case 18: YY_RULE_SETUP -#line 78 "H5LTanalyze.l" +#line 76 "H5LTanalyze.l" {return token(H5T_NATIVE_SCHAR_TOKEN);} YY_BREAK case 19: YY_RULE_SETUP -#line 79 "H5LTanalyze.l" +#line 77 "H5LTanalyze.l" {return token(H5T_NATIVE_UCHAR_TOKEN);} YY_BREAK case 20: YY_RULE_SETUP -#line 80 "H5LTanalyze.l" +#line 78 "H5LTanalyze.l" {return token(H5T_NATIVE_SHORT_TOKEN);} YY_BREAK case 21: YY_RULE_SETUP -#line 81 "H5LTanalyze.l" +#line 79 "H5LTanalyze.l" {return token(H5T_NATIVE_USHORT_TOKEN);} YY_BREAK case 22: YY_RULE_SETUP -#line 82 "H5LTanalyze.l" +#line 80 "H5LTanalyze.l" {return token(H5T_NATIVE_INT_TOKEN);} YY_BREAK case 23: YY_RULE_SETUP -#line 83 "H5LTanalyze.l" +#line 81 "H5LTanalyze.l" {return token(H5T_NATIVE_UINT_TOKEN);} YY_BREAK case 24: YY_RULE_SETUP -#line 84 "H5LTanalyze.l" +#line 82 "H5LTanalyze.l" {return token(H5T_NATIVE_LONG_TOKEN);} YY_BREAK case 25: YY_RULE_SETUP -#line 85 "H5LTanalyze.l" +#line 83 "H5LTanalyze.l" {return token(H5T_NATIVE_ULONG_TOKEN);} YY_BREAK case 26: YY_RULE_SETUP -#line 86 "H5LTanalyze.l" +#line 84 "H5LTanalyze.l" {return token(H5T_NATIVE_LLONG_TOKEN);} YY_BREAK case 27: YY_RULE_SETUP -#line 87 "H5LTanalyze.l" +#line 85 "H5LTanalyze.l" {return token(H5T_NATIVE_ULLONG_TOKEN);} YY_BREAK case 28: YY_RULE_SETUP -#line 89 "H5LTanalyze.l" +#line 87 "H5LTanalyze.l" {return token(H5T_IEEE_F32BE_TOKEN);} YY_BREAK case 29: YY_RULE_SETUP -#line 90 "H5LTanalyze.l" +#line 88 "H5LTanalyze.l" {return token(H5T_IEEE_F32LE_TOKEN);} YY_BREAK case 30: YY_RULE_SETUP -#line 91 "H5LTanalyze.l" +#line 89 "H5LTanalyze.l" {return token(H5T_IEEE_F64BE_TOKEN);} YY_BREAK case 31: YY_RULE_SETUP -#line 92 "H5LTanalyze.l" +#line 90 "H5LTanalyze.l" {return token(H5T_IEEE_F64LE_TOKEN);} YY_BREAK case 32: YY_RULE_SETUP -#line 93 "H5LTanalyze.l" +#line 91 "H5LTanalyze.l" {return token(H5T_NATIVE_FLOAT_TOKEN);} YY_BREAK case 33: YY_RULE_SETUP -#line 94 "H5LTanalyze.l" +#line 92 "H5LTanalyze.l" {return token(H5T_NATIVE_DOUBLE_TOKEN);} YY_BREAK case 34: YY_RULE_SETUP -#line 95 "H5LTanalyze.l" +#line 93 "H5LTanalyze.l" {return token(H5T_NATIVE_LDOUBLE_TOKEN);} YY_BREAK case 35: YY_RULE_SETUP -#line 97 "H5LTanalyze.l" +#line 95 "H5LTanalyze.l" {return token(H5T_STRING_TOKEN);} YY_BREAK case 36: YY_RULE_SETUP -#line 98 "H5LTanalyze.l" +#line 96 "H5LTanalyze.l" {return token(STRSIZE_TOKEN);} YY_BREAK case 37: YY_RULE_SETUP -#line 99 "H5LTanalyze.l" +#line 97 "H5LTanalyze.l" {return token(STRPAD_TOKEN);} YY_BREAK case 38: YY_RULE_SETUP -#line 100 "H5LTanalyze.l" +#line 98 "H5LTanalyze.l" {return token(CSET_TOKEN);} YY_BREAK case 39: YY_RULE_SETUP -#line 101 "H5LTanalyze.l" +#line 99 "H5LTanalyze.l" {return token(CTYPE_TOKEN);} YY_BREAK case 40: YY_RULE_SETUP -#line 102 "H5LTanalyze.l" +#line 100 "H5LTanalyze.l" {return token(H5T_STR_NULLTERM_TOKEN);} YY_BREAK case 41: YY_RULE_SETUP -#line 103 "H5LTanalyze.l" +#line 101 "H5LTanalyze.l" {return token(H5T_STR_NULLPAD_TOKEN);} YY_BREAK case 42: YY_RULE_SETUP -#line 104 "H5LTanalyze.l" +#line 102 "H5LTanalyze.l" {return token(H5T_STR_SPACEPAD_TOKEN);} YY_BREAK case 43: YY_RULE_SETUP -#line 105 "H5LTanalyze.l" +#line 103 "H5LTanalyze.l" {return token(H5T_CSET_ASCII_TOKEN);} YY_BREAK case 44: YY_RULE_SETUP -#line 106 "H5LTanalyze.l" +#line 104 "H5LTanalyze.l" {return token(H5T_C_S1_TOKEN);} YY_BREAK case 45: YY_RULE_SETUP -#line 107 "H5LTanalyze.l" +#line 105 "H5LTanalyze.l" {return token(H5T_FORTRAN_S1_TOKEN);} YY_BREAK case 46: YY_RULE_SETUP -#line 108 "H5LTanalyze.l" +#line 106 "H5LTanalyze.l" {return token(H5T_VARIABLE_TOKEN);} YY_BREAK case 47: YY_RULE_SETUP -#line 110 "H5LTanalyze.l" +#line 108 "H5LTanalyze.l" {return token(H5T_COMPOUND_TOKEN);} YY_BREAK case 48: YY_RULE_SETUP -#line 111 "H5LTanalyze.l" +#line 109 "H5LTanalyze.l" {return token(H5T_ENUM_TOKEN);} YY_BREAK case 49: YY_RULE_SETUP -#line 112 "H5LTanalyze.l" +#line 110 "H5LTanalyze.l" {return token(H5T_ARRAY_TOKEN);} YY_BREAK case 50: YY_RULE_SETUP -#line 113 "H5LTanalyze.l" +#line 111 "H5LTanalyze.l" {return token(H5T_VLEN_TOKEN);} YY_BREAK case 51: YY_RULE_SETUP -#line 115 "H5LTanalyze.l" +#line 113 "H5LTanalyze.l" {return token(H5T_OPAQUE_TOKEN);} YY_BREAK case 52: YY_RULE_SETUP -#line 116 "H5LTanalyze.l" +#line 114 "H5LTanalyze.l" {return token(OPQ_SIZE_TOKEN);} YY_BREAK case 53: YY_RULE_SETUP -#line 117 "H5LTanalyze.l" -{return token(OPQ_TAG_TOKEN);} - YY_BREAK -case 54: -YY_RULE_SETUP -#line 119 "H5LTanalyze.l" +#line 116 "H5LTanalyze.l" { if(is_str_size || (is_enum && is_enum_memb) || is_opq_size || (asindex>-1 && arr_stack[asindex].is_dim)) { @@ -1315,12 +1310,12 @@ YY_RULE_SETUP REJECT; } YY_BREAK -case 55: +case 54: YY_RULE_SETUP -#line 128 "H5LTanalyze.l" +#line 125 "H5LTanalyze.l" { - /*if it's first quote, and is a opaque tag or an enum symbol*/ - if((is_opq_tag || is_enum || (csindex>-1 && cmpd_stack[csindex].is_field)) && first_quote) { + /*if it's first quote, and is a compound field name or an enum symbol*/ + if((is_enum || (csindex>-1 && cmpd_stack[csindex].is_field)) && first_quote) { first_quote = 0; BEGIN TAG_STRING; } else /*if it's second quote*/ @@ -1328,56 +1323,56 @@ YY_RULE_SETUP return token('"'); } YY_BREAK -case 56: +case 55: YY_RULE_SETUP -#line 137 "H5LTanalyze.l" +#line 134 "H5LTanalyze.l" { yylval.sval = strdup(yytext); BEGIN INITIAL; return STRING; } YY_BREAK -case 57: +case 56: YY_RULE_SETUP -#line 143 "H5LTanalyze.l" +#line 140 "H5LTanalyze.l" {return token('{');} YY_BREAK -case 58: +case 57: YY_RULE_SETUP -#line 144 "H5LTanalyze.l" +#line 141 "H5LTanalyze.l" {return token('}');} YY_BREAK -case 59: +case 58: YY_RULE_SETUP -#line 145 "H5LTanalyze.l" +#line 142 "H5LTanalyze.l" {return token('[');} YY_BREAK -case 60: +case 59: YY_RULE_SETUP -#line 146 "H5LTanalyze.l" +#line 143 "H5LTanalyze.l" {return token(']');} YY_BREAK -case 61: +case 60: YY_RULE_SETUP -#line 147 "H5LTanalyze.l" +#line 144 "H5LTanalyze.l" {return token(';');} YY_BREAK -case 62: +case 61: YY_RULE_SETUP -#line 148 "H5LTanalyze.l" +#line 145 "H5LTanalyze.l" ; YY_BREAK -case 63: +case 62: YY_RULE_SETUP -#line 149 "H5LTanalyze.l" +#line 146 "H5LTanalyze.l" { return 0; } YY_BREAK -case 64: +case 63: YY_RULE_SETUP -#line 151 "H5LTanalyze.l" +#line 148 "H5LTanalyze.l" ECHO; YY_BREAK -#line 1366 "lex.yy.c" +#line 1355 "H5LTanalyze.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(TAG_STRING): yyterminate(); @@ -1667,7 +1662,7 @@ static yy_state_type yy_get_previous_state() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 535 ) + if ( yy_current_state >= 529 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1697,11 +1692,11 @@ yy_state_type yy_current_state; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 535 ) + if ( yy_current_state >= 529 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 534); + yy_is_jam = (yy_current_state == 528); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2253,7 +2248,7 @@ int main() return 0; } #endif -#line 151 "H5LTanalyze.l" +#line 148 "H5LTanalyze.l" int my_yyinput(char *buf, int max_size) { diff --git a/hl/src/H5LTanalyze.l b/hl/src/H5LTanalyze.l index be40eb8..f7ea61e 100644 --- a/hl/src/H5LTanalyze.l +++ b/hl/src/H5LTanalyze.l @@ -1,22 +1,8 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - %{ #include <stdlib.h> #include <string.h> #include<hdf5.h> -#include "y.tab.h" +#include "H5LTparse.h" int my_yyinput(char *, int); #undef YY_INPUT @@ -55,7 +41,6 @@ extern hbool_t is_str_pad; /*variables for opaque type*/ extern hbool_t is_opq_size; -extern hbool_t is_opq_tag; hbool_t first_quote = 1; @@ -127,7 +112,6 @@ H5T_VLEN {return token(H5T_VLEN_TOKEN);} H5T_OPAQUE {return token(H5T_OPAQUE_TOKEN);} OPQ_SIZE {return token(OPQ_SIZE_TOKEN);} -OPQ_TAG {return token(OPQ_TAG_TOKEN);} [0-9]+ { if(is_str_size || (is_enum && is_enum_memb) || @@ -139,8 +123,8 @@ OPQ_TAG {return token(OPQ_TAG_TOKEN);} } "\"" { - /*if it's first quote, and is a opaque tag or an enum symbol*/ - if((is_opq_tag || is_enum || (csindex>-1 && cmpd_stack[csindex].is_field)) && first_quote) { + /*if it's first quote, and is a compound field name or an enum symbol*/ + if((is_enum || (csindex>-1 && cmpd_stack[csindex].is_field)) && first_quote) { first_quote = 0; BEGIN TAG_STRING; } else /*if it's second quote*/ diff --git a/hl/src/y.tab.c b/hl/src/H5LTparse.c index f284523..61dbdf1 100644 --- a/hl/src/y.tab.c +++ b/hl/src/H5LTparse.c @@ -12,6 +12,10 @@ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* This file was generated by Yacc with the command "yacc -o H5LTparse.c -d H5LTparse.y" + * Do NOT modify it by hand. + */ + #ifndef lint static char const yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $"; @@ -69,14 +73,13 @@ hbool_t is_enum_memb = 0; /*flag to lexer for enum member*/ char* enum_memb_symbol; /*enum member symbol string*/ 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 46 "H5LTparse.y" +#line 45 "H5LTparse.y" typedef union { int ival; /*for integer token*/ - char *sval; /*for compound member name*/ + char *sval; /*for name string*/ } YYSTYPE; -#line 66 "y.tab.c" +#line 65 "H5LTparse.c" #define YYERRCODE 256 #define H5T_STD_I8BE_TOKEN 257 #define H5T_STD_I8LE_TOKEN 258 @@ -126,13 +129,12 @@ typedef union { #define H5T_FORTRAN_S1_TOKEN 302 #define H5T_OPAQUE_TOKEN 303 #define OPQ_SIZE_TOKEN 304 -#define OPQ_TAG_TOKEN 305 -#define H5T_COMPOUND_TOKEN 306 -#define H5T_ENUM_TOKEN 307 -#define H5T_ARRAY_TOKEN 308 -#define H5T_VLEN_TOKEN 309 -#define STRING 310 -#define NUMBER 311 +#define H5T_COMPOUND_TOKEN 305 +#define H5T_ENUM_TOKEN 306 +#define H5T_ARRAY_TOKEN 307 +#define H5T_VLEN_TOKEN 308 +#define STRING 309 +#define NUMBER 310 const short yylhs[] = { -1, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 6, 6, 6, 6, 6, 6, 6, 6, 6, @@ -140,9 +142,9 @@ const short yylhs[] = { -1, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 11, 3, 12, 12, 14, 13, 15, 16, 4, 17, 17, 20, 21, 18, 19, - 5, 23, 24, 25, 27, 10, 22, 26, 29, 31, - 32, 34, 36, 8, 30, 30, 33, 33, 33, 35, - 28, 28, 38, 9, 37, 37, 42, 39, 40, 41, + 5, 23, 24, 10, 22, 26, 28, 29, 31, 33, + 8, 27, 27, 30, 30, 30, 32, 25, 25, 35, + 9, 34, 34, 39, 36, 37, 38, }; const short yylen[] = { 2, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -151,9 +153,9 @@ const short yylen[] = { 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 5, 0, 2, 0, 6, 1, 0, 6, 0, 2, 0, 0, 5, 1, - 4, 0, 0, 0, 0, 15, 1, 1, 0, 0, - 0, 0, 0, 20, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 7, 0, 2, 0, 6, 1, 1, + 4, 0, 0, 8, 1, 0, 0, 0, 0, 0, + 20, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 7, 0, 2, 0, 6, 1, 1, }; const short yydefred[] = { 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, @@ -162,21 +164,19 @@ const short yydefred[] = { 0, 42, 43, 44, 45, 0, 0, 46, 0, 53, 0, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 0, 0, 0, 0, 0, 0, 62, 48, - 0, 55, 0, 81, 82, 0, 0, 0, 83, 0, - 61, 69, 67, 0, 47, 50, 49, 85, 57, 0, - 56, 0, 63, 0, 0, 0, 54, 70, 0, 0, - 84, 0, 86, 60, 58, 0, 64, 52, 0, 89, - 0, 0, 75, 76, 0, 0, 0, 87, 59, 71, - 0, 51, 0, 0, 68, 0, 90, 0, 0, 0, - 88, 77, 78, 79, 0, 65, 72, 0, 0, 66, - 0, 80, 0, 73, 0, 74, + 0, 55, 0, 78, 79, 0, 0, 0, 80, 0, + 61, 66, 65, 0, 47, 50, 49, 82, 57, 0, + 56, 0, 63, 0, 0, 0, 54, 67, 0, 0, + 81, 0, 83, 60, 58, 0, 64, 52, 0, 86, + 0, 0, 72, 73, 0, 0, 84, 59, 68, 51, + 0, 0, 87, 0, 0, 85, 74, 75, 76, 0, + 69, 0, 0, 77, 0, 70, 0, 71, }; const short yydgoto[] = { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 54, 68, 77, 84, 99, 56, 70, 81, 95, 86, - 102, 74, 67, 89, 106, 116, 128, 66, 82, 105, - 96, 114, 125, 129, 133, 135, 85, 78, 93, 101, - 118, 113, + 102, 74, 67, 89, 66, 82, 105, 96, 112, 120, + 122, 125, 127, 85, 78, 93, 101, 114, 111, }; const short yysindex[] = { -255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -184,18 +184,16 @@ const short yysindex[] = { -255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -81, -80, 0, -79, 0, -78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -249, -257, -74, -202, -73, -255, -261, 0, 0, - 25, 0, -40, 0, 0, 27, -223, -38, 0, -91, + 0, -249, -257, -74, -203, -41, -255, -261, 0, 0, + 25, 0, -40, 0, 0, 28, -222, -39, 0, -91, 0, 0, 0, 30, 0, 0, 0, 0, 0, -35, - 0, -201, 0, 59, -33, -216, 0, 0, -207, -211, - 0, -210, 0, 0, 0, -214, 0, 0, 67, 0, - 68, 10, 0, 0, 45, 71, 47, 0, 0, 0, - -203, 0, -200, -185, 0, 75, 0, 51, -260, 53, - 0, 0, 0, 0, 54, 0, 0, -11, -179, 0, - -184, 0, 58, 0, -7, 0, + 0, -201, 0, 59, -33, -213, 0, 0, -27, -210, + 0, -209, 0, 0, 0, -215, 0, 0, 67, 0, + 68, 10, 0, 0, 45, 46, 0, 0, 0, 0, + -204, -186, 0, 49, -260, 0, 0, 0, 0, 50, + 0, -184, -189, 0, 53, 0, -12, 0, }; -const short yyrindex[] = { 119, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +const short yyrindex[] = { 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -208,29 +206,28 @@ const short yyrindex[] = { 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, }; const short yygindex[] = { 0, - 26, 0, 0, 0, 0, 65, 0, 0, 0, 0, + 26, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, }; -#define YYTABLESIZE 271 +#define YYTABLESIZE 269 const short yytable[] = { 79, 92, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 122, 123, 124, 64, - 65, 52, 53, 55, 57, 58, 59, 36, 60, 62, - 37, 38, 39, 40, 1, 2, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 103, 63, 69, 71, 72, 75, 73, 83, 87, - 88, 91, 90, 76, 94, 80, 104, 97, 98, 100, - 107, 108, 109, 110, 111, 112, 115, 119, 120, 121, - 117, 126, 127, 130, 131, 132, 134, 136, 1, 61, + 30, 31, 32, 33, 34, 35, 117, 118, 119, 64, + 65, 52, 53, 55, 57, 58, 59, 36, 60, 37, + 38, 39, 40, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 103, 62, 63, 69, 71, 75, 72, 73, 83, 87, + 88, 91, 90, 76, 104, 80, 94, 97, 98, 100, + 106, 107, 108, 109, 110, 113, 115, 116, 121, 123, + 124, 126, 128, 1, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -240,27 +237,26 @@ const short yytable[] = { 79, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 36, 0, 0, 37, 38, 39, 40, 1, 2, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 36, 0, 0, 37, 38, 39, - 40, + 0, 36, 0, 37, 38, 39, 40, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 36, 0, 37, 38, 39, 40, }; const short yycheck[] = { 91, 34, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 297, 298, 299, 301, - 302, 123, 123, 123, 123, 295, 304, 303, 123, 123, - 306, 307, 308, 309, 257, 258, 259, 260, 261, 262, - 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, - 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, - 283, 296, 57, 59, 125, 59, 125, 311, 59, 125, - 292, 125, 34, 68, 311, 70, 311, 305, 310, 310, - 34, 34, 93, 59, 34, 59, 310, 293, 34, 59, - 311, 59, 59, 125, 294, 300, 59, 125, 0, 55, + 302, 123, 123, 123, 123, 295, 304, 303, 123, 305, + 306, 307, 308, 257, 258, 259, 260, 261, 262, 263, + 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, + 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, + 296, 123, 57, 59, 125, 125, 59, 310, 59, 125, + 292, 125, 34, 68, 310, 70, 310, 125, 309, 309, + 34, 34, 93, 59, 59, 310, 293, 59, 59, 294, + 300, 59, 125, 0, 55, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -270,19 +266,18 @@ const short yycheck[] = { 91, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 303, -1, -1, 306, 307, 308, 309, 257, 258, - 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, - 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, - 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, - 289, 290, 291, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 303, -1, -1, 306, 307, 308, - 309, + -1, 303, -1, 305, 306, 307, 308, 257, 258, 259, + 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, + 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, + 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, + 290, 291, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 303, -1, 305, 306, 307, 308, }; #define YYFINAL 41 #ifndef YYDEBUG #define YYDEBUG 0 #endif -#define YYMAXTOKEN 311 +#define YYMAXTOKEN 310 #if YYDEBUG const char * const yyname[] = { "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -307,8 +302,8 @@ const char * const yyname[] = { "CSET_TOKEN","CTYPE_TOKEN","H5T_VARIABLE_TOKEN","H5T_STR_NULLTERM_TOKEN", "H5T_STR_NULLPAD_TOKEN","H5T_STR_SPACEPAD_TOKEN","H5T_CSET_ASCII_TOKEN", "H5T_C_S1_TOKEN","H5T_FORTRAN_S1_TOKEN","H5T_OPAQUE_TOKEN","OPQ_SIZE_TOKEN", -"OPQ_TAG_TOKEN","H5T_COMPOUND_TOKEN","H5T_ENUM_TOKEN","H5T_ARRAY_TOKEN", -"H5T_VLEN_TOKEN","STRING","NUMBER", +"H5T_COMPOUND_TOKEN","H5T_ENUM_TOKEN","H5T_ARRAY_TOKEN","H5T_VLEN_TOKEN", +"STRING","NUMBER", }; const char * const yyrule[] = { "$accept : start", @@ -375,17 +370,14 @@ const char * const yyrule[] = { "vlen_type : H5T_VLEN_TOKEN '{' ddl_type '}'", "$$6 :", "$$7 :", +"opaque_type : H5T_OPAQUE_TOKEN '{' OPQ_SIZE_TOKEN $$6 opaque_size ';' $$7 '}'", +"opaque_size : NUMBER", "$$8 :", "$$9 :", -"opaque_type : H5T_OPAQUE_TOKEN '{' OPQ_SIZE_TOKEN $$6 opaque_size ';' $$7 OPQ_TAG_TOKEN $$8 '\"' opaque_tag '\"' ';' $$9 '}'", -"opaque_size : NUMBER", -"opaque_tag : STRING", "$$10 :", "$$11 :", "$$12 :", -"$$13 :", -"$$14 :", -"string_type : H5T_STRING_TOKEN '{' CTYPE_TOKEN ctype ';' $$10 STRSIZE_TOKEN $$11 strsize ';' $$12 STRPAD_TOKEN strpad ';' $$13 CSET_TOKEN cset ';' $$14 '}'", +"string_type : H5T_STRING_TOKEN '{' CTYPE_TOKEN ctype ';' $$8 STRSIZE_TOKEN $$9 strsize ';' $$10 STRPAD_TOKEN strpad ';' $$11 CSET_TOKEN cset ';' $$12 '}'", "strsize : H5T_VARIABLE_TOKEN", "strsize : NUMBER", "strpad : H5T_STR_NULLTERM_TOKEN", @@ -394,12 +386,12 @@ const char * const yyrule[] = { "cset : H5T_CSET_ASCII_TOKEN", "ctype : H5T_C_S1_TOKEN", "ctype : H5T_FORTRAN_S1_TOKEN", -"$$15 :", -"enum_type : H5T_ENUM_TOKEN '{' integer_type ';' $$15 enum_list '}'", +"$$13 :", +"enum_type : H5T_ENUM_TOKEN '{' integer_type ';' $$13 enum_list '}'", "enum_list :", "enum_list : enum_list enum_def", -"$$16 :", -"enum_def : '\"' enum_symbol '\"' $$16 enum_val ';'", +"$$14 :", +"enum_def : '\"' enum_symbol '\"' $$14 enum_val ';'", "enum_symbol : STRING", "enum_val : NUMBER", }; @@ -626,155 +618,155 @@ yyreduce: switch (yyn) { case 1: -#line 78 "H5LTparse.y" +#line 77 "H5LTparse.y" { memset(arr_stack, 0, STACK_SIZE*sizeof(struct arr_info)); /*initialize here?*/ } break; case 2: -#line 79 "H5LTparse.y" +#line 78 "H5LTparse.y" { return yyval.ival;} break; case 12: -#line 93 "H5LTparse.y" +#line 92 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_I8BE); } break; case 13: -#line 94 "H5LTparse.y" +#line 93 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_I8LE); } break; case 14: -#line 95 "H5LTparse.y" +#line 94 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_I16BE); } break; case 15: -#line 96 "H5LTparse.y" +#line 95 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_I16LE); } break; case 16: -#line 97 "H5LTparse.y" +#line 96 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_I32BE); } break; case 17: -#line 98 "H5LTparse.y" +#line 97 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_I32LE); } break; case 18: -#line 99 "H5LTparse.y" +#line 98 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_I64BE); } break; case 19: -#line 100 "H5LTparse.y" +#line 99 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_I64LE); } break; case 20: -#line 101 "H5LTparse.y" +#line 100 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_U8BE); } break; case 21: -#line 102 "H5LTparse.y" +#line 101 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_U8LE); } break; case 22: -#line 103 "H5LTparse.y" +#line 102 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_U16BE); } break; case 23: -#line 104 "H5LTparse.y" +#line 103 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_U16LE); } break; case 24: -#line 105 "H5LTparse.y" +#line 104 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_U32BE); } break; case 25: -#line 106 "H5LTparse.y" +#line 105 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_U32LE); } break; case 26: -#line 107 "H5LTparse.y" +#line 106 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_U64BE); } break; case 27: -#line 108 "H5LTparse.y" +#line 107 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_STD_U64LE); } break; case 28: -#line 109 "H5LTparse.y" +#line 108 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_CHAR); } break; case 29: -#line 110 "H5LTparse.y" +#line 109 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_SCHAR); } break; case 30: -#line 111 "H5LTparse.y" +#line 110 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_UCHAR); } break; case 31: -#line 112 "H5LTparse.y" +#line 111 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_SHORT); } break; case 32: -#line 113 "H5LTparse.y" +#line 112 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_USHORT); } break; case 33: -#line 114 "H5LTparse.y" +#line 113 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_INT); } break; case 34: -#line 115 "H5LTparse.y" +#line 114 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_UINT); } break; case 35: -#line 116 "H5LTparse.y" +#line 115 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_LONG); } break; case 36: -#line 117 "H5LTparse.y" +#line 116 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_ULONG); } break; case 37: -#line 118 "H5LTparse.y" +#line 117 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_LLONG); } break; case 38: -#line 119 "H5LTparse.y" +#line 118 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_ULLONG); } break; case 39: -#line 122 "H5LTparse.y" +#line 121 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_IEEE_F32BE); } break; case 40: -#line 123 "H5LTparse.y" +#line 122 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_IEEE_F32LE); } break; case 41: -#line 124 "H5LTparse.y" +#line 123 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_IEEE_F64BE); } break; case 42: -#line 125 "H5LTparse.y" +#line 124 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_IEEE_F64LE); } break; case 43: -#line 126 "H5LTparse.y" +#line 125 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_FLOAT); } break; case 44: -#line 127 "H5LTparse.y" +#line 126 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_DOUBLE); } break; case 45: -#line 128 "H5LTparse.y" +#line 127 "H5LTparse.y" { yyval.ival = H5Tcopy(H5T_NATIVE_LDOUBLE); } break; case 46: -#line 132 "H5LTparse.y" +#line 131 "H5LTparse.y" { csindex++; cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/ } break; case 47: -#line 134 "H5LTparse.y" +#line 133 "H5LTparse.y" { yyval.ival = cmpd_stack[csindex].id; cmpd_stack[csindex].id = 0; cmpd_stack[csindex].first_memb = 1; @@ -782,11 +774,11 @@ case 47: } break; case 50: -#line 143 "H5LTparse.y" +#line 142 "H5LTparse.y" { cmpd_stack[csindex].is_field = 1; /*notify lexer a compound member is parsed*/ } break; case 51: -#line 145 "H5LTparse.y" +#line 144 "H5LTparse.y" { int origin_size, new_size; hid_t dtype_id = cmpd_stack[csindex].id; @@ -812,11 +804,11 @@ case 51: } break; case 53: -#line 172 "H5LTparse.y" +#line 171 "H5LTparse.y" { asindex++; /*pushd onto the stack*/ } break; case 54: -#line 174 "H5LTparse.y" +#line 173 "H5LTparse.y" { yyval.ival = H5Tarray_create(yyvsp[-1].ival, arr_stack[asindex].ndims, arr_stack[asindex].dims, NULL); arr_stack[asindex].ndims = 0; @@ -825,11 +817,11 @@ case 54: } break; case 57: -#line 184 "H5LTparse.y" +#line 183 "H5LTparse.y" { arr_stack[asindex].is_dim = 1; /*notice lexer of dimension size*/ } break; case 58: -#line 185 "H5LTparse.y" +#line 184 "H5LTparse.y" { int ndims = arr_stack[asindex].ndims; arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; arr_stack[asindex].ndims++; @@ -837,15 +829,15 @@ case 58: } break; case 61: -#line 196 "H5LTparse.y" +#line 195 "H5LTparse.y" { yyval.ival = H5Tvlen_create(yyvsp[-1].ival); H5Tclose(yyvsp[-1].ival); } break; case 62: -#line 201 "H5LTparse.y" +#line 200 "H5LTparse.y" { is_opq_size = 1; } break; case 63: -#line 202 "H5LTparse.y" +#line 201 "H5LTparse.y" { size_t size = (size_t)yylval.ival; yyval.ival = H5Tcreate(H5T_OPAQUE, size); @@ -853,22 +845,11 @@ case 63: } break; case 64: -#line 207 "H5LTparse.y" -{ is_opq_tag = 1; } -break; -case 65: -#line 208 "H5LTparse.y" -{ - H5Tset_tag(yyvsp[-6].ival, yylval.sval); - is_opq_tag = 0; - } +#line 206 "H5LTparse.y" +{ yyval.ival = yyvsp[-1].ival; } break; case 66: -#line 212 "H5LTparse.y" -{ yyval.ival = yyvsp[-8].ival; } -break; -case 69: -#line 222 "H5LTparse.y" +#line 214 "H5LTparse.y" { if(yyvsp[-1].ival == H5T_C_S1_TOKEN) yyval.ival = H5Tcopy(H5T_C_S1); @@ -876,12 +857,12 @@ case 69: yyval.ival = H5Tcopy(H5T_FORTRAN_S1); } break; -case 70: -#line 228 "H5LTparse.y" +case 67: +#line 220 "H5LTparse.y" { is_str_size = 1; } break; -case 71: -#line 229 "H5LTparse.y" +case 68: +#line 221 "H5LTparse.y" { if(yyvsp[-1].ival == H5T_VARIABLE_TOKEN) H5Tset_size(yyvsp[-4].ival, H5T_VARIABLE); @@ -890,8 +871,8 @@ case 71: is_str_size = 0; } break; -case 72: -#line 237 "H5LTparse.y" +case 69: +#line 229 "H5LTparse.y" { if(yyvsp[-1].ival == H5T_STR_NULLTERM_TOKEN) H5Tset_strpad(yyvsp[-8].ival, H5T_STR_NULLTERM); @@ -901,62 +882,62 @@ case 72: H5Tset_strpad(yyvsp[-8].ival, H5T_STR_SPACEPAD); } break; -case 73: -#line 246 "H5LTparse.y" +case 70: +#line 238 "H5LTparse.y" { if(yyvsp[-1].ival == H5T_CSET_ASCII_TOKEN) H5Tset_cset(yyvsp[-12].ival, H5T_CSET_ASCII); } break; -case 74: -#line 250 "H5LTparse.y" +case 71: +#line 242 "H5LTparse.y" { yyval.ival = yyvsp[-14].ival; } break; -case 75: -#line 253 "H5LTparse.y" +case 72: +#line 245 "H5LTparse.y" {yyval.ival = H5T_VARIABLE_TOKEN;} break; -case 77: -#line 256 "H5LTparse.y" +case 74: +#line 248 "H5LTparse.y" {yyval.ival = H5T_STR_NULLTERM_TOKEN;} break; -case 78: -#line 257 "H5LTparse.y" +case 75: +#line 249 "H5LTparse.y" {yyval.ival = H5T_STR_NULLPAD_TOKEN;} break; -case 79: -#line 258 "H5LTparse.y" +case 76: +#line 250 "H5LTparse.y" {yyval.ival = H5T_STR_SPACEPAD_TOKEN;} break; -case 80: -#line 260 "H5LTparse.y" +case 77: +#line 252 "H5LTparse.y" {yyval.ival = H5T_CSET_ASCII_TOKEN;} break; -case 81: -#line 262 "H5LTparse.y" +case 78: +#line 254 "H5LTparse.y" {yyval.ival = H5T_C_S1_TOKEN;} break; -case 82: -#line 263 "H5LTparse.y" +case 79: +#line 255 "H5LTparse.y" {yyval.ival = H5T_FORTRAN_S1_TOKEN;} break; -case 83: -#line 267 "H5LTparse.y" +case 80: +#line 259 "H5LTparse.y" { is_enum = 1; enum_id = H5Tenum_create(yyvsp[-1].ival); H5Tclose(yyvsp[-1].ival); } break; -case 84: -#line 269 "H5LTparse.y" +case 81: +#line 261 "H5LTparse.y" { is_enum = 0; /*reset*/ yyval.ival = enum_id; } break; -case 87: -#line 274 "H5LTparse.y" +case 84: +#line 266 "H5LTparse.y" { is_enum_memb = 1; /*indicate member of enum*/ enum_memb_symbol = strdup(yylval.sval); } break; -case 88: -#line 279 "H5LTparse.y" +case 85: +#line 271 "H5LTparse.y" { int memb_val; if(is_enum && is_enum_memb) { /*if it's an enum member*/ @@ -966,7 +947,7 @@ case 88: } } break; -#line 956 "y.tab.c" +#line 933 "H5LTparse.c" } yyssp -= yym; yystate = *yyssp; diff --git a/hl/src/y.tab.h b/hl/src/H5LTparse.h index a741d97..4be1a8e 100644 --- a/hl/src/y.tab.h +++ b/hl/src/H5LTparse.h @@ -12,6 +12,10 @@ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* This file was generated by Yacc with the command "yacc -o H5LTparse.c -d H5LTparse.y" + * Do NOT modify it by hand. + */ + #ifndef YYERRCODE #define YYERRCODE 256 #endif @@ -64,15 +68,14 @@ #define H5T_FORTRAN_S1_TOKEN 302 #define H5T_OPAQUE_TOKEN 303 #define OPQ_SIZE_TOKEN 304 -#define OPQ_TAG_TOKEN 305 -#define H5T_COMPOUND_TOKEN 306 -#define H5T_ENUM_TOKEN 307 -#define H5T_ARRAY_TOKEN 308 -#define H5T_VLEN_TOKEN 309 -#define STRING 310 -#define NUMBER 311 +#define H5T_COMPOUND_TOKEN 305 +#define H5T_ENUM_TOKEN 306 +#define H5T_ARRAY_TOKEN 307 +#define H5T_VLEN_TOKEN 308 +#define STRING 309 +#define NUMBER 310 typedef union { int ival; /*for integer token*/ - char *sval; /*for compound member name*/ + char *sval; /*for name string*/ } YYSTYPE; extern YYSTYPE yylval; diff --git a/hl/src/H5LTparse.y b/hl/src/H5LTparse.y index 66e6b07..c5f8520 100644 --- a/hl/src/H5LTparse.y +++ b/hl/src/H5LTparse.y @@ -1,17 +1,3 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - %{ #include<stdio.h> #include<string.h> @@ -54,12 +40,11 @@ hbool_t is_enum_memb = 0; /*flag to lexer for enum member*/ char* enum_memb_symbol; /*enum member symbol string*/ 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*/ %} %union { int ival; /*for integer token*/ - char *sval; /*for compound member name*/ + char *sval; /*for name string*/ } %token <ival> H5T_STD_I8BE_TOKEN H5T_STD_I8LE_TOKEN H5T_STD_I16BE_TOKEN H5T_STD_I16LE_TOKEN @@ -77,7 +62,7 @@ hbool_t is_opq_tag = 0; /*flag to lexer for opaque type tag*/ %token <ival> H5T_STR_NULLTERM_TOKEN H5T_STR_NULLPAD_TOKEN H5T_STR_SPACEPAD_TOKEN %token <ival> H5T_CSET_ASCII_TOKEN H5T_C_S1_TOKEN H5T_FORTRAN_S1_TOKEN -%token <ival> H5T_OPAQUE_TOKEN OPQ_SIZE_TOKEN OPQ_TAG_TOKEN +%token <ival> H5T_OPAQUE_TOKEN OPQ_SIZE_TOKEN %token <ival> H5T_COMPOUND_TOKEN %token <ival> H5T_ENUM_TOKEN @@ -218,17 +203,10 @@ opaque_type : H5T_OPAQUE_TOKEN $<ival>$ = H5Tcreate(H5T_OPAQUE, size); is_opq_size = 0; } - OPQ_TAG_TOKEN { is_opq_tag = 1; } '"' opaque_tag '"' ';' - { - H5Tset_tag($<ival>7, yylval.sval); - is_opq_tag = 0; - } '}' { $<ival>$ = $<ival>7; } ; opaque_size : NUMBER ; -opaque_tag : STRING - ; string_type : H5T_STRING_TOKEN '{' diff --git a/hl/src/Makefile.am b/hl/src/Makefile.am index b7410fe..002438d 100644 --- a/hl/src/Makefile.am +++ b/hl/src/Makefile.am @@ -25,12 +25,12 @@ AM_CPPFLAGS=-I$(top_srcdir)/src # This library is our main target. lib_LTLIBRARIES=libhdf5_hl.la -libhdf5_hl_la_SOURCES=H5LT.c H5TB.c H5IM.c H5DS.c H5PT.c H5HL_private.c y.tab.c lex.yy.c +libhdf5_hl_la_SOURCES=H5LT.c H5TB.c H5IM.c H5DS.c H5PT.c H5HL_private.c H5LTparse.c H5LTanalyze.c # Public header files (to be installed) -include_HEADERS=H5IM.h H5LT.h H5TB.h H5DS.h H5PT.h y.tab.h +include_HEADERS=H5IM.h H5LT.h H5TB.h H5DS.h H5PT.h H5LTparse.h -# Automake naturally assumes that we want it to remove y.tab.c on distclean. +# Automake naturally assumes that we want it to remove H5LTparse.c on distclean. # Convince it otherwise. distclean-compile: diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index dd9f4d8..4902a49 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -77,7 +77,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libhdf5_hl_la_LIBADD = am_libhdf5_hl_la_OBJECTS = H5LT.lo H5TB.lo H5IM.lo H5DS.lo H5PT.lo \ - H5HL_private.lo y.tab.lo lex.yy.lo + H5HL_private.lo H5LTparse.lo H5LTanalyze.lo libhdf5_hl_la_OBJECTS = $(am_libhdf5_hl_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/bin/depcomp @@ -340,10 +340,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/src # This library is our main target. lib_LTLIBRARIES = libhdf5_hl.la -libhdf5_hl_la_SOURCES = H5LT.c H5TB.c H5IM.c H5DS.c H5PT.c H5HL_private.c y.tab.c lex.yy.c +libhdf5_hl_la_SOURCES = H5LT.c H5TB.c H5IM.c H5DS.c H5PT.c H5HL_private.c H5LTparse.c H5LTanalyze.c # Public header files (to be installed) -include_HEADERS = H5IM.h H5LT.h H5TB.h H5DS.h H5PT.h y.tab.h +include_HEADERS = H5IM.h H5LT.h H5TB.h H5DS.h H5PT.h H5LTparse.h # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., @@ -431,10 +431,10 @@ mostlyclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5HL_private.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5IM.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5LT.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5LTanalyze.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5LTparse.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5PT.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5TB.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lex.yy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/y.tab.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -674,7 +674,7 @@ check-install: installcheck build-tests check-clean check-install check-p check-s check-vfd \ install-doc lib progs tests uninstall-doc _exec_check-s _test -# Automake naturally assumes that we want it to remove y.tab.c on distclean. +# Automake naturally assumes that we want it to remove H5LTparse.c on distclean. # Convince it otherwise. distclean-compile: diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c index f4e9aab..533147a 100644 --- a/hl/test/test_lite.c +++ b/hl/test/test_lite.c @@ -1238,14 +1238,13 @@ static int test_opaques(void) { hid_t dtype; size_t opq_size; - char *opq_tag = NULL; H5T_class_t type_class; char* dt_str; size_t str_len; TESTING3(" text for opaque types"); - if((dtype = H5LTtext_to_dtype("H5T_OPAQUE { OPQ_SIZE 19; OPQ_TAG \"This is a tag for opaque type\"; }"))<0) + if((dtype = H5LTtext_to_dtype("H5T_OPAQUE { OPQ_SIZE 19; }"))<0) goto out; if((type_class = H5Tget_class(dtype))<0) @@ -1258,18 +1257,12 @@ static int test_opaques(void) if(opq_size != 19) goto out; - if((opq_tag = H5Tget_tag(dtype)) == NULL) - goto out; - if(strcmp(opq_tag, "This is a tag for opaque type")) - goto out; - free(opq_tag); - if(H5LTdtype_to_text(dtype, NULL, &str_len)<0) goto out; dt_str = (char*)calloc(str_len, sizeof(char)); if(H5LTdtype_to_text(dtype, dt_str, &str_len)<0) goto out; - if(strcmp(dt_str, "H5T_OPAQUE {\n OPQ_SIZE 19;\n OPQ_TAG \"This is a tag for opaque type\";\n }")) { + if(strcmp(dt_str, "H5T_OPAQUE {\n OPQ_SIZE 19;\n }")) { printf("dt=\n%s\n", dt_str); goto out; } |