feat: handle other statement types and pushes/

huff-language · Oct 5, 2023 · 9dc6f61 · 9dc6f61
1 parent 94f5bc6
commit 9dc6f61
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/huff_parser/src/lib.rs b/huff_parser/src/lib.rs
@@ -525,12 +525,26 @@ impl Parser {
             let (body_statements_take, body_statements_return) =
                 macro_statements.iter().fold((0i16, 0i16), |acc, st| {
                     let (statement_takes, statement_returns) = match st.ty {
-                        StatementType::Literal(_) => (0i8, 1i8),
+                        StatementType::Literal(_) |
+                        StatementType::Constant(_) |
+                        StatementType::BuiltinFunctionCall(_) |
+                        StatementType::ArgCall(_) |
+                        StatementType::LabelCall(_) => (0i8, 1i8),
                         StatementType::Opcode(opcode) => {
-                            let stack_changes = opcode.stack_changes();
-                            (stack_changes.0 as i8, stack_changes.1 as i8)
+                            if opcode.is_value_push() {
+                                (0i8, 0i8)
+                            } else {
+                                let stack_changes = opcode.stack_changes();
+                                (stack_changes.0 as i8, stack_changes.1 as i8)
+                            }
+                        }
+                        StatementType::Label(_) => (0i8, 0i8),
+                        StatementType::MacroInvocation(_) => {
+                            todo!()
+                        }
+                        StatementType::Code(_) => {
+                            todo!("should throw error")
                         }
-                        _ => (0i8, 0i8),
                     };
 
                     // acc.1 is always non negative