From a2a8937292f55ac99b0053518a5cd1c86b8febc5 Mon Sep 17 00:00:00 2001 From: kujirahand Date: Tue, 19 Dec 2023 23:19:11 +0900 Subject: [PATCH] =?UTF-8?q?=E9=96=A2=E6=95=B0=E3=81=AE=E5=BC=95=E6=95=B0?= =?UTF-8?q?=E3=81=AE=E5=9E=8B=E3=81=8C=E3=81=82=E3=82=8B=E3=81=A8=E3=81=8D?= =?UTF-8?q?=E3=80=81=E6=AD=A3=E3=81=97=E3=81=8F=E9=96=A2=E6=95=B0=E3=81=8C?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=20#26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lexer.rs | 7 +++---- src/midi.rs | 6 ------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/lexer.rs b/src/lexer.rs index 3d3f2a5..f2f81f8 100644 --- a/src/lexer.rs +++ b/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 => {} diff --git a/src/midi.rs b/src/midi.rs index 7604330..7ccae7c 100644 --- a/src/midi.rs +++ b/src/midi.rs @@ -163,12 +163,6 @@ fn generate_track(track: &Track) -> Vec { pub fn generate(song: &mut Song) -> Vec { let midi_format = 1; let mut res: Vec = 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