refactor

Author: morganthomas

crates/lean_vm/src/core/types.rs

@@ -11,3 +11,6 @@ pub type SourceLineNumber = usize;
 
 /// String label for bytecode locations
 pub type Label = String;
+
+/// Bytecode address (i.e., a value of the program counter)
+pub type CodeAddress = usize;

crates/lean_vm/src/isa/bytecode.rs

@@ -1,13 +1,11 @@
 //! Bytecode representation and management
 
-use crate::Hint;
+use crate::{CodeAddress, Hint};
 
 use super::Instruction;
 use std::collections::BTreeMap;
 use std::fmt::{Display, Formatter};
 
-pub type CodeAddress = usize;
-
 /// Complete bytecode representation with instructions and hints
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Bytecode {

crates/lean_vm/src/isa/hint.rs

@@ -1,5 +1,4 @@
-use crate::Label;
-use crate::core::{DIMENSION, F, LOG_VECTOR_LEN, SourceLineNumber, VECTOR_LEN};
+use crate::core::{Label, DIMENSION, F, LOG_VECTOR_LEN, SourceLineNumber, VECTOR_LEN};
 use crate::diagnostics::RunnerError;
 use crate::execution::{ExecutionHistory, Memory};
 use crate::isa::operands::MemOrConstant;

crates/lean_vm/src/isa/instruction.rs

@@ -2,8 +2,7 @@
 
 use super::Operation;
 use super::operands::{MemOrConstant, MemOrFp, MemOrFpOrConstant};
-use crate::Label;
-use crate::core::{DIMENSION, EF, F, VECTOR_LEN};
+use crate::core::{Label, DIMENSION, EF, F, VECTOR_LEN};
 use crate::diagnostics::RunnerError;
 use crate::execution::Memory;
 use crate::witness::{

crates/lean_vm/src/lib.rs

@@ -12,8 +12,6 @@ pub use execution::*;
 pub use isa::*;
 pub use witness::*;
 
-pub type SourceLineNumber = usize;
-
 /// Main execution entry point for the VM
 pub fn execute_bytecode(
     bytecode: &Bytecode,