Fix error where an opcode could not be handled as second argument in a macro call (Fixes: #50) (#60)

Author: cakevm

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ## [Unreleased]
 - Throw error if the argument count for a macro call is not equal to the macro definition (Fixes: #49).
+- Fix error where an opcode could not be handled as second argument in a macro call (Fixes: #50).
 
 ## [1.1.6] - 2025-03-29
 - Throw an error if an argument (e.g. `<arg>`) is used but not defined (Fixes: #46).

crates/codegen/src/irgen/arg_calls.rs

@@ -39,6 +39,12 @@ pub fn bubble_arg_call(
                         *offset += push_bytes.len() / 2;
                         bytes.push((starting_offset, Bytes(push_bytes)));
                     }
+                    MacroArg::Opcode(o) => {
+                        tracing::info!(target: "codegen", "GOT \"{:?}\" OPCODE FROM MACRO INVOCATION", o);
+                        let b = Bytes(o.to_string());
+                        *offset += b.0.len() / 2;
+                        bytes.push((starting_offset, b));
+                    }
                     MacroArg::ArgCall(ac, arg_span) => {
                         tracing::info!(target: "codegen", "GOT ARG CALL \"{}\" ARG FROM MACRO INVOCATION", ac);
                         tracing::debug!(target: "codegen", "~~~ BUBBLING UP ARG CALL");

crates/core/tests/macro_invoc_args.rs

@@ -586,3 +586,43 @@ fn test_unexpected_arguments() {
     assert!(codegen_result.is_err());
     assert_eq!(codegen_result.unwrap_err().kind, CodegenErrorKind::InvalidArgumentCount(String::from("TEST"), 1, 2));
 }
+
+#[test]
+fn test_second_opcode_parameter() {
+    let source: &str = r#"
+        #define macro DO_NOTHING() = {
+        }
+
+        #define macro ADD_OP(a, b) = {
+            <a>
+            <b>
+        }
+
+        #define macro MAIN() = {
+            ADD_OP(DO_NOTHING(), dup1)
+        }
+    "#;
+
+    // Parse tokens
+    let flattened_source = FullFileSource { source, file: None, spans: vec![] };
+    let lexer = Lexer::new(flattened_source);
+    let tokens = lexer.into_iter().map(|x| x.unwrap()).collect::<Vec<Token>>();
+    let mut parser = Parser::new(tokens, None);
+
+    // Parse the AST
+    let mut contract = parser.parse().unwrap();
+
+    // Derive storage pointers
+    contract.derive_storage_pointers();
+
+    // Instantiate Codegen
+    let cg = Codegen::new();
+
+    // The codegen instance should have no artifact
+    assert!(cg.artifact.is_none());
+
+    // Have Codegen create the runtime bytecode
+    let r_bytes = Codegen::generate_main_bytecode(&EVMVersion::default(), &contract, None).unwrap();
+    // 80 = DUP1
+    assert_eq!(&r_bytes, "80");
+}

crates/parser/src/lib.rs

@@ -1032,6 +1032,10 @@ impl Parser {
                     args.push(MacroArg::Literal(lit));
                     self.consume();
                 }
+                TokenKind::Opcode(o) => {
+                    args.push(MacroArg::Opcode(o));
+                    self.consume();
+                }
                 TokenKind::Ident(ident) => {
                     if self.peek().unwrap().kind == TokenKind::OpenParen {
                         // It's a nested macro call

crates/utils/src/ast/huff.rs

@@ -475,6 +475,8 @@ pub enum MacroArg {
     ArgCall(String, AstSpan),
     /// A Nested Macro Call
     MacroCall(MacroInvocation),
+    /// Opcode Argument
+    Opcode(Opcode),
 }
 
 /// Free Storage Pointer Unit Struct