lang: vm Label type

Author: tcoratger

crates/leanVm/src/intermediate_bytecode.rs

@@ -3,7 +3,9 @@ use std::{collections::BTreeMap, fmt};
 use p3_field::{PrimeCharacteristicRing, PrimeField64};
 
 use crate::{
-    Label, bytecode::operation::Operation, constant::F, lang::const_expr::ConstExpression,
+    bytecode::operation::Operation,
+    constant::F,
+    lang::{Label, const_expr::ConstExpression},
 };
 
 #[derive(Debug, Clone)]

crates/leanVm/src/lang/const_expr.rs

@@ -3,10 +3,9 @@ use std::fmt;
 use p3_field::PrimeCharacteristicRing;
 
 use crate::{
-    Label,
     constant::F,
     intermediate_bytecode::HighLevelOperation,
-    lang::{constant_value::ConstantValue, expression::Expression, simple_expr::SimpleExpr},
+    lang::{Label, constant_value::ConstantValue, expression::Expression, simple_expr::SimpleExpr},
 };
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]

crates/leanVm/src/lang/constant_value.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use crate::Label;
+use crate::lang::Label;
 
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum ConstantValue {

crates/leanVm/src/lang/mod.rs

@@ -1,11 +1,20 @@
 pub mod boolean;
+pub use boolean::*;
 pub mod const_expr;
+pub use const_expr::*;
 pub mod constant_value;
+pub use constant_value::*;
 pub mod expression;
+pub use expression::*;
 pub mod function;
+pub use function::*;
 pub mod line;
+pub use line::*;
 pub mod program;
+pub use program::*;
 pub mod simple_expr;
+pub use simple_expr::*;
 
 pub type Var = String;
 pub type ConstMallocLabel = usize;
+pub type Label = String;

crates/leanVm/src/lib.rs

@@ -10,5 +10,3 @@ pub mod memory;
 pub mod poseidon2;
 pub mod trace;
 pub mod witness;
-
-pub type Label = String;