From 6c35d22c399d53cc4ce2b0f594a3033ede3ae117 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Wed, 12 Jun 2002 12:50:22 +0000 Subject: [PATCH] * src/scan-gram.l (SC_PROLOGUE): Don't eat characters amongst ['"/] too eagerly. * tests/input.at (Torturing the Scanner): New. --- ChangeLog | 6 + src/scan-gram.c | 548 ++++++++++++++++++++++++------------------------ src/scan-gram.l | 4 +- tests/input.at | 27 ++- 4 files changed, 307 insertions(+), 278 deletions(-) diff --git a/ChangeLog b/ChangeLog index 615ccebc..13025ab9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-06-12 Akim Demaille + + * src/scan-gram.l (SC_PROLOGUE): Don't eat characters amongst + ['"/] too eagerly. + * tests/input.at (Torturing the Scanner): New. + 2002-06-11 Akim Demaille * src/scan-gram.l (YY_OBS_INIT): Remove, replace with... diff --git a/src/scan-gram.c b/src/scan-gram.c index adae331e..58c570c2 100644 --- a/src/scan-gram.c +++ b/src/scan-gram.c @@ -311,7 +311,7 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); #define YY_NUM_RULES 92 #define YY_END_OF_BUFFER 93 -static yyconst short int yy_accept[355] = +static yyconst short int yy_accept[352] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, 44, @@ -321,7 +321,7 @@ static yyconst short int yy_accept[355] = 71, 68, 92, 52, 53, 53, 51, 92, 55, 56, 56, 54, 84, 85, 85, 77, 86, 76, 86, 86, 45, 46, 81, 80, 88, 90, 90, 77, 92, 76, - 88, 91, 91, 91, 77, 76, 91, 33, 32, 32, + 92, 91, 91, 91, 77, 76, 91, 33, 32, 32, 32, 32, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40, 34, 38, @@ -331,27 +331,27 @@ static yyconst short int yy_accept[355] = 61, 62, 63, 64, 65, 67, 56, 56, 56, 56, 84, 85, 85, 85, 85, 82, 0, 82, 0, 78, 79, 83, 0, 83, 88, 90, 90, 90, 90, 89, - 0, 87, 78, 79, 91, 91, 91, 91, 91, 78, - 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 87, 91, 91, 91, 91, 91, 78, 79, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 39, 42, 0, 0, 0, 0, 79, - 79, 79, 79, 0, 0, 0, 0, 0, 0, 0, + 0, 39, 42, 0, 0, 0, 0, 79, 79, 79, + 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, 57, 58, - 82, 0, 82, 0, 0, 0, 0, 0, 0, 0, - 9, 0, 0, 0, 0, 0, 0, 16, 0, 0, - 0, 0, 21, 0, 24, 0, 0, 27, 0, 2, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, - 0, 0, 18, 0, 20, 22, 25, 0, 1, 3, - 0, 6, 0, 0, 0, 0, 0, 0, 15, 0, - - 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, - 12, 13, 0, 19, 0, 0, 0, 0, 10, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, - 0, 11, 17, 23, 0, 0, 5, 0, 0, 0, - 0, 0, 8, 0 + 0, 0, 0, 0, 0, 57, 58, 82, 0, 82, + 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, + 0, 0, 0, 0, 16, 0, 0, 0, 0, 21, + 0, 24, 0, 0, 27, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 14, 0, 0, 18, + 0, 20, 22, 25, 0, 1, 3, 0, 6, 0, + 0, 0, 0, 0, 0, 15, 0, 0, 0, 0, + + 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 26, 0, 0, 0, 0, 0, 12, 13, 0, + 19, 0, 0, 0, 0, 10, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 7, 0, 11, 17, + 23, 0, 0, 5, 0, 0, 0, 0, 0, 8, + 0 } ; static yyconst int yy_ec[256] = @@ -388,106 +388,104 @@ static yyconst int yy_ec[256] = static yyconst int yy_meta[51] = { 0, - 1, 1, 2, 3, 4, 5, 6, 5, 7, 1, - 8, 5, 9, 9, 1, 1, 1, 1, 10, 5, - 9, 11, 12, 11, 8, 9, 9, 9, 9, 9, - 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 5, 1, 5 + 1, 1, 2, 3, 4, 5, 6, 7, 8, 1, + 9, 7, 10, 10, 1, 1, 1, 1, 11, 5, + 10, 12, 13, 12, 9, 10, 10, 10, 10, 10, + 10, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 5, 1, 5 } ; -static yyconst short int yy_base[382] = +static yyconst short int yy_base[378] = { 0, 0, 0, 48, 51, 58, 61, 83, 86, 73, 94, - 108, 110, 131, 179, 227, 249, 116, 142, 798, 799, - 795, 55, 64, 799, 267, 799, 0, 44, 79, 799, - 799, 0, 799, 799, 799, 0, 97, 99, 784, 799, - 799, 0, 119, 122, 799, 799, 0, 799, 799, 126, - 138, 799, 0, 0, 145, 153, 799, 311, 799, 155, - 157, 799, 0, 159, 164, 799, 159, 799, 62, 164, - 799, 799, 799, 799, 0, 185, 189, 0, 125, 0, - 185, 192, 201, 203, 205, 207, 209, 793, 211, 213, - 216, 219, 799, 760, 763, 187, 758, 49, 198, 747, - - 199, 756, 109, 208, 751, 758, 761, 799, 0, 799, - 0, 212, 767, 0, 241, 255, 259, 261, 799, 0, - 263, 265, 272, 274, 799, 276, 278, 280, 282, 799, - 0, 284, 286, 288, 296, 799, 799, 772, 799, 799, - 799, 799, 799, 799, 799, 0, 298, 314, 316, 318, - 0, 322, 324, 326, 328, 799, 322, 326, 765, 799, - 0, 799, 330, 332, 0, 344, 347, 355, 357, 243, - 263, 799, 0, 358, 360, 363, 365, 367, 369, 371, - 373, 745, 159, 741, 741, 200, 749, 751, 741, 368, - 747, 733, 745, 733, 741, 742, 745, 729, 734, 728, - - 733, 725, 737, 0, 799, 751, 0, 744, 373, 0, - 377, 385, 399, 736, 717, 726, 720, 728, 727, 726, - 712, 728, 723, 716, 725, 709, 709, 720, 717, 713, - 709, 703, 706, 712, 711, 701, 712, 710, 799, 799, - 718, 377, 391, 695, 703, 696, 692, 704, 721, 701, - 799, 686, 375, 694, 685, 689, 681, 799, 388, 681, - 693, 679, 799, 683, 799, 682, 680, 799, 671, 799, - 665, 401, 640, 631, 402, 625, 616, 598, 593, 799, - 589, 587, 799, 581, 799, 404, 799, 581, 799, 578, - 569, 799, 572, 573, 572, 558, 560, 550, 799, 562, - - 537, 521, 526, 799, 525, 524, 507, 509, 513, 500, - 510, 387, 387, 398, 799, 381, 389, 376, 376, 386, - 799, 799, 374, 799, 381, 367, 321, 313, 799, 307, - 303, 287, 265, 249, 228, 214, 207, 212, 160, 799, - 157, 799, 799, 799, 168, 405, 799, 149, 137, 91, - 85, 62, 799, 799, 430, 442, 454, 466, 478, 490, - 502, 514, 519, 528, 540, 552, 562, 574, 586, 597, - 609, 621, 633, 645, 657, 86, 669, 681, 693, 705, - 60 + 108, 110, 131, 179, 227, 249, 116, 142, 799, 800, + 796, 55, 64, 800, 267, 800, 0, 44, 79, 800, + 800, 0, 800, 800, 800, 0, 97, 99, 785, 800, + 800, 0, 119, 122, 800, 800, 0, 800, 800, 126, + 138, 800, 0, 0, 145, 153, 800, 311, 800, 155, + 157, 800, 0, 159, 164, 800, 159, 800, 62, 164, + 800, 800, 800, 800, 0, 185, 189, 800, 125, 800, + 185, 192, 201, 203, 205, 207, 209, 794, 211, 213, + 216, 219, 800, 761, 764, 187, 759, 49, 198, 748, + + 199, 757, 109, 208, 752, 759, 762, 800, 0, 800, + 0, 212, 768, 0, 241, 255, 259, 261, 800, 0, + 263, 265, 272, 274, 800, 276, 278, 280, 282, 800, + 0, 284, 286, 288, 296, 800, 800, 773, 800, 800, + 800, 800, 800, 800, 800, 0, 298, 314, 316, 318, + 0, 322, 324, 326, 328, 800, 322, 326, 766, 800, + 0, 800, 330, 332, 0, 344, 347, 355, 357, 243, + 263, 800, 359, 361, 363, 365, 367, 369, 371, 746, + 159, 742, 742, 200, 750, 752, 742, 366, 748, 734, + 746, 734, 742, 743, 746, 730, 735, 729, 734, 726, + + 738, 0, 800, 752, 0, 745, 371, 0, 375, 379, + 737, 718, 727, 721, 729, 728, 727, 713, 729, 724, + 717, 726, 710, 710, 721, 718, 714, 710, 704, 707, + 713, 712, 702, 713, 711, 800, 800, 719, 373, 375, + 696, 704, 697, 693, 705, 722, 702, 800, 687, 386, + 695, 686, 690, 682, 800, 388, 682, 694, 680, 800, + 684, 800, 683, 681, 800, 648, 800, 652, 390, 626, + 626, 392, 610, 603, 602, 593, 800, 591, 592, 800, + 588, 800, 395, 800, 588, 800, 585, 577, 800, 579, + 580, 579, 576, 574, 555, 800, 567, 553, 536, 536, + + 800, 527, 526, 511, 514, 518, 501, 514, 497, 381, + 392, 800, 375, 383, 369, 368, 378, 800, 800, 366, + 800, 380, 353, 321, 313, 800, 307, 303, 287, 265, + 249, 228, 214, 207, 212, 160, 800, 157, 800, 800, + 800, 168, 396, 800, 149, 137, 91, 85, 62, 800, + 800, 421, 434, 447, 460, 473, 486, 499, 512, 517, + 527, 540, 553, 564, 577, 590, 602, 615, 628, 641, + 654, 667, 85, 680, 693, 706, 59 } ; -static yyconst short int yy_def[382] = +static yyconst short int yy_def[378] = { 0, - 354, 1, 355, 355, 356, 356, 357, 357, 358, 358, - 359, 359, 360, 360, 361, 361, 362, 362, 354, 354, - 354, 354, 354, 354, 354, 354, 363, 354, 354, 354, - 354, 364, 354, 354, 354, 365, 354, 354, 354, 354, - 354, 366, 354, 354, 354, 354, 367, 354, 354, 354, - 354, 354, 368, 369, 354, 354, 354, 370, 354, 354, - 354, 354, 371, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 372, 354, 354, 372, 373, 372, - 372, 374, 374, 374, 374, 374, 374, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - - 354, 354, 354, 354, 354, 354, 354, 354, 363, 354, - 375, 354, 364, 365, 354, 354, 354, 354, 354, 366, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 369, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 376, 354, 354, 354, 354, - 371, 354, 354, 354, 354, 354, 354, 354, 377, 354, - 378, 354, 354, 354, 372, 354, 354, 354, 354, 373, - 373, 354, 372, 379, 374, 374, 374, 374, 374, 374, - 380, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - - 354, 354, 354, 375, 354, 354, 381, 377, 377, 378, - 379, 380, 380, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 377, 377, 377, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 0, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354 + 351, 1, 352, 352, 353, 353, 354, 354, 355, 355, + 356, 356, 357, 357, 358, 358, 359, 359, 351, 351, + 351, 351, 351, 351, 351, 351, 360, 351, 351, 351, + 351, 361, 351, 351, 351, 362, 351, 351, 351, 351, + 351, 363, 351, 351, 351, 351, 364, 351, 351, 351, + 351, 351, 365, 366, 351, 351, 351, 367, 351, 351, + 351, 351, 368, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 369, 351, 351, 351, 370, 351, + 351, 371, 371, 371, 371, 371, 371, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + + 351, 351, 351, 351, 351, 351, 351, 351, 360, 351, + 372, 351, 361, 362, 351, 351, 351, 351, 351, 363, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 366, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 373, 351, 351, 351, 351, + 368, 351, 351, 351, 351, 351, 351, 351, 374, 351, + 375, 351, 351, 351, 369, 351, 351, 351, 351, 370, + 370, 351, 371, 371, 371, 371, 371, 371, 376, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + + 351, 372, 351, 351, 377, 374, 374, 375, 376, 376, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 374, 374, 374, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 0, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351 } ; -static yyconst short int yy_nxt[850] = +static yyconst short int yy_nxt[851] = { 0, 20, 21, 22, 23, 24, 20, 25, 26, 20, 20, 27, 28, 29, 29, 30, 31, 32, 33, 20, 20, @@ -495,96 +493,96 @@ static yyconst short int yy_nxt[850] = 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 34, 35, 20, 37, 38, 110, 37, 38, 111, 39, 89, 90, 39, - 43, 44, 45, 43, 44, 45, 91, 92, 240, 40, - 160, 41, 40, 161, 41, 55, 56, 57, 187, 46, - 47, 48, 46, 47, 48, 50, 51, 188, 50, 51, - 52, 112, 112, 52, 207, 58, 55, 56, 57, 115, - - 116, 117, 118, 353, 46, 53, 48, 46, 53, 48, - 60, 61, 60, 61, 352, 62, 58, 62, 83, 84, - 85, 121, 122, 86, 123, 124, 351, 87, 126, 127, + 43, 44, 45, 43, 44, 45, 91, 92, 237, 40, + 160, 41, 40, 161, 41, 55, 56, 57, 185, 46, + 47, 48, 46, 47, 48, 50, 51, 186, 50, 51, + 52, 112, 112, 52, 205, 58, 55, 56, 57, 115, + + 116, 117, 118, 350, 46, 53, 48, 46, 53, 48, + 60, 61, 60, 61, 349, 62, 58, 62, 83, 84, + 85, 121, 122, 86, 123, 124, 348, 87, 126, 127, 58, 171, 58, 64, 65, 66, 67, 46, 68, 48, - 128, 129, 69, 196, 83, 84, 85, 132, 133, 86, - 70, 197, 71, 87, 72, 134, 135, 147, 148, 149, + 128, 129, 69, 194, 83, 84, 85, 132, 133, 86, + 70, 195, 71, 87, 72, 134, 135, 147, 148, 149, 150, 152, 153, 46, 156, 48, 154, 155, 157, 162, - 350, 158, 158, 163, 172, 159, 164, 164, 73, 349, - 74, 64, 65, 66, 67, 215, 68, 166, 167, 216, - 69, 168, 169, 173, 176, 177, 174, 347, 70, 346, - - 71, 345, 72, 176, 178, 179, 177, 176, 177, 176, - 177, 176, 177, 89, 90, 91, 92, 180, 89, 90, - 181, 91, 92, 189, 112, 112, 73, 184, 74, 76, - 77, 78, 185, 79, 80, 219, 190, 198, 81, 193, - 191, 344, 194, 115, 116, 220, 199, 343, 46, 354, - 48, 76, 77, 78, 200, 79, 80, 117, 118, 342, + 347, 158, 158, 163, 172, 159, 164, 164, 73, 346, + 74, 64, 65, 66, 67, 212, 68, 166, 167, 213, + 69, 168, 169, 160, 174, 175, 161, 344, 70, 343, + + 71, 342, 72, 174, 176, 177, 175, 174, 175, 174, + 175, 174, 175, 89, 90, 91, 92, 178, 89, 90, + 179, 91, 92, 187, 112, 112, 73, 182, 74, 76, + 77, 78, 183, 79, 80, 216, 188, 196, 81, 191, + 189, 341, 192, 115, 116, 217, 197, 340, 46, 351, + 48, 76, 77, 78, 198, 79, 80, 117, 118, 339, 81, 115, 116, 117, 118, 121, 122, 123, 124, 171, - 46, 341, 48, 93, 121, 122, 123, 124, 126, 127, + 46, 338, 48, 93, 121, 122, 123, 124, 126, 127, 128, 129, 126, 127, 128, 129, 132, 133, 134, 135, - 132, 133, 354, 94, 340, 95, 96, 97, 134, 135, - - 147, 148, 98, 339, 99, 100, 101, 102, 103, 104, - 105, 106, 354, 107, 108, 137, 149, 150, 147, 148, - 149, 150, 338, 138, 152, 153, 154, 155, 152, 153, - 154, 155, 337, 137, 158, 158, 139, 140, 158, 158, - 336, 141, 164, 164, 164, 164, 166, 167, 142, 168, - 169, 143, 335, 144, 334, 145, 146, 166, 167, 168, - 169, 210, 176, 177, 210, 176, 178, 179, 177, 179, - 177, 176, 178, 176, 177, 176, 213, 224, 241, 210, - 210, 210, 242, 210, 277, 243, 243, 176, 213, 243, - 243, 209, 224, 333, 210, 209, 210, 282, 210, 277, - - 210, 179, 213, 243, 243, 225, 210, 332, 210, 209, - 291, 294, 282, 302, 348, 331, 330, 329, 328, 327, - 210, 326, 210, 325, 324, 291, 294, 323, 302, 348, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 49, 49, 49, 54, 54, 54, 54, - 54, 54, 54, 54, 54, 54, 54, 54, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, - - 63, 63, 75, 75, 75, 75, 75, 75, 75, 75, - 75, 75, 75, 75, 82, 82, 82, 82, 82, 82, - 82, 82, 82, 82, 82, 82, 109, 109, 113, 113, - 113, 113, 113, 113, 113, 113, 113, 322, 113, 113, - 114, 321, 320, 114, 114, 114, 319, 114, 114, 114, - 318, 114, 120, 317, 316, 315, 120, 120, 120, 120, - 120, 120, 125, 314, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 130, 313, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 131, 312, 311, 310, - 131, 131, 131, 131, 131, 131, 131, 136, 309, 136, - - 136, 136, 136, 136, 136, 136, 136, 136, 136, 151, - 308, 307, 306, 305, 151, 151, 151, 151, 151, 304, - 151, 165, 303, 301, 165, 165, 300, 165, 165, 165, - 165, 299, 165, 170, 298, 297, 170, 170, 170, 170, - 170, 170, 170, 170, 170, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 296, 175, 204, 295, 204, - 204, 204, 204, 204, 204, 204, 204, 204, 204, 208, - 293, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 208, 210, 292, 210, 210, 210, 210, 210, 210, 210, - 210, 210, 210, 211, 290, 211, 211, 211, 211, 211, - - 211, 211, 211, 211, 211, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 289, 288, 287, - 286, 285, 284, 283, 281, 280, 279, 278, 276, 275, - 274, 273, 272, 271, 270, 269, 209, 268, 267, 266, - 265, 264, 263, 262, 261, 260, 259, 258, 257, 256, - 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, - 245, 244, 209, 239, 238, 237, 236, 235, 234, 233, - 232, 231, 230, 229, 228, 227, 226, 223, 222, 221, - 218, 217, 214, 209, 206, 205, 203, 202, 201, 195, - 192, 186, 183, 182, 88, 119, 88, 354, 19, 354, - - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354 + 132, 133, 351, 94, 337, 95, 96, 97, 134, 135, + + 147, 148, 98, 336, 99, 100, 101, 102, 103, 104, + 105, 106, 351, 107, 108, 137, 149, 150, 147, 148, + 149, 150, 335, 138, 152, 153, 154, 155, 152, 153, + 154, 155, 334, 137, 158, 158, 139, 140, 158, 158, + 333, 141, 164, 164, 164, 164, 166, 167, 142, 168, + 169, 143, 332, 144, 331, 145, 146, 166, 167, 168, + 169, 174, 175, 174, 176, 177, 175, 177, 175, 174, + 176, 174, 175, 174, 210, 221, 238, 174, 210, 330, + 239, 177, 210, 240, 240, 240, 240, 240, 240, 207, + 221, 207, 208, 207, 208, 274, 208, 279, 208, 288, + + 208, 291, 208, 222, 299, 345, 329, 328, 327, 326, + 274, 325, 279, 324, 288, 323, 291, 322, 321, 299, + 345, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 42, 42, 42, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, + 54, 54, 54, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 63, 63, 75, + + 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, + 75, 75, 82, 82, 82, 82, 82, 82, 82, 82, + 82, 82, 82, 82, 82, 109, 109, 113, 113, 113, + 113, 113, 113, 113, 113, 113, 113, 320, 113, 113, + 114, 319, 318, 114, 114, 114, 114, 317, 114, 114, + 114, 316, 114, 120, 315, 314, 313, 120, 120, 120, + 120, 120, 120, 120, 125, 312, 125, 125, 125, 125, + 125, 125, 125, 125, 125, 125, 125, 130, 311, 130, + 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, + 131, 310, 309, 308, 131, 131, 131, 131, 131, 131, + + 131, 131, 136, 307, 136, 136, 136, 136, 136, 136, + 136, 136, 136, 136, 136, 151, 306, 305, 304, 303, + 151, 302, 151, 151, 151, 151, 301, 151, 165, 300, + 298, 297, 165, 296, 295, 165, 165, 165, 165, 294, + 165, 170, 293, 292, 170, 170, 170, 170, 170, 170, + 170, 170, 170, 170, 173, 173, 173, 173, 173, 173, + 173, 173, 173, 173, 173, 290, 173, 202, 289, 202, + 202, 202, 202, 202, 202, 202, 202, 202, 202, 202, + 206, 287, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 208, 286, 208, 208, 208, 208, 208, + + 208, 208, 208, 208, 208, 208, 209, 209, 209, 209, + 209, 209, 209, 209, 209, 209, 209, 209, 209, 285, + 284, 283, 282, 281, 280, 278, 277, 276, 275, 273, + 272, 271, 270, 269, 268, 267, 266, 207, 265, 264, + 263, 262, 261, 260, 259, 258, 257, 256, 255, 254, + 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, + 243, 242, 241, 207, 236, 235, 234, 233, 232, 231, + 230, 229, 228, 227, 226, 225, 224, 223, 220, 219, + 218, 215, 214, 211, 207, 204, 203, 201, 200, 199, + 193, 190, 184, 181, 180, 88, 119, 88, 351, 19, + + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351 } ; -static yyconst short int yy_chk[850] = +static yyconst short int yy_chk[851] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -592,93 +590,93 @@ static yyconst short int yy_chk[850] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 28, 4, 4, 28, 3, 22, 22, 4, - 5, 5, 5, 6, 6, 6, 23, 23, 381, 3, + 5, 5, 5, 6, 6, 6, 23, 23, 377, 3, 69, 3, 4, 69, 4, 9, 9, 9, 98, 5, 5, 5, 6, 6, 6, 7, 7, 98, 8, 8, - 7, 29, 29, 8, 376, 9, 10, 10, 10, 37, + 7, 29, 29, 8, 373, 9, 10, 10, 10, 37, - 37, 38, 38, 352, 7, 7, 7, 8, 8, 8, - 11, 11, 12, 12, 351, 11, 10, 12, 17, 17, - 17, 43, 43, 17, 44, 44, 350, 17, 50, 50, + 37, 38, 38, 349, 7, 7, 7, 8, 8, 8, + 11, 11, 12, 12, 348, 11, 10, 12, 17, 17, + 17, 43, 43, 17, 44, 44, 347, 17, 50, 50, 11, 79, 12, 13, 13, 13, 13, 17, 13, 17, 51, 51, 13, 103, 18, 18, 18, 55, 55, 18, 13, 103, 13, 18, 13, 56, 56, 60, 60, 61, 61, 64, 64, 18, 67, 18, 65, 65, 67, 70, - 349, 67, 67, 70, 79, 67, 70, 70, 13, 348, - 13, 14, 14, 14, 14, 183, 14, 76, 76, 183, - 14, 77, 77, 81, 82, 82, 81, 345, 14, 341, + 346, 67, 67, 70, 79, 67, 70, 70, 13, 345, + 13, 14, 14, 14, 14, 181, 14, 76, 76, 181, + 14, 77, 77, 81, 82, 82, 81, 342, 14, 338, - 14, 339, 14, 83, 83, 84, 84, 85, 85, 86, + 14, 336, 14, 83, 83, 84, 84, 85, 85, 86, 86, 87, 87, 89, 89, 90, 90, 87, 91, 91, 87, 92, 92, 99, 112, 112, 14, 96, 14, 15, - 15, 15, 96, 15, 15, 186, 99, 104, 15, 101, - 99, 338, 101, 115, 115, 186, 104, 337, 15, 170, - 15, 16, 16, 16, 104, 16, 16, 116, 116, 336, + 15, 15, 96, 15, 15, 184, 99, 104, 15, 101, + 99, 335, 101, 115, 115, 184, 104, 334, 15, 170, + 15, 16, 16, 16, 104, 16, 16, 116, 116, 333, 16, 117, 117, 118, 118, 121, 121, 122, 122, 171, - 16, 335, 16, 25, 123, 123, 124, 124, 126, 126, + 16, 332, 16, 25, 123, 123, 124, 124, 126, 126, 127, 127, 128, 128, 129, 129, 132, 132, 133, 133, - 134, 134, 170, 25, 334, 25, 25, 25, 135, 135, + 134, 134, 170, 25, 331, 25, 25, 25, 135, 135, - 147, 147, 25, 333, 25, 25, 25, 25, 25, 25, + 147, 147, 25, 330, 25, 25, 25, 25, 25, 25, 25, 25, 171, 25, 25, 58, 148, 148, 149, 149, - 150, 150, 332, 58, 152, 152, 153, 153, 154, 154, - 155, 155, 331, 58, 157, 157, 58, 58, 158, 158, - 330, 58, 163, 163, 164, 164, 166, 166, 58, 167, - 167, 58, 328, 58, 327, 58, 58, 168, 168, 169, - 169, 174, 175, 175, 174, 176, 176, 177, 177, 178, - 178, 179, 179, 180, 180, 181, 181, 190, 209, 174, - 211, 174, 209, 211, 253, 209, 209, 212, 212, 242, - 242, 209, 190, 326, 181, 242, 181, 259, 211, 253, - - 211, 213, 213, 243, 243, 190, 212, 325, 212, 243, - 272, 275, 259, 286, 346, 323, 320, 319, 318, 317, - 213, 316, 213, 314, 313, 272, 275, 312, 286, 346, - 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, - 355, 355, 356, 356, 356, 356, 356, 356, 356, 356, - 356, 356, 356, 356, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 358, 358, 358, 358, - 358, 358, 358, 358, 358, 358, 358, 358, 359, 359, - 359, 359, 359, 359, 359, 359, 359, 359, 359, 359, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - - 360, 360, 361, 361, 361, 361, 361, 361, 361, 361, - 361, 361, 361, 361, 362, 362, 362, 362, 362, 362, - 362, 362, 362, 362, 362, 362, 363, 363, 364, 364, - 364, 364, 364, 364, 364, 364, 364, 311, 364, 364, - 365, 310, 309, 365, 365, 365, 308, 365, 365, 365, - 307, 365, 366, 306, 305, 303, 366, 366, 366, 366, - 366, 366, 367, 302, 367, 367, 367, 367, 367, 367, - 367, 367, 367, 367, 368, 301, 368, 368, 368, 368, - 368, 368, 368, 368, 368, 368, 369, 300, 298, 297, - 369, 369, 369, 369, 369, 369, 369, 370, 296, 370, - - 370, 370, 370, 370, 370, 370, 370, 370, 370, 371, - 295, 294, 293, 291, 371, 371, 371, 371, 371, 290, - 371, 372, 288, 284, 372, 372, 282, 372, 372, 372, - 372, 281, 372, 373, 279, 278, 373, 373, 373, 373, - 373, 373, 373, 373, 373, 374, 374, 374, 374, 374, - 374, 374, 374, 374, 374, 277, 374, 375, 276, 375, - 375, 375, 375, 375, 375, 375, 375, 375, 375, 377, - 274, 377, 377, 377, 377, 377, 377, 377, 377, 377, - 377, 378, 273, 378, 378, 378, 378, 378, 378, 378, - 378, 378, 378, 379, 271, 379, 379, 379, 379, 379, - - 379, 379, 379, 379, 379, 380, 380, 380, 380, 380, - 380, 380, 380, 380, 380, 380, 380, 269, 267, 266, - 264, 262, 261, 260, 257, 256, 255, 254, 252, 250, - 249, 248, 247, 246, 245, 244, 241, 238, 237, 236, - 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, - 225, 224, 223, 222, 221, 220, 219, 218, 217, 216, - 215, 214, 208, 206, 203, 202, 201, 200, 199, 198, - 197, 196, 195, 194, 193, 192, 191, 189, 188, 187, - 185, 184, 182, 159, 138, 113, 107, 106, 105, 102, - 100, 97, 95, 94, 88, 39, 21, 19, 354, 354, - + 150, 150, 329, 58, 152, 152, 153, 153, 154, 154, + 155, 155, 328, 58, 157, 157, 58, 58, 158, 158, + 327, 58, 163, 163, 164, 164, 166, 166, 58, 167, + 167, 58, 325, 58, 324, 58, 58, 168, 168, 169, + 169, 173, 173, 174, 174, 175, 175, 176, 176, 177, + 177, 178, 178, 179, 179, 188, 207, 209, 209, 323, + 207, 210, 210, 207, 207, 239, 239, 240, 240, 207, + 188, 239, 179, 240, 179, 250, 209, 256, 209, 269, + + 210, 272, 210, 188, 283, 343, 322, 320, 317, 316, + 250, 315, 256, 314, 269, 313, 272, 311, 310, 283, + 343, 352, 352, 352, 352, 352, 352, 352, 352, 352, + 352, 352, 352, 352, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354 + 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, + 355, 355, 355, 356, 356, 356, 356, 356, 356, 356, + 356, 356, 356, 356, 356, 356, 357, 357, 357, 357, + 357, 357, 357, 357, 357, 357, 357, 357, 357, 358, + + 358, 358, 358, 358, 358, 358, 358, 358, 358, 358, + 358, 358, 359, 359, 359, 359, 359, 359, 359, 359, + 359, 359, 359, 359, 359, 360, 360, 361, 361, 361, + 361, 361, 361, 361, 361, 361, 361, 309, 361, 361, + 362, 308, 307, 362, 362, 362, 362, 306, 362, 362, + 362, 305, 362, 363, 304, 303, 302, 363, 363, 363, + 363, 363, 363, 363, 364, 300, 364, 364, 364, 364, + 364, 364, 364, 364, 364, 364, 364, 365, 299, 365, + 365, 365, 365, 365, 365, 365, 365, 365, 365, 365, + 366, 298, 297, 295, 366, 366, 366, 366, 366, 366, + + 366, 366, 367, 294, 367, 367, 367, 367, 367, 367, + 367, 367, 367, 367, 367, 368, 293, 292, 291, 290, + 368, 288, 368, 368, 368, 368, 287, 368, 369, 285, + 281, 279, 369, 278, 276, 369, 369, 369, 369, 275, + 369, 370, 274, 273, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 371, 371, 371, 371, 371, 371, + 371, 371, 371, 371, 371, 271, 371, 372, 270, 372, + 372, 372, 372, 372, 372, 372, 372, 372, 372, 372, + 374, 268, 374, 374, 374, 374, 374, 374, 374, 374, + 374, 374, 374, 375, 266, 375, 375, 375, 375, 375, + + 375, 375, 375, 375, 375, 375, 376, 376, 376, 376, + 376, 376, 376, 376, 376, 376, 376, 376, 376, 264, + 263, 261, 259, 258, 257, 254, 253, 252, 251, 249, + 247, 246, 245, 244, 243, 242, 241, 238, 235, 234, + 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, + 223, 222, 221, 220, 219, 218, 217, 216, 215, 214, + 213, 212, 211, 206, 204, 201, 200, 199, 198, 197, + 196, 195, 194, 193, 192, 191, 190, 189, 187, 186, + 185, 183, 182, 180, 159, 138, 113, 107, 106, 105, + 102, 100, 97, 95, 94, 88, 39, 21, 19, 351, + + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351, + 351, 351, 351, 351, 351, 351, 351, 351, 351, 351 } ; static yy_state_type yy_last_accepting_state; @@ -804,7 +802,7 @@ static void handle_at PARAMS ((char *cp)); #define SC_PROLOGUE 7 #define SC_EPILOGUE 8 -#line 808 "scan-gram.c" +#line 806 "scan-gram.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -989,7 +987,7 @@ YY_DECL /*----------------------------. | Scanning Bison directives. | `----------------------------*/ -#line 993 "scan-gram.c" +#line 991 "scan-gram.c" if ( yy_init ) { @@ -1040,13 +1038,13 @@ 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 >= 355 ) + if ( yy_current_state >= 352 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 799 ); + while ( yy_base[yy_current_state] != 800 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1798,7 +1796,7 @@ YY_RULE_SETUP #line 508 "scan-gram.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1802 "scan-gram.c" +#line 1800 "scan-gram.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2090,7 +2088,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 >= 355 ) + if ( yy_current_state >= 352 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2125,11 +2123,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 >= 355 ) + if ( yy_current_state >= 352 ) 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 == 354); + yy_is_jam = (yy_current_state == 351); return yy_is_jam ? 0 : yy_current_state; } diff --git a/src/scan-gram.l b/src/scan-gram.l index 4cc1b060..855fe6a1 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -440,7 +440,7 @@ blanks [ \t\f]+ "$"("<".*">")?(-?[0-9]+|"$") { handle_dollar (yytext); } "@"(-?[0-9]+|"$") { handle_at (yytext); } - [^\[\]$/\'\"@\{\}\n\r]+ YY_OBS_GROW; + [^$@\[\]/\'\"\{\}\n\r]+ YY_OBS_GROW; {eols} YY_OBS_GROW; YY_LINES; /* A lose $, or /, or etc. */ @@ -471,7 +471,7 @@ blanks [ \t\f]+ return PROLOGUE; } - [^\[\]%\n\r]+ YY_OBS_GROW; + [^%\[\]/\'\"\n\r]+ YY_OBS_GROW; "%"+[^%\}\n\r]+ YY_OBS_GROW; {eols} YY_OBS_GROW; YY_LINES; diff --git a/tests/input.at b/tests/input.at index 9c223d37..548032de 100644 --- a/tests/input.at +++ b/tests/input.at @@ -1,5 +1,5 @@ # Checking the output filenames. -*- Autotest -*- -# Copyright 2002 Free Software Foundation, Inc. +# Copyright (C) 2002 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,6 +20,31 @@ AT_BANNER([[Input Processing.]]) # Mostly test that we are robust to mistakes. + +## ----------------------- ## +## Torturing the Scanner. ## +## ----------------------- ## + +AT_SETUP([Torturing the Scanner]) + +AT_DATA([input.y], +[[%{ +/* This is seen in GCC: a %{ and %} in middle of a comment. */ +const char *foo = "So %{ and %} can be here."; +%} +/* %{ and %} can be here too. */ + +%% +exp: 'a'; +]]) + +AT_CHECK([bison input.y]) + +AT_CLEANUP + + + + ## ------------ ## ## Invalid $n. ## ## ------------ ## -- 2.47.2