--- linuxsampler/trunk/src/network/lscp.y 2007/09/13 21:46:25 1345 +++ linuxsampler/trunk/src/network/lscp.y 2007/11/05 13:56:26 1471 @@ -101,33 +101,6 @@ return atoi(d2)*8*8 + atoi(d1)*8 + atoi(d0); } -int hexToNumber(char hex_digit) { - switch (hex_digit) { - case '0': return 0; - case '1': return 1; - case '2': return 2; - case '3': return 3; - case '4': return 4; - case '5': return 5; - case '6': return 6; - case '7': return 7; - case '8': return 8; - case '9': return 9; - // grammar rule 'digit_hex' already forced lower case - case 'a': return 10; - case 'b': return 11; - case 'c': return 12; - case 'd': return 13; - case 'e': return 14; - case 'f': return 15; - default: return 0; - } -} - -int hexsToNumber(char hex_digit0, char hex_digit1 = '0') { - return hexToNumber(hex_digit1)*16 + hexToNumber(hex_digit0); -} - %} // reentrant parser @@ -138,15 +111,15 @@ %token EXT_ASCII_CHAR -%type char char_base digit digit_oct digit_hex escape_seq escape_seq_octal escape_seq_hex +%type char char_base alpha_char digit digit_oct digit_hex escape_seq escape_seq_octal escape_seq_hex %type dotnum volume_value boolean %type number sampler_channel instrument_index fx_send_id audio_channel_index device_index midi_input_channel_index midi_input_port_index midi_map midi_bank midi_prog midi_ctrl -%type string string_escaped text text_escaped textval_escaped stringval stringval_escaped digits param_val_list param_val query_val filename db_path map_name entry_name fx_send_name engine_name command add_instruction create_instruction destroy_instruction get_instruction list_instruction load_instruction set_chan_instruction load_instr_args load_engine_args audio_output_type_name midi_input_type_name remove_instruction unmap_instruction set_instruction subscribe_event unsubscribe_event map_instruction reset_instruction clear_instruction find_instruction move_instruction copy_instruction scan_mode edit_instruction +%type string string_escaped text text_escaped text_escaped_base stringval stringval_escaped digits param_val_list param_val query_val filename db_path map_name entry_name fx_send_name engine_name command add_instruction create_instruction destroy_instruction get_instruction list_instruction load_instruction set_chan_instruction load_instr_args load_engine_args audio_output_type_name midi_input_type_name remove_instruction unmap_instruction set_instruction subscribe_event unsubscribe_event map_instruction reset_instruction clear_instruction find_instruction move_instruction copy_instruction scan_mode edit_instruction format_instruction %type buffer_size_type %type key_val_list query_val_list %type instr_load_mode %type modal_arg -%type path path_base +%type path path_base path_prefix path_body %start input @@ -198,6 +171,7 @@ | MOVE SP move_instruction { $$ = $3; } | COPY SP copy_instruction { $$ = $3; } | EDIT SP edit_instruction { $$ = $3; } + | FORMAT SP format_instruction { $$ = $3; } | RESET { $$ = LSCPSERVER->ResetSampler(); } | QUIT { LSCPSERVER->AnswerClient("Bye!\r\n"); return LSCP_QUIT; } ; @@ -397,7 +371,10 @@ | MIDI_INSTRUMENT_MAP SP sampler_channel SP DEFAULT { $$ = LSCPSERVER->SetChannelMap($3, -2); } ; -edit_instruction : INSTRUMENT SP sampler_channel { $$ = LSCPSERVER->EditSamplerChannelInstrument($3); } +edit_instruction : CHANNEL SP INSTRUMENT SP sampler_channel { $$ = LSCPSERVER->EditSamplerChannelInstrument($5); } + ; + +format_instruction : INSTRUMENTS_DB { $$ = LSCPSERVER->FormatInstrumentsDb(); } ; modal_arg : /* epsilon (empty argument) */ { $$ = true; } @@ -487,27 +464,35 @@ engine_name : string ; -filename : path { $$ = $1.toPosix(); /*TODO: assuming POSIX*/ } +filename : path { + #if WIN32 + $$ = $1.toWindows(); + #else + // assuming POSIX + $$ = $1.toPosix(); + #endif + } ; db_path : path { $$ = $1.toDbPath(); } ; -map_name : stringval +map_name : stringval_escaped ; -entry_name : stringval +entry_name : stringval_escaped ; -fx_send_name : stringval +fx_send_name : stringval_escaped ; param_val_list : param_val | param_val_list','param_val { $$ = $1 + "," + $3; } ; -param_val : string - | stringval +//TODO: the re-encapsulation into apostrophes for string and strinval here is a hack, since we need a way for __parse_strings() (DeviceParameters.cpp) to distinguish a comma separated list of strings and a string which contains commas. A clean solution would be to move those parser jobs over here to lscp.y +param_val : string { $$ = "\'" + $1 + "\'"; } + | stringval { $$ = "\'" + $1 + "\'"; } | number { std::stringstream ss; ss << "\'" << $1 << "\'"; $$ = ss.str(); } | dotnum { std::stringstream ss; ss << "\'" << $1 << "\'"; $$ = ss.str(); } ; @@ -516,7 +501,7 @@ | query_val_list SP string '=' query_val { $$ = $1; $$[$3] = $5; } ; -query_val : textval_escaped +query_val : text_escaped | stringval_escaped ; @@ -534,9 +519,9 @@ | string { $$ = -1; } ; -dotnum : digits '.' digits { $$ = atof(String($1 + "." + $3).c_str()); } - | '+' digits '.' digits { String s = "+"; s += $2; s += "."; s += $4; $$ = atof(s.c_str()); } - | '-' digits '.' digits { $$ = atof(String("-" + $2 + "." + $4).c_str()); } +dotnum : digits '.' digits { std::stringstream ss($1 + "." + $3); ss.imbue(std::locale::classic()); ss >> $$; } + | '+' digits '.' digits { std::stringstream ss($2 + "." + $4); ss.imbue(std::locale::classic()); ss >> $$; } + | '-' digits '.' digits { std::stringstream ss("-" + $2 + "." + $4); ss.imbue(std::locale::classic()); ss >> $$; } ; @@ -606,17 +591,24 @@ | '\"' path_base '\"' { $$ = $2; } ; -path_base : '/' { $$ = Path(); } - | path_base '/' { $$ = $1; } - | path_base text_escaped { Path p; p.appendNode($2); $$ = $1 + p; } +path_base : path_prefix path_body { $$ = $1 + $2; } + ; + +path_prefix : '/' { $$ = Path(); } + | alpha_char ':' '/' { Path p; p.setDrive($1); $$ = p; } + ; + +path_body : /* epsilon (empty argument) */ { $$ = Path(); } + | path_body '/' { $$ = $1; } + | path_body text_escaped_base { Path p; p.appendNode($2); $$ = $1 + p; } ; stringval : '\'' text '\'' { $$ = $2; } | '\"' text '\"' { $$ = $2; } ; -stringval_escaped : '\'' textval_escaped '\'' { $$ = $2; } - | '\"' textval_escaped '\"' { $$ = $2; } +stringval_escaped : '\'' text_escaped '\'' { $$ = $2; } + | '\"' text_escaped '\"' { $$ = $2; } ; text : SP { $$ = " "; } @@ -625,16 +617,17 @@ | text string { $$ = $1 + $2; } ; -text_escaped : SP { $$ = " "; } +// like text_escaped, but missing the slash ('/') character +text_escaped_base : SP { $$ = " "; } | string_escaped - | text_escaped SP { $$ = $1 + " "; } - | text_escaped string_escaped { $$ = $1 + $2; } + | text_escaped_base SP { $$ = $1 + " "; } + | text_escaped_base string_escaped { $$ = $1 + $2; } ; -textval_escaped : '/' { $$ = "/"; } - | text_escaped - | textval_escaped '/' { $$ = $1 + "/"; } - | textval_escaped text_escaped { $$ = $1 + $2; } +text_escaped : '/' { $$ = "/"; } + | text_escaped_base + | text_escaped '/' { $$ = $1 + "/"; } + | text_escaped text_escaped_base { $$ = $1 + $2; } ; string : char { std::string s; s = $1; $$ = s; } @@ -653,9 +646,13 @@ | '/' { $$ = '/'; } ; -// ASCII characters except space, quotation mark, apostrophe, backslash and slash -char_base : 'A' { $$ = 'A'; } | 'B' { $$ = 'B'; } | 'C' { $$ = 'C'; } | 'D' { $$ = 'D'; } | 'E' { $$ = 'E'; } | 'F' { $$ = 'F'; } | 'G' { $$ = 'G'; } | 'H' { $$ = 'H'; } | 'I' { $$ = 'I'; } | 'J' { $$ = 'J'; } | 'K' { $$ = 'K'; } | 'L' { $$ = 'L'; } | 'M' { $$ = 'M'; } | 'N' { $$ = 'N'; } | 'O' { $$ = 'O'; } | 'P' { $$ = 'P'; } | 'Q' { $$ = 'Q'; } | 'R' { $$ = 'R'; } | 'S' { $$ = 'S'; } | 'T' { $$ = 'T'; } | 'U' { $$ = 'U'; } | 'V' { $$ = 'V'; } | 'W' { $$ = 'W'; } | 'X' { $$ = 'X'; } | 'Y' { $$ = 'Y'; } | 'Z' { $$ = 'Z'; } +// characters A..Z and a..z +alpha_char : 'A' { $$ = 'A'; } | 'B' { $$ = 'B'; } | 'C' { $$ = 'C'; } | 'D' { $$ = 'D'; } | 'E' { $$ = 'E'; } | 'F' { $$ = 'F'; } | 'G' { $$ = 'G'; } | 'H' { $$ = 'H'; } | 'I' { $$ = 'I'; } | 'J' { $$ = 'J'; } | 'K' { $$ = 'K'; } | 'L' { $$ = 'L'; } | 'M' { $$ = 'M'; } | 'N' { $$ = 'N'; } | 'O' { $$ = 'O'; } | 'P' { $$ = 'P'; } | 'Q' { $$ = 'Q'; } | 'R' { $$ = 'R'; } | 'S' { $$ = 'S'; } | 'T' { $$ = 'T'; } | 'U' { $$ = 'U'; } | 'V' { $$ = 'V'; } | 'W' { $$ = 'W'; } | 'X' { $$ = 'X'; } | 'Y' { $$ = 'Y'; } | 'Z' { $$ = 'Z'; } | 'a' { $$ = 'a'; } | 'b' { $$ = 'b'; } | 'c' { $$ = 'c'; } | 'd' { $$ = 'd'; } | 'e' { $$ = 'e'; } | 'f' { $$ = 'f'; } | 'g' { $$ = 'g'; } | 'h' { $$ = 'h'; } | 'i' { $$ = 'i'; } | 'j' { $$ = 'j'; } | 'k' { $$ = 'k'; } | 'l' { $$ = 'l'; } | 'm' { $$ = 'm'; } | 'n' { $$ = 'n'; } | 'o' { $$ = 'o'; } | 'p' { $$ = 'p'; } | 'q' { $$ = 'q'; } | 'r' { $$ = 'r'; } | 's' { $$ = 's'; } | 't' { $$ = 't'; } | 'u' { $$ = 'u'; } | 'v' { $$ = 'v'; } | 'w' { $$ = 'w'; } | 'x' { $$ = 'x'; } | 'y' { $$ = 'y'; } | 'z' { $$ = 'z'; } + ; + +// ASCII characters except space, quotation mark, apostrophe, backslash and slash +char_base : alpha_char | '0' { $$ = '0'; } | '1' { $$ = '1'; } | '2' { $$ = '2'; } | '3' { $$ = '3'; } | '4' { $$ = '4'; } | '5' { $$ = '5'; } | '6' { $$ = '6'; } | '7' { $$ = '7'; } | '8' { $$ = '8'; } | '9' { $$ = '9'; } | '!' { $$ = '!'; } | '#' { $$ = '#'; } | '$' { $$ = '$'; } | '%' { $$ = '%'; } | '&' { $$ = '&'; } | '(' { $$ = '('; } | ')' { $$ = ')'; } | '*' { $$ = '*'; } | '+' { $$ = '+'; } | '-' { $$ = '-'; } | '.' { $$ = '.'; } | ',' { $$ = ','; } | ':' { $$ = ':'; } | ';' { $$ = ';'; } | '<' { $$ = '<'; } | '=' { $$ = '='; } | '>' { $$ = '>'; } | '?' { $$ = '?'; } | '@' { $$ = '@'; } @@ -949,6 +946,9 @@ DB_INSTRUMENTS_JOB : 'D''B''_''I''N''S''T''R''U''M''E''N''T''S''_''J''O''B' ; +INSTRUMENTS_DB : 'I''N''S''T''R''U''M''E''N''T''S''_''D''B' + ; + DESCRIPTION : 'D''E''S''C''R''I''P''T''I''O''N' ; @@ -988,6 +988,9 @@ EDIT : 'E''D''I''T' ; +FORMAT : 'F''O''R''M''A''T' + ; + RESET : 'R''E''S''E''T' ;