From 4ab08e48e5293d62d09c7808d3e77e9173d4e08c Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sun, 12 Jan 2025 02:42:13 +0100 Subject: [PATCH] okay that's how --- edn/src/edn_token.rs | 2 -- midi/edn/midi-keys.edn | 43 ++++++++++++++++++++---------------------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/edn/src/edn_token.rs b/edn/src/edn_token.rs index 2eeb9c76..d29867d8 100644 --- a/edn/src/edn_token.rs +++ b/edn/src/edn_token.rs @@ -26,13 +26,11 @@ impl<'a> Token<'a> { ':'|'@' => Sym(source, index, 1), '0'..='9' => Num(source, index, 1), 'a'..='z' => Key(source, index, 1), - //'\'' => Chr(source, index, 1), _ => return Err(ParseError::Unexpected(c)) }, Num(_, _, 0) => unreachable!(), Sym(_, _, 0) => unreachable!(), Key(_, _, 0) => unreachable!(), - //Chr(_, _, 0) => unreachable!(), Num(source, index, length) => match c { '0'..='9' => Num(source, index, length + 1), ' '|'\n'|'\r'|'\t' => return Ok(( diff --git a/midi/edn/midi-keys.edn b/midi/edn/midi-keys.edn index bf4c9958..5aee15fb 100644 --- a/midi/edn/midi-keys.edn +++ b/midi/edn/midi-keys.edn @@ -1,23 +1,20 @@ -(enter note/put) -(del note/del) -(',' note/dur/dec) -('.' note/dur/inc) -('+' note/range/inc) -('-' note/range/dec) -(up note/pos/inc) -(down note/pos/dec) - -(left time/pos/dec) -(right time/pos/inc) -('z' time/zoom/lock) -('=' time/zoom/in) -('-' time/zoom/out) - -;(@ctrl-k (midi/kbd/toggle)) -;(@space (clock/toggle)) -;(@shift-space (clock/toggle-start)) -;(@u (undo)) -;(@shift-u (redo)) -;(@tab (compact/toggle)) -;(@q (player/enqueue :clip)) -;(@0 (player/enqueue :stop))) +(:enter note/put) +(:del note/del) +(:comma note/dur/dec) +(:period note/dur/inc) +(:plus note/range/inc) +(:underscore note/range/dec) +(:up note/pos/inc) +(:down note/pos/dec) +(:left time/pos/dec) +(:right time/pos/inc) +(:z time/zoom/lock) +(:equal time/zoom/in) +(:minus time/zoom/out) +(:space clock/toggle) +(:shift-space clock/toggle/zero) +(:u undo) +(:r redo) +(:tab compact) +(:q enqueue) +(:0 stop)