diff options
| -rw-r--r-- | utils/TableGen/FileLexer.cpp.cvs | 329 | ||||
| -rw-r--r-- | utils/TableGen/FileLexer.l.cvs | 2 | ||||
| -rw-r--r-- | utils/TableGen/FileParser.cpp.cvs | 785 | ||||
| -rw-r--r-- | utils/TableGen/FileParser.h.cvs | 27 | ||||
| -rw-r--r-- | utils/TableGen/FileParser.y.cvs | 238 |
5 files changed, 890 insertions, 491 deletions
diff --git a/utils/TableGen/FileLexer.cpp.cvs b/utils/TableGen/FileLexer.cpp.cvs index 9a37d20b4f..dffd220a44 100644 --- a/utils/TableGen/FileLexer.cpp.cvs +++ b/utils/TableGen/FileLexer.cpp.cvs @@ -306,40 +306,43 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 32 -#define YY_END_OF_BUFFER 33 -static yyconst short int yy_acclist[130] = +#define YY_NUM_RULES 34 +#define YY_END_OF_BUFFER 35 +static yyconst short int yy_acclist[145] = { 0, - 26, 26, 33, 31, 32, 24, 31, 32, 24, 32, - 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, - 23, 31, 32, 23, 31, 32, 20, 31, 32, 31, - 32, 20, 31, 32, 20, 31, 32, 20, 31, 32, - 20, 31, 32, 20, 31, 32, 20, 31, 32, 20, - 31, 32, 26, 32, 27, 32, 29, 32, 24, 22, - 21, 23, 25, 1, 20, 20, 20, 20, 20, 20, - 20, 15, 20, 20, 20, 20, 26, 27, 27, 30, - 29, 28, 29, 21, 1, 23, 23, 5, 20, 20, - 20, 10, 20, 12, 20, 20, 20, 4, 20, 14, - - 20, 20, 20, 18, 16, 17, 3, 6, 20, 20, - 9, 20, 20, 20, 8, 20, 20, 11, 20, 13, - 20, 20, 20, 20, 7, 20, 20, 19, 2 + 28, 28, 35, 33, 34, 26, 33, 34, 26, 34, + 33, 34, 33, 34, 33, 34, 33, 34, 33, 34, + 25, 33, 34, 25, 33, 34, 22, 33, 34, 33, + 34, 22, 33, 34, 22, 33, 34, 22, 33, 34, + 22, 33, 34, 22, 33, 34, 22, 33, 34, 22, + 33, 34, 22, 33, 34, 28, 34, 29, 34, 31, + 34, 26, 24, 23, 25, 27, 1, 22, 22, 22, + 22, 22, 22, 22, 17, 22, 22, 22, 22, 22, + 28, 29, 29, 32, 31, 30, 31, 23, 1, 25, + 25, 5, 22, 22, 22, 10, 22, 12, 22, 22, + + 22, 4, 22, 16, 22, 22, 22, 22, 20, 18, + 19, 3, 6, 22, 22, 9, 22, 13, 22, 22, + 22, 8, 22, 22, 22, 11, 22, 15, 22, 22, + 22, 22, 22, 22, 7, 22, 22, 22, 22, 22, + 21, 2, 14, 22 } ; -static yyconst short int yy_accept[109] = +static yyconst short int yy_accept[120] = { 0, 1, 1, 1, 2, 3, 4, 6, 9, 11, 13, 15, 17, 19, 21, 24, 27, 30, 32, 35, 38, - 41, 44, 47, 50, 53, 55, 57, 59, 60, 60, - 60, 61, 62, 63, 64, 65, 65, 65, 66, 66, - 67, 68, 69, 70, 71, 72, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 84, 84, 84, - 85, 86, 87, 88, 88, 88, 90, 91, 92, 94, - 96, 97, 98, 100, 102, 103, 104, 105, 106, 107, - 107, 107, 108, 110, 111, 113, 114, 115, 117, 118, - 118, 120, 122, 123, 124, 124, 125, 127, 127, 128, - - 128, 128, 128, 128, 129, 129, 130, 130 + 41, 44, 47, 50, 53, 56, 58, 60, 62, 63, + 63, 63, 64, 65, 66, 67, 68, 68, 68, 69, + 69, 70, 71, 72, 73, 74, 75, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 88, + 88, 88, 89, 90, 91, 92, 92, 92, 94, 95, + 96, 98, 100, 101, 102, 104, 106, 107, 108, 109, + 110, 111, 112, 112, 112, 113, 115, 116, 118, 120, + 121, 122, 124, 125, 126, 126, 128, 130, 131, 132, + + 133, 133, 134, 135, 137, 137, 138, 139, 139, 139, + 140, 140, 140, 141, 142, 142, 143, 145, 145 } ; static yyconst int yy_ec[256] = @@ -355,9 +358,9 @@ static yyconst int yy_ec[256] = 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 16, 1, 17, 1, 15, 1, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 15, 15, 27, 15, 28, - 29, 15, 15, 30, 31, 32, 33, 15, 15, 34, - 15, 15, 35, 1, 36, 1, 1, 1, 1, 1, + 22, 23, 24, 25, 26, 15, 15, 27, 28, 29, + 30, 15, 15, 31, 32, 33, 34, 15, 15, 35, + 15, 15, 36, 1, 37, 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, @@ -374,108 +377,114 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[37] = +static yyconst int yy_meta[38] = { 0, 1, 1, 2, 1, 1, 1, 1, 3, 1, 3, 4, 4, 4, 5, 6, 1, 1, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 1, 1 + 6, 6, 6, 6, 6, 1, 1 } ; -static yyconst short int yy_base[121] = +static yyconst short int yy_base[132] = { 0, - 0, 0, 29, 30, 207, 208, 39, 42, 175, 199, - 0, 36, 42, 42, 45, 0, 169, 177, 33, 41, - 176, 173, 42, 168, 0, 57, 61, 70, 45, 193, - 208, 0, 67, 208, 0, 70, 0, 0, 162, 165, - 178, 174, 170, 170, 170, 63, 159, 159, 159, 0, - 76, 77, 208, 80, 208, 81, 161, 74, 157, 0, - 0, 82, 0, 150, 168, 153, 152, 160, 0, 0, - 154, 153, 0, 0, 147, 152, 208, 208, 208, 157, - 140, 208, 0, 144, 0, 153, 140, 0, 144, 142, - 0, 0, 149, 145, 140, 145, 0, 122, 94, 104, - - 96, 68, 60, 208, 45, 208, 208, 102, 108, 110, - 113, 119, 125, 131, 134, 140, 143, 148, 154, 160 + 0, 0, 30, 31, 218, 219, 40, 43, 185, 210, + 0, 37, 43, 43, 46, 0, 179, 188, 33, 43, + 187, 183, 42, 177, 177, 0, 59, 62, 71, 46, + 203, 219, 0, 69, 219, 0, 72, 0, 0, 171, + 174, 188, 184, 180, 180, 180, 56, 168, 168, 172, + 167, 0, 77, 78, 219, 82, 219, 83, 170, 76, + 165, 0, 0, 84, 0, 158, 177, 161, 160, 169, + 0, 162, 162, 161, 0, 0, 154, 153, 159, 219, + 219, 219, 164, 146, 219, 0, 150, 0, 0, 160, + 146, 0, 153, 149, 147, 0, 0, 155, 155, 150, + + 144, 150, 144, 0, 150, 95, 151, 126, 98, 92, + 69, 93, 34, 219, 46, 219, 0, 219, 104, 110, + 112, 115, 121, 127, 133, 136, 142, 145, 150, 156, + 162 } ; -static yyconst short int yy_def[121] = +static yyconst short int yy_def[132] = { 0, - 107, 1, 108, 108, 107, 107, 107, 107, 107, 109, - 110, 107, 107, 107, 107, 111, 107, 111, 111, 111, - 111, 111, 111, 111, 112, 113, 114, 107, 107, 109, - 107, 115, 107, 107, 116, 107, 117, 111, 118, 111, - 111, 111, 111, 111, 111, 111, 111, 111, 111, 112, - 113, 113, 107, 114, 107, 114, 107, 107, 107, 115, - 116, 107, 117, 118, 119, 111, 111, 111, 111, 111, - 111, 111, 111, 111, 111, 111, 107, 107, 107, 107, - 118, 107, 111, 111, 111, 111, 111, 111, 111, 107, - 111, 111, 111, 111, 107, 111, 111, 107, 111, 107, - - 107, 107, 120, 107, 120, 107, 0, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107 + 118, 1, 119, 119, 118, 118, 118, 118, 118, 120, + 121, 118, 118, 118, 118, 122, 118, 122, 122, 122, + 122, 122, 122, 122, 122, 123, 124, 125, 118, 118, + 120, 118, 126, 118, 118, 127, 118, 128, 122, 129, + 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, + 122, 123, 124, 124, 118, 125, 118, 125, 118, 118, + 118, 126, 127, 118, 128, 129, 130, 122, 122, 122, + 122, 122, 122, 122, 122, 122, 122, 122, 122, 118, + 118, 118, 118, 129, 118, 122, 122, 122, 122, 122, + 122, 122, 122, 122, 118, 122, 122, 122, 122, 122, + + 118, 122, 122, 122, 118, 122, 122, 118, 118, 122, + 118, 131, 122, 118, 131, 118, 122, 0, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118 } ; -static yyconst short int yy_nxt[245] = +static yyconst short int yy_nxt[257] = { 0, 6, 7, 8, 7, 9, 10, 11, 6, 12, 13, 14, 15, 15, 16, 16, 17, 6, 16, 18, 19, - 20, 16, 21, 16, 16, 22, 23, 16, 16, 16, - 24, 16, 16, 16, 6, 6, 26, 26, 27, 27, - 28, 28, 28, 28, 28, 28, 33, 33, 33, 34, - 106, 35, 33, 33, 33, 33, 33, 33, 43, 41, - 36, 42, 44, 47, 52, 106, 53, 48, 55, 57, - 56, 28, 28, 28, 58, 37, 59, 33, 33, 33, - 62, 62, 72, 107, 52, 107, 53, 107, 107, 107, - 56, 78, 62, 62, 73, 101, 101, 101, 101, 104, - - 79, 103, 25, 25, 25, 25, 25, 25, 30, 30, - 30, 30, 30, 30, 32, 32, 38, 38, 38, 50, - 50, 102, 50, 50, 50, 51, 51, 51, 51, 51, - 51, 54, 54, 54, 54, 54, 54, 60, 60, 60, - 61, 100, 61, 61, 61, 61, 63, 63, 64, 64, - 64, 64, 64, 64, 81, 81, 81, 81, 81, 81, - 105, 105, 105, 105, 105, 105, 99, 98, 97, 96, - 95, 94, 93, 92, 91, 65, 90, 89, 88, 87, - 86, 85, 84, 83, 82, 65, 80, 77, 76, 75, - 74, 71, 70, 69, 68, 67, 66, 65, 31, 49, - - 46, 45, 40, 39, 31, 29, 107, 5, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107 + 20, 16, 21, 16, 16, 22, 23, 24, 16, 16, + 16, 25, 16, 16, 16, 6, 6, 27, 27, 28, + 28, 29, 29, 29, 29, 29, 29, 34, 34, 34, + 35, 116, 36, 34, 34, 34, 34, 34, 34, 42, + 44, 37, 43, 48, 45, 117, 54, 49, 55, 57, + 59, 58, 29, 29, 29, 74, 60, 38, 61, 34, + 34, 34, 64, 64, 118, 54, 118, 55, 75, 118, + 118, 118, 58, 81, 64, 64, 109, 109, 116, 109, + + 109, 114, 82, 112, 26, 26, 26, 26, 26, 26, + 31, 31, 31, 31, 31, 31, 33, 33, 39, 39, + 39, 52, 52, 113, 52, 52, 52, 53, 53, 53, + 53, 53, 53, 56, 56, 56, 56, 56, 56, 62, + 62, 62, 63, 111, 63, 63, 63, 63, 65, 65, + 66, 66, 66, 66, 66, 66, 84, 84, 84, 84, + 84, 84, 115, 115, 115, 115, 115, 115, 110, 108, + 107, 106, 105, 104, 103, 102, 101, 100, 99, 98, + 97, 96, 67, 95, 94, 93, 92, 91, 90, 89, + 88, 87, 86, 85, 67, 83, 80, 79, 78, 77, + + 76, 73, 72, 71, 70, 69, 68, 67, 32, 51, + 50, 47, 46, 41, 40, 32, 30, 118, 5, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118 } ; -static yyconst short int yy_chk[245] = +static yyconst short int yy_chk[257] = { 0, 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, 1, 3, 4, 3, 4, - 7, 7, 7, 8, 8, 8, 12, 12, 12, 13, - 105, 13, 14, 14, 14, 15, 15, 15, 20, 19, - 14, 19, 20, 23, 26, 103, 26, 23, 27, 29, - 27, 28, 28, 28, 29, 14, 29, 33, 33, 33, - 36, 36, 46, 51, 52, 51, 52, 54, 56, 54, - 56, 58, 62, 62, 46, 99, 99, 101, 101, 102, - - 58, 101, 108, 108, 108, 108, 108, 108, 109, 109, - 109, 109, 109, 109, 110, 110, 111, 111, 111, 112, - 112, 100, 112, 112, 112, 113, 113, 113, 113, 113, - 113, 114, 114, 114, 114, 114, 114, 115, 115, 115, - 116, 98, 116, 116, 116, 116, 117, 117, 118, 118, - 118, 118, 118, 118, 119, 119, 119, 119, 119, 119, - 120, 120, 120, 120, 120, 120, 96, 95, 94, 93, - 90, 89, 87, 86, 84, 81, 80, 76, 75, 72, - 71, 68, 67, 66, 65, 64, 59, 57, 49, 48, - 47, 45, 44, 43, 42, 41, 40, 39, 30, 24, - - 22, 21, 18, 17, 10, 9, 5, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, - 107, 107, 107, 107 + 1, 1, 1, 1, 1, 1, 1, 3, 4, 3, + 4, 7, 7, 7, 8, 8, 8, 12, 12, 12, + 13, 115, 13, 14, 14, 14, 15, 15, 15, 19, + 20, 14, 19, 23, 20, 113, 27, 23, 27, 28, + 30, 28, 29, 29, 29, 47, 30, 14, 30, 34, + 34, 34, 37, 37, 53, 54, 53, 54, 47, 56, + 58, 56, 58, 60, 64, 64, 106, 106, 112, 109, + + 109, 111, 60, 109, 119, 119, 119, 119, 119, 119, + 120, 120, 120, 120, 120, 120, 121, 121, 122, 122, + 122, 123, 123, 110, 123, 123, 123, 124, 124, 124, + 124, 124, 124, 125, 125, 125, 125, 125, 125, 126, + 126, 126, 127, 108, 127, 127, 127, 127, 128, 128, + 129, 129, 129, 129, 129, 129, 130, 130, 130, 130, + 130, 130, 131, 131, 131, 131, 131, 131, 107, 105, + 103, 102, 101, 100, 99, 98, 95, 94, 93, 91, + 90, 87, 84, 83, 79, 78, 77, 74, 73, 72, + 70, 69, 68, 67, 66, 61, 59, 51, 50, 49, + + 48, 46, 45, 44, 43, 42, 41, 40, 31, 25, + 24, 22, 21, 18, 17, 10, 9, 5, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -651,7 +660,7 @@ int yywrap(void) { using namespace llvm; -#line 655 "Lexer.cpp" +#line 664 "Lexer.cpp" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -805,7 +814,7 @@ YY_DECL #line 180 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -#line 809 "Lexer.cpp" +#line 818 "Lexer.cpp" if ( yy_init ) { @@ -853,14 +862,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 >= 108 ) + if ( yy_current_state >= 119 ) 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_current_state != 107 ); + while ( yy_current_state != 118 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -960,111 +969,121 @@ YY_RULE_SETUP case 13: YY_RULE_SETUP #line 198 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ return FIELD; } +{ return DEFM; } YY_BREAK case 14: YY_RULE_SETUP #line 199 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ return LET; } +{ return MULTICLASS; } YY_BREAK case 15: YY_RULE_SETUP #line 200 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ return IN; } +{ return FIELD; } YY_BREAK case 16: YY_RULE_SETUP -#line 202 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ return SRATOK; } +#line 201 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +{ return LET; } YY_BREAK case 17: YY_RULE_SETUP -#line 203 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ return SRLTOK; } +#line 202 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +{ return IN; } YY_BREAK case 18: YY_RULE_SETUP #line 204 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ return SHLTOK; } +{ return SRATOK; } YY_BREAK case 19: YY_RULE_SETUP #line 205 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ return STRCONCATTOK; } +{ return SRLTOK; } YY_BREAK case 20: YY_RULE_SETUP -#line 208 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ Filelval.StrVal = new std::string(yytext, yytext+yyleng); - return ID; } +#line 206 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +{ return SHLTOK; } YY_BREAK case 21: YY_RULE_SETUP -#line 210 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ Filelval.StrVal = new std::string(yytext+1, yytext+yyleng); - return VARNAME; } +#line 207 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +{ return STRCONCATTOK; } YY_BREAK case 22: YY_RULE_SETUP -#line 213 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ Filelval.StrVal = new std::string(yytext+1, yytext+yyleng-1); - return STRVAL; } +#line 210 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +{ Filelval.StrVal = new std::string(yytext, yytext+yyleng); + return ID; } YY_BREAK case 23: YY_RULE_SETUP -#line 216 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ Filelval.IntVal = ParseInt(Filetext); return INTVAL; } +#line 212 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +{ Filelval.StrVal = new std::string(yytext+1, yytext+yyleng); + return VARNAME; } YY_BREAK case 24: YY_RULE_SETUP -#line 218 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ /* Ignore whitespace */ } +#line 215 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +{ Filelval.StrVal = new std::string(yytext+1, yytext+yyleng-1); + return STRVAL; } YY_BREAK case 25: YY_RULE_SETUP -#line 221 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ BEGIN(comment); CommentDepth++; } +#line 218 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +{ Filelval.IntVal = ParseInt(Filetext); return INTVAL; } YY_BREAK case 26: YY_RULE_SETUP -#line 222 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{} /* eat anything that's not a '*' or '/' */ +#line 220 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +{ /* Ignore whitespace */ } YY_BREAK case 27: YY_RULE_SETUP #line 223 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{} /* eat up '*'s not followed by '/'s */ +{ BEGIN(comment); CommentDepth++; } YY_BREAK case 28: YY_RULE_SETUP #line 224 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{ ++CommentDepth; } +{} /* eat anything that's not a '*' or '/' */ YY_BREAK case 29: YY_RULE_SETUP #line 225 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" -{} /* eat up /'s not followed by *'s */ +{} /* eat up '*'s not followed by '/'s */ YY_BREAK case 30: YY_RULE_SETUP #line 226 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +{ ++CommentDepth; } + YY_BREAK +case 31: +YY_RULE_SETUP +#line 227 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +{} /* eat up /'s not followed by *'s */ + YY_BREAK +case 32: +YY_RULE_SETUP +#line 228 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" { if (!--CommentDepth) { BEGIN(INITIAL); } } YY_BREAK case YY_STATE_EOF(comment): -#line 227 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +#line 229 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" { err() << "Unterminated comment!\n"; exit(1); } YY_BREAK -case 31: +case 33: YY_RULE_SETUP -#line 229 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +#line 231 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" { return Filetext[0]; } YY_BREAK -case 32: +case 34: YY_RULE_SETUP -#line 231 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +#line 233 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1068 "Lexer.cpp" +#line 1087 "Lexer.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1353,7 +1372,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 >= 108 ) + if ( yy_current_state >= 119 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1383,11 +1402,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 >= 108 ) + if ( yy_current_state >= 119 ) 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 == 107); + yy_is_jam = (yy_current_state == 118); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -1948,6 +1967,6 @@ int main() return 0; } #endif -#line 231 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" +#line 233 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileLexer.l" diff --git a/utils/TableGen/FileLexer.l.cvs b/utils/TableGen/FileLexer.l.cvs index 3b60099bc1..7c9151f00f 100644 --- a/utils/TableGen/FileLexer.l.cvs +++ b/utils/TableGen/FileLexer.l.cvs @@ -195,6 +195,8 @@ dag { return DAG; } class { return CLASS; } def { return DEF; } +defm { return DEFM; } +multiclass { return MULTICLASS; } field { return FIELD; } let { return LET; } in { return IN; } diff --git a/utils/TableGen/FileParser.cpp.cvs b/utils/TableGen/FileParser.cpp.cvs index c8fd87da98..97045c5ee4 100644 --- a/utils/TableGen/FileParser.cpp.cvs +++ b/utils/TableGen/FileParser.cpp.cvs @@ -20,18 +20,20 @@ #define DAG 263 #define CLASS 264 #define DEF 265 -#define FIELD 266 -#define LET 267 -#define IN 268 -#define SHLTOK 269 -#define SRATOK 270 -#define SRLTOK 271 -#define STRCONCATTOK 272 -#define INTVAL 273 -#define ID 274 -#define VARNAME 275 -#define STRVAL 276 -#define CODEFRAGMENT 277 +#define MULTICLASS 266 +#define DEFM 267 +#define FIELD 268 +#define LET 269 +#define IN 270 +#define SHLTOK 271 +#define SRATOK 272 +#define SRLTOK 273 +#define STRCONCATTOK 274 +#define INTVAL 275 +#define ID 276 +#define VARNAME 277 +#define STRVAL 278 +#define CODEFRAGMENT 279 #line 14 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y" @@ -45,8 +47,19 @@ int yyerror(const char *ErrorMsg); int yylex(); namespace llvm { + struct MultiClass { + Record Rec; // Placeholder for template args and Name. + std::vector<Record*> DefPrototypes; + + MultiClass(const std::string &Name) : Rec(Name) {} + }; + +static std::map<std::string, MultiClass*> MultiClasses; + extern int Filelineno; +static MultiClass *CurMultiClass = 0; // Set while parsing a multiclass. +static std::string *CurDefmPrefix = 0; // Set while parsing defm. static Record *CurRec = 0; static bool ParsingTemplateArgs = false; @@ -68,8 +81,16 @@ static std::vector<std::vector<LetRecord> > LetStack; extern std::ostream &err(); +/// getActiveRec - If inside a def/class definition, return the def/class. +/// Otherwise, if within a multidef, return it. +static Record *getActiveRec() { + return CurRec ? CurRec : &CurMultiClass->Rec; +} + static void addValue(const RecordVal &RV) { - if (RecordVal *ERV = CurRec->getValue(RV.getName())) { + Record *TheRec = getActiveRec(); + + if (RecordVal *ERV = TheRec->getValue(RV.getName())) { // The value already exists in the class, treat this as a set... if (ERV->setValue(RV.getValue())) { err() << "New definition of '" << RV.getName() << "' of type '" @@ -78,7 +99,7 @@ static void addValue(const RecordVal &RV) { exit(1); } } else { - CurRec->addValue(RV); + TheRec->addValue(RV); } } @@ -171,33 +192,33 @@ static void addSubClass(Record *SC, const std::vector<Init*> &TemplateArgs) { if (TArgs.size() < TemplateArgs.size()) { err() << "ERROR: More template args specified than expected!\n"; exit(1); - } else { // This class expects template arguments... - // Loop over all of the template arguments, setting them to the specified - // value or leaving them as the default if necessary. - for (unsigned i = 0, e = TArgs.size(); i != e; ++i) { - if (i < TemplateArgs.size()) { // A value is specified for this temp-arg? - // Set it now. - setValue(TArgs[i], 0, TemplateArgs[i]); - - // Resolve it next. - CurRec->resolveReferencesTo(CurRec->getValue(TArgs[i])); - - - // Now remove it. - CurRec->removeValue(TArgs[i]); - - } else if (!CurRec->getValue(TArgs[i])->getValue()->isComplete()) { - err() << "ERROR: Value not specified for template argument #" - << i << " (" << TArgs[i] << ") of subclass '" << SC->getName() - << "'!\n"; - exit(1); - } + } + + // Loop over all of the template arguments, setting them to the specified + // value or leaving them as the default if necessary. + for (unsigned i = 0, e = TArgs.size(); i != e; ++i) { + if (i < TemplateArgs.size()) { // A value is specified for this temp-arg? + // Set it now. + setValue(TArgs[i], 0, TemplateArgs[i]); + + // Resolve it next. + CurRec->resolveReferencesTo(CurRec->getValue(TArgs[i])); + + + // Now remove it. + CurRec->removeValue(TArgs[i]); + + } else if (!CurRec->getValue(TArgs[i])->getValue()->isComplete()) { + err() << "ERROR: Value not specified for template argument #" + << i << " (" << TArgs[i] << ") of subclass '" << SC->getName() + << "'!\n"; + exit(1); } } // Since everything went well, we can now set the "superclass" list for the // current record. - const std::vector<Record*> &SCs = SC->getSuperClasses(); + const std::vector<Record*> &SCs = SC->getSuperClasses(); for (unsigned i = 0, e = SCs.size(); i != e; ++i) addSuperClass(SCs[i]); addSuperClass(SC); @@ -208,7 +229,7 @@ static void addSubClass(Record *SC, const std::vector<Init*> &TemplateArgs) { using namespace llvm; -#line 189 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y" +#line 208 "/Volumes/ProjectsDisk/cvs/llvm/utils/TableGen/FileParser.y" typedef union { std::string* StrVal; int IntVal; @@ -217,6 +238,7 @@ typedef union { std::vector<llvm::Init*>* FieldList; std::vector<unsigned>* BitList; llvm::Record* Rec; + std::vector<llvm::Record*>* RecList; SubClassRefTy* SubClassRef; std::vector<SubClassRefTy>* SubClassList; std::vector<std::pair<llvm::Init*, std::string> >* DagValueList; @@ -231,26 +253,26 @@ typedef union { -#define YYFINAL 168 +#define YYFINAL 188 #define YYFLAG -32768 -#define YYNTBASE 39 +#define YYNTBASE 41 -#define YYTRANSLATE(x) ((unsigned)(x) <= 277 ? yytranslate[x] : 80) +#define YYTRANSLATE(x) ((unsigned)(x) <= 279 ? yytranslate[x] : 90) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 33, - 34, 2, 2, 35, 37, 32, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 36, 38, 24, - 26, 25, 27, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 35, + 36, 2, 2, 37, 39, 34, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 38, 40, 26, + 28, 27, 29, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 30, 2, 31, 2, 2, 2, 2, 2, 2, 2, + 32, 2, 33, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 28, 2, 29, 2, 2, 2, 2, 2, + 2, 2, 30, 2, 31, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -265,7 +287,7 @@ static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23 + 17, 18, 19, 20, 21, 22, 23, 24, 25 }; #if YYDEBUG != 0 @@ -278,53 +300,60 @@ static const short yyprhs[] = { 0, 163, 166, 173, 174, 177, 179, 183, 185, 190, 192, 196, 197, 200, 202, 206, 210, 211, 213, 215, 216, 218, 220, 222, 223, 227, 228, 229, 236, 240, 242, - 244, 249, 251, 255, 256, 261, 266, 269, 271, 274 + 244, 247, 249, 250, 251, 260, 261, 268, 270, 272, + 274, 276, 281, 283, 287, 288, 293, 298, 301, 303, + 306 }; -static const short yyrhs[] = { 20, - 0, 5, 0, 4, 0, 6, 24, 19, 25, 0, - 3, 0, 7, 24, 40, 25, 0, 8, 0, 9, - 0, 39, 0, 0, 12, 0, 0, 26, 44, 0, - 20, 0, 43, 0, 19, 0, 22, 0, 23, 0, - 27, 0, 28, 51, 29, 0, 20, 24, 52, 25, - 0, 44, 28, 49, 29, 0, 30, 51, 31, 0, - 44, 32, 20, 0, 33, 43, 47, 34, 0, 44, - 30, 49, 31, 0, 15, 33, 44, 35, 44, 34, - 0, 16, 33, 44, 35, 44, 34, 0, 17, 33, - 44, 35, 44, 34, 0, 18, 33, 44, 35, 44, - 34, 0, 0, 36, 21, 0, 44, 45, 0, 46, - 35, 44, 45, 0, 0, 46, 0, 19, 0, 19, - 37, 19, 0, 19, 19, 0, 48, 35, 19, 0, - 48, 35, 19, 37, 19, 0, 48, 35, 19, 19, - 0, 48, 0, 0, 28, 49, 29, 0, 0, 52, - 0, 44, 0, 52, 35, 44, 0, 41, 40, 20, - 42, 0, 53, 38, 0, 13, 20, 50, 26, 44, - 38, 0, 0, 55, 54, 0, 38, 0, 28, 55, - 29, 0, 39, 0, 39, 24, 52, 25, 0, 57, - 0, 58, 35, 57, 0, 0, 36, 58, 0, 53, - 0, 60, 35, 53, 0, 24, 60, 25, 0, 0, - 61, 0, 20, 0, 0, 63, 0, 64, 0, 64, - 0, 0, 59, 68, 56, 0, 0, 0, 10, 65, - 70, 62, 71, 67, 0, 11, 66, 67, 0, 69, - 0, 72, 0, 20, 50, 26, 44, 0, 74, 0, - 75, 35, 74, 0, 0, 13, 77, 75, 14, 0, - 76, 28, 78, 29, 0, 76, 73, 0, 73, 0, - 78, 73, 0, 78, 0 +static const short yyrhs[] = { 22, + 0, 5, 0, 4, 0, 6, 26, 21, 27, 0, + 3, 0, 7, 26, 42, 27, 0, 8, 0, 9, + 0, 41, 0, 0, 14, 0, 0, 28, 46, 0, + 22, 0, 45, 0, 21, 0, 24, 0, 25, 0, + 29, 0, 30, 53, 31, 0, 22, 26, 54, 27, + 0, 46, 30, 51, 31, 0, 32, 53, 33, 0, + 46, 34, 22, 0, 35, 45, 49, 36, 0, 46, + 32, 51, 33, 0, 17, 35, 46, 37, 46, 36, + 0, 18, 35, 46, 37, 46, 36, 0, 19, 35, + 46, 37, 46, 36, 0, 20, 35, 46, 37, 46, + 36, 0, 0, 38, 23, 0, 46, 47, 0, 48, + 37, 46, 47, 0, 0, 48, 0, 21, 0, 21, + 39, 21, 0, 21, 21, 0, 50, 37, 21, 0, + 50, 37, 21, 39, 21, 0, 50, 37, 21, 21, + 0, 50, 0, 0, 30, 51, 31, 0, 0, 54, + 0, 46, 0, 54, 37, 46, 0, 43, 42, 22, + 44, 0, 55, 40, 0, 15, 22, 52, 28, 46, + 40, 0, 0, 57, 56, 0, 40, 0, 30, 57, + 31, 0, 41, 0, 41, 26, 54, 27, 0, 59, + 0, 60, 37, 59, 0, 0, 38, 60, 0, 55, + 0, 62, 37, 55, 0, 26, 62, 27, 0, 0, + 63, 0, 22, 0, 0, 65, 0, 66, 0, 66, + 0, 0, 61, 70, 58, 0, 0, 0, 10, 67, + 72, 64, 73, 69, 0, 11, 68, 69, 0, 74, + 0, 75, 0, 76, 75, 0, 22, 0, 0, 0, + 12, 77, 79, 64, 80, 30, 76, 31, 0, 0, + 13, 22, 82, 38, 59, 40, 0, 71, 0, 74, + 0, 78, 0, 81, 0, 22, 52, 28, 46, 0, + 84, 0, 85, 37, 84, 0, 0, 15, 87, 85, + 16, 0, 86, 30, 88, 31, 0, 86, 83, 0, + 83, 0, 88, 83, 0, 88, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 223, 234, 236, 238, 240, 242, 244, 246, 248, 252, - 252, 254, 254, 256, 273, 275, 277, 280, 283, 285, - 298, 326, 333, 336, 343, 346, 354, 356, 358, 360, - 364, 367, 371, 376, 382, 385, 388, 391, 404, 418, - 420, 433, 449, 451, 451, 455, 457, 461, 464, 468, - 478, 480, 486, 486, 487, 487, 489, 491, 495, 500, - 505, 508, 512, 515, 520, 521, 521, 523, 523, 525, - 532, 550, 562, 576, 581, 583, 585, 589, 598, 598, - 600, 605, 605, 608, 608, 611, 614, 618, 618, 620 + 244, 266, 268, 270, 272, 274, 276, 278, 280, 284, + 284, 286, 286, 288, 311, 313, 315, 318, 321, 323, + 336, 364, 371, 374, 381, 384, 392, 394, 396, 398, + 402, 405, 409, 414, 420, 423, 426, 429, 442, 456, + 458, 471, 487, 489, 489, 493, 495, 499, 502, 506, + 523, 525, 531, 531, 532, 532, 534, 536, 540, 545, + 550, 553, 557, 560, 565, 566, 566, 568, 568, 570, + 577, 595, 620, 634, 639, 641, 643, 647, 656, 670, + 673, 677, 688, 690, 692, 697, 697, 759, 759, 760, + 760, 762, 767, 767, 770, 770, 773, 776, 780, 780, + 782 }; #endif @@ -332,28 +361,32 @@ static const short yyrline[] = { 0, #if YYDEBUG != 0 || defined (YYERROR_VERBOSE) static const char * const yytname[] = { "$","error","$undefined.","INT","BIT", -"STRING","BITS","LIST","CODE","DAG","CLASS","DEF","FIELD","LET","IN","SHLTOK", -"SRATOK","SRLTOK","STRCONCATTOK","INTVAL","ID","VARNAME","STRVAL","CODEFRAGMENT", -"'<'","'>'","'='","'?'","'{'","'}'","'['","']'","'.'","'('","')'","','","':'", -"'-'","';'","ClassID","Type","OptPrefix","OptValue","IDValue","Value","OptVarName", -"DagArgListNE","DagArgList","RBitList","BitList","OptBitList","ValueList","ValueListNE", -"Declaration","BodyItem","BodyList","Body","SubClassRef","ClassListNE","ClassList", -"DeclListNE","TemplateArgList","OptTemplateArgList","OptID","ObjectName","ClassName", -"DefName","ObjectBody","@1","ClassInst","@2","@3","DefInst","Object","LETItem", -"LETList","LETCommand","@4","ObjectList","File", NULL +"STRING","BITS","LIST","CODE","DAG","CLASS","DEF","MULTICLASS","DEFM","FIELD", +"LET","IN","SHLTOK","SRATOK","SRLTOK","STRCONCATTOK","INTVAL","ID","VARNAME", +"STRVAL","CODEFRAGMENT","'<'","'>'","'='","'?'","'{'","'}'","'['","']'","'.'", +"'('","')'","','","':'","'-'","';'","ClassID","Type","OptPrefix","OptValue", |