♻️ Delegate u256 -> opcode conversion to compilation

huff-language · Oct 19, 2024 · c31ff57 · c31ff57
1 parent 5a94de1
commit c31ff57
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/crates/analysis/src/lib.rs b/crates/analysis/src/lib.rs
@@ -106,7 +106,7 @@ fn analyze_macro<'ast: 'src, 'src, E: FnMut(AnalysisError<'ast, 'src>)>(
     // Validate instruction against the current scope.
     let analyze_instruction =
         |instruction: &'ast Instruction, label_stack: &mut LabelStack<'src, ()>| match instruction {
-            Instruction::Op(_) => None,
+            Instruction::Op(_) | Instruction::VariablePush(_) => None,
             Instruction::LabelReference(label) => {
                 if !label_stack.contains(label.ident()) {
                     Some(AnalysisError::ReferenceNotFound {

diff --git a/crates/ast/src/ast.rs b/crates/ast/src/ast.rs
@@ -77,6 +77,7 @@ pub enum MacroStatement<'src> {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Instruction<'src> {
     Op(Spanned<Opcode>),
+    VariablePush(Spanned<U256>),
     LabelReference(Spanned<&'src str>),
     MacroArgReference(Spanned<&'src str>),
     ConstantReference(Spanned<&'src str>),

diff --git a/crates/ast/src/lib.rs b/crates/ast/src/lib.rs
@@ -5,3 +5,4 @@ mod util;
 
 pub use ast::*;
 pub use parser::parse;
+pub use util::u256_as_push;
diff --git a/crates/ast/src/parser.rs b/crates/ast/src/parser.rs
@@ -124,7 +124,7 @@ fn macro_statement<'tokens, 'src: 'tokens>() -> impl Parser<'tokens, 'src, ast::
 }
 
 fn instruction<'tokens, 'src: 'tokens>() -> impl Parser<'tokens, 'src, ast::Instruction<'src>> {
-    let push_auto = word().map(|(value, span)| (ast::Instruction::Op((u256_as_push(value), span))));
+    let push_auto = word().map(|(value, span)| (ast::Instruction::VariablePush((value, span))));
 
     let push = select! {
         Ident("push1") => 1,

diff --git a/crates/ast/src/util.rs b/crates/ast/src/util.rs
@@ -16,7 +16,7 @@ pub(crate) fn u256_as_push_data<const N: usize>(value: U256) -> Result<[u8; N],
     Ok(output)
 }
 
-pub(crate) fn u256_as_push(value: U256) -> Opcode {
+pub fn u256_as_push(value: U256) -> Opcode {
     match value.byte_len() {
         0..=1 => u256_as_push_data::<1>(value).map(Opcode::PUSH1).unwrap(),
         2 => u256_as_push_data::<2>(value).map(Opcode::PUSH2).unwrap(),