関数の引数の型があるとき、正しく関数が処理されない #26

src/lexer.rs

@@ -302,8 +302,8 @@ fn read_def_user_function(cur: &mut TokenCursor, song: &mut Song) -> Token {
         if name.contains(" ") {
             // split string by " "
             let splited: Vec<&str> = name.split(" ").collect();
-            let name_s = splited[0].trim();
-            let type_s = splited[1].trim();
+            let type_s = splited[0].trim();
+            let name_s = splited[1].trim();
             // get type
             let mut type_sf = 'I';
             if type_s == "Str" || type_s == "STR" || type_s == "S" { type_sf = 'S'; }
@@ -838,11 +838,10 @@ fn check_variables(cur: &mut TokenCursor, song: &mut Song, cmd: String) -> Optio
         song.variables_insert(&cmd, SValue::None);
         return Some(tok);
     }
-
     // variables?
     match song.variables_get(&cmd) {
         Some(sval) => {
-            // get variable
+           // get variable
             return Some(read_variables(cur, song, &cmd, sval.clone()));
         }
         None => {}

src/midi.rs

@@ -163,12 +163,6 @@ fn generate_track(track: &Track) -> Vec<u8> {
 pub fn generate(song: &mut Song) -> Vec<u8> {
     let midi_format = 1;
     let mut res: Vec<u8> = vec![];
-    if song.debug {
-        println!("midi::generate");
-        println!("- MIDI Format={}", midi_format);
-        println!("- TimeBase={}", song.timebase);
-        println!("- TrackCount={}", song.tracks.len());
-    }
     song.play_from_all_track();
     song.normalize_and_sort();
     // header