big commit

src/model/mod.rs

@@ -1,6 +1,6 @@
 mod script;
 
-pub use cagire_forth::{Word, WordCompile, WORDS};
+pub use cagire_forth::{Word, WORDS};
 pub use cagire_project::{
     load, save, Bank, LaunchQuantization, Pattern, PatternSpeed, Project, SyncMode, MAX_BANKS,
     MAX_PATTERNS,

src/views/dict_view.rs

@@ -5,22 +5,39 @@ use ratatui::widgets::{Block, Borders, List, ListItem, Paragraph};
 use ratatui::Frame;
 
 use crate::app::App;
-use crate::model::{Word, WordCompile, WORDS};
+use crate::model::{Word, WORDS};
 use crate::state::DictFocus;
 
 const CATEGORIES: &[&str] = &[
+    // Forth core
     "Stack",
     "Arithmetic",
     "Comparison",
     "Logic",
-    "Sound",
     "Variables",
     "Randomness",
     "Probability",
+    "Lists",
+    "Definitions",
+    // Live coding
+    "Sound",
+    "Time",
     "Context",
     "Music",
-    "Time",
-    "Parameters",
+    "LFO",
+    // Synthesis
+    "Oscillator",
+    "Envelope",
+    "Pitch Env",
+    "Gain",
+    "Sample",
+    // Effects
+    "Filter",
+    "Modulation",
+    "Mod FX",
+    "Lo-fi",
+    "Delay",
+    "Reverb",
 ];
 
 pub fn render(frame: &mut Frame, app: &App, area: Rect) {
@@ -98,7 +115,7 @@ fn render_words(frame: &mut Frame, app: &App, area: Rect, is_searching: bool) {
         let category = CATEGORIES[app.ui.dict_category];
         WORDS
             .iter()
-            .filter(|w| word_category(w.name, &w.compile) == category)
+            .filter(|w| w.category == category)
             .collect()
     };
 
@@ -193,39 +210,6 @@ fn render_search_bar(frame: &mut Frame, app: &App, area: Rect) {
     frame.render_widget(Paragraph::new(vec![line]), area);
 }
 
-fn word_category(name: &str, compile: &WordCompile) -> &'static str {
-    const STACK: &[&str] = &["dup", "drop", "swap", "over", "rot", "nip", "tuck"];
-    const ARITH: &[&str] = &[
-        "+", "-", "*", "/", "mod", "neg", "abs", "floor", "ceil", "round", "min", "max",
-    ];
-    const CMP: &[&str] = &["=", "<>", "<", ">", "<=", ">="];
-    const LOGIC: &[&str] = &["and", "or", "not"];
-    const SOUND: &[&str] = &["sound", "s", "emit"];
-    const VAR: &[&str] = &["get", "set"];
-    const RAND: &[&str] = &["rand", "rrand", "seed", "coin", "chance", "choose", "cycle"];
-    const MUSIC: &[&str] = &["mtof", "ftom"];
-    const TIME: &[&str] = &[
-        "at", "window", "pop", "div", "each", "tempo!", "[", "]", "?",
-    ];
-
-    match compile {
-        WordCompile::Simple if STACK.contains(&name) => "Stack",
-        WordCompile::Simple if ARITH.contains(&name) => "Arithmetic",
-        WordCompile::Simple if CMP.contains(&name) => "Comparison",
-        WordCompile::Simple if LOGIC.contains(&name) => "Logic",
-        WordCompile::Simple if SOUND.contains(&name) => "Sound",
-        WordCompile::Alias(_) => "Sound",
-        WordCompile::Simple if VAR.contains(&name) => "Variables",
-        WordCompile::Simple if RAND.contains(&name) => "Randomness",
-        WordCompile::Probability(_) => "Probability",
-        WordCompile::Context(_) => "Context",
-        WordCompile::Simple if MUSIC.contains(&name) => "Music",
-        WordCompile::Simple if TIME.contains(&name) => "Time",
-        WordCompile::Param => "Parameters",
-        _ => "Other",
-    }
-}
-
 pub fn category_count() -> usize {
     CATEGORIES.len()
 }