From b95ace9d8e209e894e2b4dcbfba05a2415831932 Mon Sep 17 00:00:00 2001
From: p6nj <breee@duck.com>
Date: Mon, 14 Oct 2024 21:30:06 -0400
Subject: [PATCH] fix stack redirection for mixed test

---
 src/bng/score/utils.rs       | 20 ++++++++++----------
 src/bng/score/utils/tests.rs |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/bng/score/utils.rs b/src/bng/score/utils.rs
index 1fdb255..347d51f 100644
--- a/src/bng/score/utils.rs
+++ b/src/bng/score/utils.rs
@@ -18,14 +18,14 @@ fn inflate(mut flat_atoms: Vec<FlatAtom>) -> Vec<Atom> {
     let mut slope_stack: Vec<Vec<Atom>> = Vec::new();
     let mut stack_history: Vec<CurrentStack> = Vec::new();
     for mut atom in flat_atoms.into_iter() {
-        // #[cfg(test)]
-        // {
-        //     dbg!(&atom);
-        //     dbg!(&loop_stack);
-        //     dbg!(&tuple_stack);
-        //     dbg!(&slope_stack);
-        //     dbg!(&stack_history);
-        // }
+        #[cfg(test)]
+        {
+            dbg!(&atom);
+            dbg!(&loop_stack);
+            dbg!(&tuple_stack);
+            dbg!(&slope_stack);
+            dbg!(&stack_history);
+        }
         if let Some(stack) = stack_history.last() {
             match CurrentStackDiscriminants::from(stack) {
                 CurrentStackDiscriminants::Loop => match atom {
@@ -92,7 +92,7 @@ fn inflate(mut flat_atoms: Vec<FlatAtom>) -> Vec<Atom> {
                         tuple_stack.last_mut().unwrap().push(Atom::QuickModifier(q))
                     }
                     FlatAtom::LoopStarts(n) => {
-                        tuple_stack.push(Vec::new());
+                        loop_stack.push(Vec::new());
                         stack_history.push(CurrentStack::Loop(n));
                     }
                     FlatAtom::LoopEnds => panic!("unmatched end loop in a tuple"),
@@ -138,7 +138,7 @@ fn inflate(mut flat_atoms: Vec<FlatAtom>) -> Vec<Atom> {
                         slope_stack.last_mut().unwrap().push(Atom::QuickModifier(q))
                     }
                     FlatAtom::LoopStarts(n) => {
-                        slope_stack.push(Vec::new());
+                        loop_stack.push(Vec::new());
                         stack_history.push(CurrentStack::Loop(n));
                     }
                     FlatAtom::LoopEnds => panic!("unmatched end loop"),
diff --git a/src/bng/score/utils/tests.rs b/src/bng/score/utils/tests.rs
index d705150..99d7c69 100644
--- a/src/bng/score/utils/tests.rs
+++ b/src/bng/score/utils/tests.rs
@@ -131,14 +131,14 @@ mod inflate {
                 SlopeModifier::Note,
                 instruction(),
                 vec![Atom::Slope(
-                    SlopeModifier::Note,
+                    SlopeModifier::Length,
                     instruction(),
                     vec![Atom::Note(2), Atom::Note(3)]
                 )]
             )],
             inflate(vec![
                 FlatAtom::SlopeStarts(SlopeModifier::Note, instruction()),
-                FlatAtom::SlopeStarts(SlopeModifier::Note, instruction()),
+                FlatAtom::SlopeStarts(SlopeModifier::Length, instruction()),
                 FlatAtom::Note(2),
                 FlatAtom::Note(3),
                 FlatAtom::SlopeEnds,