WIP

xasopheno · Jan 21, 2023 · 2ce1bfa · 2ce1bfa
1 parent f4400df
commit 2ce1bfa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/parser/src/socool.lalrpop b/parser/src/socool.lalrpop
@@ -78,6 +78,7 @@ Operation: Term = {
     <op1: Operation> ">" "FitGain" <op2: ComposeOperation> => {
       unimplemented!()
     },
+
     // TODO: Revisit Focus/Lens
     <op1: Operation> ">" "@" <name: Name> <op2: ComposeOperation> => {
         Term::Op(
@@ -229,11 +230,6 @@ Index: Index = {
   <index: Index> "|" <term: Composeable> => Index::IndexAndTerm {index: Box::new(index), term},
 } 
 
-SuperCompose: Term = {
-  <o: ComposeOperation> => o,
-  <o: Generator> => Term::Gen(o)
-}
-
 ComposeOperation: Term = {
     <terms: Pipe<Composeable>> => {
       Term::Op(Compose { operations: handle_fit_length_recursively(terms) })

diff --git a/src/demo.rs b/src/demo.rs
@@ -5,8 +5,8 @@ use weresocool::interpretable::InputType::Language;
 use weresocool::manager::prepare_render_outside;
 
 pub fn demo() -> Result<(), Error> {
-    // let render_voices = prepare_render_outside(Language(DEMO), None);
-    // play_once(render_voices?, "demo.socool".to_string())?;
+    let render_voices = prepare_render_outside(Language(DEMO), None);
+    play_once(render_voices?, "demo.socool".to_string())?;
     todo!();
     Ok(())
 }

diff --git a/src/new.rs b/src/new.rs
@@ -21,19 +21,19 @@ const DEFAULT_SOCOOL: &str = indoc! {"
 { f: 311.127, l: 1, g: 1/3, p: 0 }
 
 thing1 = {
-    O[
-        (1/1, 2, 1, 1),
-        (1/1, 0, 1, -1),
+    Overlay [
+        {1/1, 2, 1, 1},
+        {1/1, 0, 1, -1},
     ]
     | Seq [
         Fm 1, Fm 9/8, Fm 5/4
    ]
 }
 
 thing2 = {
-    O[
-        (1/1, 2, 1, 1),
-        (1/1, 0, 1, -1),
+    Overlay [
+        {1/1, 2, 1, 1},
+        {1/1, 0, 1, -1},
     ]
     | Seq [
         Fm 3/4