--- linuxsampler/trunk/src/network/lscpparser.cpp 2004/07/07 02:49:51 185 +++ linuxsampler/trunk/src/network/lscpparser.cpp 2004/07/18 00:29:39 209 @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875. */ +/* A Bison parser, made by GNU Bison 1.875a. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 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 @@ -226,7 +226,7 @@ /* Line 214 of yacc.c. */ -#line 229 "y.tab.c" +#line 230 "y.tab.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -332,9 +332,9 @@ /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 32 /* YYNRULES -- Number of rules. */ -#define YYNRULES 107 +#define YYNRULES 108 /* YYNRULES -- Number of states. */ -#define YYNSTATES 312 +#define YYNSTATES 313 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -393,9 +393,9 @@ 179, 189, 197, 207, 209, 215, 223, 229, 235, 241, 249, 259, 267, 277, 281, 287, 291, 297, 301, 305, 309, 313, 317, 323, 331, 337, 347, 353, 359, 365, - 371, 377, 381, 387, 389, 391, 393, 395, 401, 409, - 413, 415, 417, 419, 421, 423, 425, 427, 429, 431, - 433, 435, 437, 439, 441, 443, 445, 447 + 371, 377, 381, 387, 389, 391, 393, 395, 397, 403, + 411, 415, 417, 419, 421, 423, 425, 427, 429, 431, + 433, 435, 437, 439, 441, 443, 445, 447, 449 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -440,12 +440,13 @@ 7, 85, 7, 82, -1, 45, 7, 85, 7, 83, -1, 48, 7, 85, 7, 84, -1, 90, 11, 89, -1, 72, 7, 90, 11, 89, -1, 56, -1, 57, - -1, 39, -1, 53, -1, 88, 7, 86, 7, 85, - -1, 18, 7, 88, 7, 86, 7, 85, -1, 87, - 7, 85, -1, 5, -1, 5, -1, 90, -1, 5, - -1, 5, -1, 5, -1, 90, -1, 4, -1, 5, - -1, 5, -1, 5, -1, 90, -1, 6, -1, 6, - -1, 5, -1, 4, -1, 3, -1, 90, 3, -1 + -1, 39, -1, 53, -1, 29, -1, 88, 7, 86, + 7, 85, -1, 18, 7, 88, 7, 86, 7, 85, + -1, 87, 7, 85, -1, 5, -1, 5, -1, 90, + -1, 5, -1, 5, -1, 5, -1, 90, -1, 4, + -1, 5, -1, 5, -1, 5, -1, 90, -1, 6, + -1, 6, -1, 5, -1, 4, -1, 3, -1, 90, + 3, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -459,9 +460,9 @@ 138, 139, 140, 141, 142, 143, 144, 145, 146, 149, 150, 151, 152, 153, 156, 157, 158, 159, 162, 163, 166, 167, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 181, 182, 185, 186, 189, 190, 193, 194, 197, - 200, 203, 206, 209, 212, 215, 218, 221, 222, 225, - 228, 231, 234, 237, 238, 239, 242, 243 + 178, 181, 182, 185, 186, 189, 190, 191, 194, 195, + 198, 201, 204, 207, 210, 213, 216, 219, 222, 223, + 226, 229, 232, 235, 238, 239, 240, 243, 244 }; #endif @@ -522,9 +523,9 @@ 66, 66, 66, 66, 66, 66, 66, 66, 66, 67, 67, 67, 67, 67, 68, 68, 68, 68, 69, 69, 70, 70, 71, 71, 71, 71, 71, 71, 71, 71, - 71, 72, 72, 73, 73, 74, 74, 75, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 84, 85, - 86, 87, 88, 89, 89, 89, 90, 90 + 71, 72, 72, 73, 73, 74, 74, 74, 75, 75, + 76, 77, 78, 79, 80, 81, 82, 83, 84, 84, + 85, 86, 87, 88, 89, 89, 89, 90, 90 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -538,9 +539,9 @@ 9, 7, 9, 1, 5, 7, 5, 5, 5, 7, 9, 7, 9, 3, 5, 3, 5, 3, 3, 3, 3, 3, 5, 7, 5, 9, 5, 5, 5, 5, - 5, 3, 5, 1, 1, 1, 1, 5, 7, 3, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2 + 5, 3, 5, 1, 1, 1, 1, 1, 5, 7, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -551,92 +552,92 @@ 0, 6, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 2, 106, 10, 9, 8, 11, 12, 0, 36, + 1, 2, 107, 10, 9, 8, 11, 12, 0, 36, 41, 53, 0, 0, 0, 0, 45, 0, 0, 0, 0, 0, 37, 0, 46, 0, 13, 0, 0, 14, - 0, 0, 15, 85, 86, 16, 0, 0, 17, 0, - 0, 0, 0, 0, 0, 19, 24, 28, 27, 26, - 25, 29, 20, 30, 34, 33, 32, 31, 35, 21, - 0, 107, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 15, 87, 85, 86, 16, 0, 0, 17, + 0, 0, 0, 0, 0, 0, 19, 24, 28, 27, + 26, 25, 29, 20, 30, 34, 33, 32, 31, 35, + 21, 0, 108, 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, 65, 67, 68, 69, 102, 0, 70, 0, - 71, 0, 101, 99, 18, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 63, 0, 0, 0, 0, 22, + 0, 0, 0, 65, 67, 68, 69, 103, 0, 70, + 0, 71, 0, 102, 100, 18, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 63, 0, 0, 0, 0, + 22, 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, 54, 83, 84, 0, 56, 57, + 58, 0, 0, 47, 42, 0, 0, 38, 0, 48, + 0, 64, 0, 66, 0, 101, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 54, 83, 84, 0, 56, 57, 58, - 0, 0, 47, 42, 0, 0, 38, 0, 48, 0, - 64, 0, 66, 0, 100, 0, 89, 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, 55, 51, 0, 43, 49, + 39, 0, 0, 106, 105, 104, 81, 0, 88, 92, + 0, 91, 72, 74, 93, 94, 0, 79, 97, 95, + 77, 96, 78, 98, 99, 80, 76, 0, 59, 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 55, 51, 0, 43, 49, 39, - 0, 0, 105, 104, 103, 81, 0, 87, 91, 0, - 90, 72, 74, 92, 93, 0, 79, 96, 94, 77, - 95, 78, 97, 98, 80, 76, 0, 59, 61, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 52, 44, 40, 50, 82, 88, 73, 0, 60, 62, - 0, 75 + 0, 52, 44, 40, 50, 82, 89, 73, 0, 60, + 62, 0, 75 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short yydefgoto[] = { - -1, 15, 16, 17, 18, 82, 89, 56, 75, 59, - 62, 68, 154, 210, 196, 65, 138, 140, 271, 269, - 272, 275, 279, 281, 276, 284, 144, 215, 141, 139, - 265, 211 + -1, 15, 16, 17, 18, 83, 90, 56, 76, 59, + 62, 69, 155, 211, 197, 66, 139, 141, 272, 270, + 273, 276, 280, 282, 277, 285, 145, 216, 142, 140, + 266, 212 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -249 +#define YYPACT_NINF -250 static const short yypact[] = { - 81, -249, -249, 3, 16, 27, 83, 104, 126, 128, - 139, 141, 142, 143, -249, 13, 30, 124, -249, 15, - -20, -32, -27, -25, 45, 131, -13, 23, 28, 132, - -249, -249, -249, -249, -249, -249, 150, -249, 151, -249, - -249, -249, 152, 153, 154, 155, -249, 156, 157, 158, - 159, 160, -249, 161, -249, 162, -249, 163, 164, -249, - 165, 168, -249, -249, -249, -249, 169, 170, -249, 171, - 172, 174, 175, 176, 177, -249, -249, -249, -249, -249, - -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, - 178, -249, 107, 166, 167, 173, 179, 180, 181, 182, - 183, 184, 185, 187, 186, 186, 188, 189, 31, 186, - 190, 76, 193, 194, 195, 196, 190, 197, 198, 199, - 200, 201, 212, 214, 215, 216, 217, 218, 220, 222, - 223, 224, 36, 71, -249, -249, -249, 225, -249, 227, - -249, 228, 150, -249, -249, 230, 231, 232, 233, 234, - 235, 236, 237, 238, -249, 239, 240, 241, 242, -249, - 190, 6, 190, 190, 186, 245, 246, 247, 186, 186, - 248, 186, 186, 249, 250, 186, 186, 251, 253, 190, - 190, 190, 190, 190, 190, 190, 190, 190, 190, 254, - 186, 186, 255, -249, -249, -249, 256, -249, -249, -249, - 257, 258, -249, 150, 103, 259, 150, 106, -249, 260, - 261, 33, 261, 262, -249, 263, -249, 264, 265, 267, - 268, 270, 271, 272, 273, 274, 275, 72, 73, 276, - 190, 279, 280, 186, 281, 186, 282, 186, 137, 253, - 190, 283, 284, 186, 285, 186, 286, 287, 140, 285, - 186, 137, 137, 186, -249, -249, 288, 123, -249, 129, - 289, 74, -249, -249, -249, -249, 290, -249, -249, 291, - -249, -249, -249, 150, -249, 292, -249, 150, -249, -249, - -249, -249, -249, -249, -249, -249, 96, -249, -249, 105, - 186, 186, 186, 186, 137, 190, 283, 286, 137, 137, - 150, 261, 261, 150, -249, -249, -249, 293, -249, -249, - 287, -249 + 82, -250, -250, -1, 16, 100, 103, 128, 143, 144, + 147, 150, 151, 152, -250, 13, 30, 106, -250, 15, + -20, -27, -24, -19, 110, 53, -13, 23, 28, 55, + -250, -250, -250, -250, -250, -250, 127, -250, 153, -250, + -250, -250, 154, 155, 156, 157, -250, 158, 159, 160, + 161, 162, -250, 163, -250, 164, -250, 165, 166, -250, + 169, 170, -250, -250, -250, -250, -250, 171, 172, -250, + 174, 175, 176, 177, 178, 179, -250, -250, -250, -250, + -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, + -250, 180, -250, 107, 119, 167, 168, 173, 181, 182, + 183, 184, 185, 186, 188, 187, 187, 189, 190, 31, + 187, 191, 76, 194, 195, 196, 197, 191, 198, 199, + 200, 201, 202, 203, 213, 215, 216, 217, 218, 219, + 221, 223, 224, 36, 72, -250, -250, -250, 225, -250, + 226, -250, 228, 127, -250, -250, 229, 231, 232, 233, + 234, 235, 236, 237, 238, -250, 239, 240, 241, 242, + -250, 191, 6, 191, 191, 187, 245, 246, 247, 187, + 187, 248, 187, 187, 249, 250, 187, 187, 251, 253, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 254, 187, 187, 255, -250, -250, -250, 256, -250, -250, + -250, 257, 258, -250, 127, 84, 259, 127, 124, -250, + 260, 261, 33, 261, 262, -250, 263, -250, 264, 265, + 266, 268, 269, 271, 272, 273, 274, 275, 71, 73, + 276, 191, 279, 280, 187, 281, 187, 282, 187, 137, + 253, 191, 283, 284, 187, 285, 187, 286, 287, 142, + 285, 187, 137, 137, 187, -250, -250, 288, 126, -250, + 129, 289, 74, -250, -250, -250, -250, 290, -250, -250, + 291, -250, -250, -250, 127, -250, 292, -250, 127, -250, + -250, -250, -250, -250, -250, -250, -250, 97, -250, -250, + 123, 187, 187, 187, 187, 137, 191, 283, 286, 137, + 137, 127, 261, 261, 127, -250, -250, -250, 293, -250, + -250, 287, -250 }; /* YYPGOTO[NTERM-NUM]. */ static const short yypgoto[] = { - -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, - -249, -249, -249, -174, -249, -249, -249, -249, -249, -110, - -249, -62, -109, -120, -249, -249, -115, -48, 38, 79, - -248, -17 + -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, + -250, -250, -250, -175, -250, -250, -250, -250, -250, -109, + -250, -61, -107, -119, -250, -250, -116, -47, 39, 78, + -249, -17 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -646,69 +647,69 @@ #define YYTABLE_NINF -4 static const short yytable[] = { - 36, 159, 212, 287, 288, 38, 57, 39, 40, 41, - 19, 60, 70, 30, 63, 42, 43, 44, 45, 46, - 58, 47, 48, 20, 71, 61, 49, 72, 64, 50, - 51, 52, 53, 54, 21, 55, 91, 136, 31, 91, - 37, 73, 74, 175, 238, 193, 304, 197, 198, 137, - 308, 309, 76, 77, 78, 79, 80, 83, 84, 85, - 86, 87, 194, 195, 216, 217, 218, 219, 220, 221, - 222, 223, 224, 225, 91, 91, 91, 91, 176, 66, - 67, 81, 1, 251, 252, 294, 88, 132, 133, -3, - 22, 2, 142, 3, 4, 5, 6, 7, 8, 91, - 9, 10, 11, 12, 13, 14, 91, 298, 91, 91, - 233, 23, 145, 235, 146, 254, 299, 301, 302, 147, - 148, 149, 150, 151, 152, 267, 91, 32, 153, 33, - 291, 34, 91, 24, 35, 25, 292, 117, 118, 119, - 120, 262, 263, 264, 282, 283, 26, 142, 27, 28, - 29, 203, 204, 91, 206, 207, 69, 90, 92, 93, - 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, - 104, 105, 106, 227, 228, 107, 108, 109, 110, 111, - 305, 112, 113, 114, 115, 116, 306, 285, 307, 32, - 311, 266, 0, 134, 135, 143, 121, 122, 155, 156, - 157, 158, 199, 123, 160, 161, 162, 163, 164, 124, - 125, 126, 127, 128, 129, 130, 257, 131, 259, 165, - 261, 166, 167, 168, 169, 170, 273, 171, 277, 172, - 173, 174, 177, 286, 178, 179, 289, 180, 181, 182, - 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, - 200, 201, 202, 205, 208, 209, 213, 136, 214, 226, - 229, 0, 0, 230, 231, 232, 234, 236, 237, 239, - 240, 241, 242, 300, 243, 244, 303, 245, 246, 247, - 248, 249, 250, 253, 255, 256, 258, 260, 268, 270, - 274, 278, 280, 0, 0, 290, 293, 295, 296, 297, - 310 + 36, 160, 213, 288, 289, 38, 19, 39, 40, 41, + 63, 57, 71, 30, 60, 42, 43, 44, 45, 46, + 64, 47, 48, 20, 72, 58, 49, 73, 61, 50, + 51, 52, 53, 54, 65, 55, 92, 137, 31, 92, + 37, 74, 75, 176, 239, 194, 305, 198, 199, 138, + 309, 310, 77, 78, 79, 80, 81, 84, 85, 86, + 87, 88, 195, 196, 217, 218, 219, 220, 221, 222, + 223, 224, 225, 226, 92, 92, 92, 92, 70, 177, + 91, 82, 252, 1, 253, 295, 89, 92, 133, 134, + -3, 234, 2, 143, 3, 4, 5, 6, 7, 8, + 92, 9, 10, 11, 12, 13, 14, 21, 299, 32, + 22, 33, 146, 34, 147, 255, 35, 302, 303, 148, + 149, 150, 151, 152, 153, 268, 92, 92, 154, 92, + 92, 236, 92, 292, 300, 23, 293, 118, 119, 120, + 121, 263, 264, 265, 67, 68, 283, 284, 143, 122, + 24, 25, 204, 205, 26, 207, 208, 27, 28, 29, + 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, + 103, 104, 105, 106, 228, 229, 107, 108, 109, 110, + 306, 111, 112, 113, 114, 115, 116, 117, 307, 286, + 32, 308, 312, 267, 135, 136, 144, 123, 124, 156, + 157, 158, 159, 125, 200, 161, 162, 163, 164, 165, + 166, 126, 127, 128, 129, 130, 131, 258, 132, 260, + 167, 262, 168, 169, 170, 171, 172, 274, 173, 278, + 174, 175, 178, 179, 287, 180, 181, 290, 182, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, + 201, 202, 203, 206, 209, 210, 214, 137, 215, 227, + 230, 0, 0, 231, 232, 233, 235, 237, 238, 240, + 241, 242, 243, 244, 301, 245, 246, 304, 247, 248, + 249, 250, 251, 254, 256, 257, 259, 261, 269, 271, + 275, 279, 281, 0, 0, 291, 294, 296, 297, 298, + 311 }; static const short yycheck[] = { - 17, 116, 176, 251, 252, 25, 38, 27, 28, 29, - 7, 38, 25, 0, 39, 35, 36, 37, 38, 39, - 52, 41, 42, 7, 37, 52, 46, 40, 53, 49, - 50, 51, 52, 53, 7, 55, 3, 6, 8, 3, - 25, 54, 55, 7, 11, 160, 294, 162, 163, 18, - 298, 299, 29, 30, 31, 32, 33, 29, 30, 31, - 32, 33, 56, 57, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 3, 3, 3, 3, 7, 34, - 35, 58, 1, 11, 11, 11, 58, 104, 105, 8, - 7, 10, 109, 12, 13, 14, 15, 16, 17, 3, - 19, 20, 21, 22, 23, 24, 3, 11, 3, 3, - 7, 7, 36, 7, 38, 230, 11, 291, 292, 43, - 44, 45, 46, 47, 48, 240, 3, 3, 52, 5, - 7, 7, 3, 7, 10, 7, 7, 30, 31, 32, - 33, 4, 5, 6, 4, 5, 7, 164, 7, 7, - 7, 168, 169, 3, 171, 172, 25, 25, 7, 7, + 17, 117, 177, 252, 253, 25, 7, 27, 28, 29, + 29, 38, 25, 0, 38, 35, 36, 37, 38, 39, + 39, 41, 42, 7, 37, 52, 46, 40, 52, 49, + 50, 51, 52, 53, 53, 55, 3, 6, 8, 3, + 25, 54, 55, 7, 11, 161, 295, 163, 164, 18, + 299, 300, 29, 30, 31, 32, 33, 29, 30, 31, + 32, 33, 56, 57, 180, 181, 182, 183, 184, 185, + 186, 187, 188, 189, 3, 3, 3, 3, 25, 7, + 25, 58, 11, 1, 11, 11, 58, 3, 105, 106, + 8, 7, 10, 110, 12, 13, 14, 15, 16, 17, + 3, 19, 20, 21, 22, 23, 24, 7, 11, 3, + 7, 5, 36, 7, 38, 231, 10, 292, 293, 43, + 44, 45, 46, 47, 48, 241, 3, 3, 52, 3, + 3, 7, 3, 7, 11, 7, 7, 30, 31, 32, + 33, 4, 5, 6, 34, 35, 4, 5, 165, 30, + 7, 7, 169, 170, 7, 172, 173, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 190, 191, 7, 7, 7, 7, 7, - 295, 7, 7, 7, 7, 7, 296, 249, 297, 3, - 310, 239, -1, 5, 5, 5, 30, 30, 5, 5, - 5, 5, 164, 30, 7, 7, 7, 7, 7, 30, - 30, 30, 30, 30, 30, 30, 233, 30, 235, 7, - 237, 7, 7, 7, 7, 7, 243, 7, 245, 7, - 7, 7, 7, 250, 7, 7, 253, 7, 7, 7, + 7, 7, 7, 7, 191, 192, 7, 7, 7, 7, + 296, 7, 7, 7, 7, 7, 7, 7, 297, 250, + 3, 298, 311, 240, 5, 5, 5, 30, 30, 5, + 5, 5, 5, 30, 165, 7, 7, 7, 7, 7, + 7, 30, 30, 30, 30, 30, 30, 234, 30, 236, + 7, 238, 7, 7, 7, 7, 7, 244, 7, 246, + 7, 7, 7, 7, 251, 7, 7, 254, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 5, 5, 5, 5, 5, 5, 177, 6, 5, 5, + 5, 5, 5, 5, 5, 5, 178, 6, 5, 5, 5, -1, -1, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 290, 7, 7, 293, 7, 7, 7, + 7, 7, 7, 7, 291, 7, 7, 294, 7, 7, 7, 7, 7, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, -1, -1, 7, 7, 7, 7, 7, 7 @@ -724,32 +725,32 @@ 0, 8, 3, 5, 7, 10, 90, 25, 25, 27, 28, 29, 35, 36, 37, 38, 39, 41, 42, 46, 49, 50, 51, 52, 53, 55, 66, 38, 52, 68, - 38, 52, 69, 39, 53, 74, 34, 35, 70, 25, - 25, 37, 40, 54, 55, 67, 29, 30, 31, 32, - 33, 58, 64, 29, 30, 31, 32, 33, 58, 65, - 25, 3, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 30, 31, 32, - 33, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 30, 30, 90, 90, 5, 5, 6, 18, 75, 88, - 76, 87, 90, 5, 85, 36, 38, 43, 44, 45, - 46, 47, 48, 52, 71, 5, 5, 5, 5, 85, + 38, 52, 69, 29, 39, 53, 74, 34, 35, 70, + 25, 25, 37, 40, 54, 55, 67, 29, 30, 31, + 32, 33, 58, 64, 29, 30, 31, 32, 33, 58, + 65, 25, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 30, 31, + 32, 33, 30, 30, 30, 30, 30, 30, 30, 30, + 30, 30, 30, 90, 90, 5, 5, 6, 18, 75, + 88, 76, 87, 90, 5, 85, 36, 38, 43, 44, + 45, 46, 47, 48, 52, 71, 5, 5, 5, 5, + 85, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 85, 56, 57, 73, 85, 85, 87, - 5, 5, 5, 90, 90, 5, 90, 90, 5, 5, - 72, 90, 72, 88, 5, 86, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 5, 90, 90, 5, - 7, 7, 7, 7, 7, 7, 7, 7, 11, 7, + 7, 7, 7, 7, 85, 56, 57, 73, 85, 85, + 87, 5, 5, 5, 90, 90, 5, 90, 90, 5, + 5, 72, 90, 72, 88, 5, 86, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 5, 90, 90, + 5, 7, 7, 7, 7, 7, 7, 7, 7, 11, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 11, 11, 7, 85, 5, 5, 90, 5, 90, - 5, 90, 4, 5, 6, 89, 86, 85, 5, 78, - 5, 77, 79, 90, 5, 80, 83, 90, 5, 81, - 5, 82, 4, 5, 84, 80, 90, 89, 89, 90, - 7, 7, 7, 7, 11, 7, 7, 7, 11, 11, - 90, 72, 72, 90, 89, 85, 78, 81, 89, 89, - 7, 82 + 7, 7, 11, 11, 7, 85, 5, 5, 90, 5, + 90, 5, 90, 4, 5, 6, 89, 86, 85, 5, + 78, 5, 77, 79, 90, 5, 80, 83, 90, 5, + 81, 5, 82, 4, 5, 84, 80, 90, 89, 89, + 90, 7, 7, 7, 7, 11, 7, 7, 7, 11, + 11, 90, 72, 72, 90, 89, 85, 78, 81, 89, + 89, 7, 82 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -1746,56 +1747,61 @@ case 85: #line 189 "lscp.y" - { yyval.String = LSCPSERVER->GetAudioOutputDevices(); } + { yyval.String = LSCPSERVER->GetAudioOutputDevices(); } break; case 86: #line 190 "lscp.y" - { yyval.String = LSCPSERVER->GetMidiInputDevices(); } + { yyval.String = LSCPSERVER->GetMidiInputDevices(); } break; case 87: -#line 193 "lscp.y" - { yyval.String = LSCPSERVER->LoadInstrument(yyvsp[-4].String, yyvsp[-2].Number, yyvsp[0].Number); } +#line 191 "lscp.y" + { yyval.String = LSCPSERVER->ListChannels(); } break; case 88: #line 194 "lscp.y" - { yyval.String = LSCPSERVER->LoadInstrument(yyvsp[-4].String, yyvsp[-2].Number, yyvsp[0].Number, true); } + { yyval.String = LSCPSERVER->LoadInstrument(yyvsp[-4].String, yyvsp[-2].Number, yyvsp[0].Number); } break; case 89: -#line 197 "lscp.y" - { yyval.String = LSCPSERVER->LoadEngine(yyvsp[-2].String, yyvsp[0].Number); } +#line 195 "lscp.y" + { yyval.String = LSCPSERVER->LoadInstrument(yyvsp[-4].String, yyvsp[-2].Number, yyvsp[0].Number, true); } break; - case 98: -#line 222 "lscp.y" - { yyval.Dotnum = yyvsp[0].Number; } + case 90: +#line 198 "lscp.y" + { yyval.String = LSCPSERVER->LoadEngine(yyvsp[-2].String, yyvsp[0].Number); } break; - case 103: -#line 237 "lscp.y" - { yyval.String = yyvsp[0].String; } + case 99: +#line 223 "lscp.y" + { yyval.Dotnum = yyvsp[0].Number; } break; case 104: #line 238 "lscp.y" - { std::stringstream ss; ss << yyvsp[0].Number; yyval.String = ss.str(); } + { yyval.String = yyvsp[0].String; } break; case 105: #line 239 "lscp.y" - { std::stringstream ss; ss << yyvsp[0].Dotnum; yyval.String = ss.str(); } + { std::stringstream ss; ss << yyvsp[0].Number; yyval.String = ss.str(); } break; case 106: -#line 242 "lscp.y" - { std::string s; s = yyvsp[0].Char; yyval.String = s; } +#line 240 "lscp.y" + { std::stringstream ss; ss << yyvsp[0].Dotnum; yyval.String = ss.str(); } break; case 107: #line 243 "lscp.y" + { std::string s; s = yyvsp[0].Char; yyval.String = s; } + break; + + case 108: +#line 244 "lscp.y" { yyval.String = yyvsp[-1].String + yyvsp[0].Char; } break; @@ -1803,7 +1809,7 @@ } /* Line 999 of yacc.c. */ -#line 1806 "y.tab.c" +#line 1813 "y.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -1997,7 +2003,7 @@ } -#line 79 "lscp.y" +#line 247 "lscp.y" /**