rename typed -> core-ast 2

Cargo.lock

@@ -1253,6 +1253,7 @@ dependencies = [
  "hex",
  "leo-ast",
  "leo-core",
+ "leo-core-ast",
  "leo-dynamic-check",
  "leo-gadgets",
  "leo-imports",
@@ -1260,7 +1261,6 @@ dependencies = [
  "leo-package",
  "leo-state",
  "leo-symbol-table",
- "leo-typed",
  "num-bigint",
  "pest",
  "rand",
@@ -1284,8 +1284,8 @@ dependencies = [
 name = "leo-core"
 version = "1.0.3"
 dependencies = [
+ "leo-core-ast",
  "leo-gadgets",
- "leo-typed",
  "rand",
  "rand_xorshift",
  "snarkos-curves",
@@ -1296,14 +1296,28 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "leo-core-ast"
+version = "1.0.3"
+dependencies = [
+ "criterion",
+ "leo-ast",
+ "leo-input",
+ "pest",
+ "serde",
+ "serde_json",
+ "snarkos-errors",
+ "snarkos-models",
+]
+
 [[package]]
 name = "leo-dynamic-check"
 version = "1.0.3"
 dependencies = [
  "leo-ast",
+ "leo-core-ast",
  "leo-imports",
  "leo-symbol-table",
- "leo-typed",
  "serde",
  "serde_json",
  "thiserror",
@@ -1327,7 +1341,7 @@ name = "leo-imports"
 version = "1.0.3"
 dependencies = [
  "leo-ast",
- "leo-typed",
+ "leo-core-ast",
  "thiserror",
  "tracing",
 ]
@@ -1363,6 +1377,7 @@ dependencies = [
  "lazy_static",
  "leo-compiler",
  "leo-core",
+ "leo-core-ast",
  "leo-dynamic-check",
  "leo-gadgets",
  "leo-imports",
@@ -1414,8 +1429,8 @@ dependencies = [
 name = "leo-state"
 version = "1.0.3"
 dependencies = [
+ "leo-core-ast",
  "leo-input",
- "leo-typed",
  "rand",
  "rand_xorshift",
  "snarkos-algorithms",
@@ -1435,26 +1450,12 @@ version = "1.0.3"
 dependencies = [
  "leo-ast",
  "leo-core",
+ "leo-core-ast",
  "leo-imports",
- "leo-typed",
  "serde",
  "thiserror",
 ]
 
-[[package]]
-name = "leo-typed"
-version = "1.0.3"
-dependencies = [
- "criterion",
- "leo-ast",
- "leo-input",
- "pest",
- "serde",
- "serde_json",
- "snarkos-errors",
- "snarkos-models",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.76"

Cargo.toml

@@ -28,6 +28,7 @@ path = "leo/main.rs"
 members = [
   "ast",
   "compiler",
+  "core-ast",
   "core",
   "dynamic-check",
   "gadgets",
@@ -35,7 +36,6 @@ members = [
   "input",
   "linter",
   "package",
-  "typed",
   "state",
   "symbol-table",
 ]
@@ -48,6 +48,10 @@ version = "1.0.3"
 path = "./core"
 version = "1.0.1"
 
+[dependencies.leo-core-ast]
+path = "./core-ast"
+version = "1.0.3"
+
 [dependencies.leo-dynamic-check]
 path = "./dynamic-check"
 version = "1.0.3"

compiler/Cargo.toml

@@ -45,8 +45,8 @@ version = "1.0.3"
 path = "../package"
 version = "1.0.3"
 
-[dependencies.leo-typed]
-path = "../typed"
+[dependencies.leo-core-ast]
+path = "../core-ast"
 version = "1.0.3"
 
 [dependencies.leo-state]
@@ -124,4 +124,4 @@ default-features = false
 
 [features]
 default = [ ]
-ci_skip = [ "leo-ast/ci_skip", "leo-typed/ci_skip" ]
+ci_skip = [ "leo-ast/ci_skip", "leo-core-ast/ci_skip" ]

compiler/src/compiler.rs

@@ -24,13 +24,13 @@ use crate::{
     OutputFile,
 };
 use leo_ast::LeoAst;
+use leo_core_ast::{Input, LeoCoreAst, MainInput, Program};
 use leo_dynamic_check::DynamicCheck;
 use leo_imports::ImportParser;
 use leo_input::LeoInputParser;
 use leo_package::inputs::InputPairs;
 use leo_state::verify_local_data_commitment;
 use leo_symbol_table::SymbolTable;
-use leo_typed::{Input, LeoCoreAst, MainInput, Program};
 
 use snarkos_dpc::{base_dpc::instantiated::Components, SystemParameters};
 use snarkos_errors::gadgets::SynthesisError;

compiler/src/console/assert.rs

@@ -17,7 +17,7 @@
 //! Enforces an assert equals statement in a compiled Leo program.
 
 use crate::{errors::ConsoleError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Expression, Span, Type};
+use leo_core_ast::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/console/console.rs

@@ -17,7 +17,7 @@
 //! Evaluates a macro in a compiled Leo program.
 
 use crate::{errors::ConsoleError, program::ConstrainedProgram, GroupType};
-use leo_typed::{ConsoleFunction, ConsoleFunctionCall};
+use leo_core_ast::{ConsoleFunction, ConsoleFunctionCall};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/console/format.rs

@@ -17,7 +17,7 @@
 //! Evaluates a formatted string in a compiled Leo program.
 
 use crate::{errors::ConsoleError, program::ConstrainedProgram, GroupType};
-use leo_typed::FormattedString;
+use leo_core_ast::FormattedString;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/constraints/constraints.rs

@@ -25,10 +25,10 @@ use crate::{
     OutputBytes,
     OutputFile,
 };
+use leo_core_ast::{Input, Program};
 use leo_imports::ImportParser;
 use leo_input::LeoInputParser;
 use leo_package::inputs::InputPairs;
-use leo_typed::{Input, Program};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/definition/definition.rs

@@ -21,7 +21,7 @@ use crate::{
     value::ConstrainedValue,
     GroupType,
 };
-use leo_typed::Identifier;
+use leo_core_ast::Identifier;
 
 use snarkos_models::curves::{Field, PrimeField};
 

compiler/src/definition/definitions.rs

@@ -22,8 +22,8 @@ use crate::{
     value::ConstrainedValue,
     GroupType,
 };
+use leo_core_ast::Program;
 use leo_imports::ImportParser;
-use leo_typed::Program;
 
 use snarkos_models::curves::{Field, PrimeField};
 

compiler/src/errors/console.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::errors::ExpressionError;
-use leo_typed::{Error as FormattedError, Span};
+use leo_core_ast::{Error as FormattedError, Span};
 
 use std::path::Path;
 

compiler/src/errors/expression.rs

@@ -16,7 +16,7 @@
 
 use crate::errors::{AddressError, BooleanError, FieldError, FunctionError, GroupError, IntegerError, ValueError};
 use leo_core::LeoCoreError;
-use leo_typed::{Error as FormattedError, Identifier, Span};
+use leo_core_ast::{Error as FormattedError, Identifier, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use std::path::Path;

compiler/src/errors/function.rs

@@ -25,7 +25,7 @@ use crate::errors::{
     StatementError,
     ValueError,
 };
-use leo_typed::{Error as FormattedError, Span};
+use leo_core_ast::{Error as FormattedError, Span};
 
 use std::path::Path;
 

compiler/src/errors/import.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use leo_core::LeoCoreError;
-use leo_typed::{Error as FormattedError, Identifier, ImportSymbol, Span};
+use leo_core_ast::{Error as FormattedError, Identifier, ImportSymbol, Span};
 
 #[derive(Debug, Error)]
 pub enum ImportError {

compiler/src/errors/output_bytes.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
-use leo_typed::{Error as FormattedError, Span};
+use leo_core_ast::{Error as FormattedError, Span};
 
 use std::path::Path;
 

compiler/src/errors/statement.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::errors::{AddressError, BooleanError, ConsoleError, ExpressionError, IntegerError, ValueError};
-use leo_typed::{Error as FormattedError, Span, Type};
+use leo_core_ast::{Error as FormattedError, Span, Type};
 
 use std::path::Path;
 

compiler/src/errors/value/address.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
-use leo_typed::{Error as FormattedError, Span};
+use leo_core_ast::{Error as FormattedError, Span};
 
 use snarkos_errors::{gadgets::SynthesisError, objects::account::AccountError};
 use std::path::Path;

compiler/src/errors/value/boolean.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
-use leo_typed::{Error as FormattedError, Span};
+use leo_core_ast::{Error as FormattedError, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use std::path::Path;

compiler/src/errors/value/field.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
-use leo_typed::{Error as FormattedError, Span};
+use leo_core_ast::{Error as FormattedError, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use std::path::Path;

compiler/src/errors/value/group.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
-use leo_typed::{Error as FormattedError, Span};
+use leo_core_ast::{Error as FormattedError, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use std::path::Path;

compiler/src/errors/value/integer.rs

@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
+use leo_core_ast::{error::Error as FormattedError, Span};
 use leo_gadgets::errors::SignedIntegerError;
-use leo_typed::{error::Error as FormattedError, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use std::path::Path;

compiler/src/errors/value/value.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::errors::{AddressError, BooleanError, FieldError, GroupError, IntegerError};
-use leo_typed::{Error as FormattedError, Span};
+use leo_core_ast::{Error as FormattedError, Span};
 
 use std::path::Path;
 

compiler/src/expression/arithmetic/add.rs

@@ -17,7 +17,7 @@
 //! Enforces an arithmetic `+` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/arithmetic/div.rs

@@ -17,7 +17,7 @@
 //! Enforces an arithmetic `/` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/arithmetic/mul.rs

@@ -17,7 +17,7 @@
 //! Enforces an arithmetic `*` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/arithmetic/negate.rs

@@ -17,7 +17,7 @@
 //! Enforces a unary negate `-` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/arithmetic/pow.rs

@@ -17,7 +17,7 @@
 //! Enforces an arithmetic `**` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/arithmetic/sub.rs

@@ -17,7 +17,7 @@
 //! Enforces an arithmetic `-` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/array/access.rs

@@ -17,7 +17,7 @@
 //! Enforces array access in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Expression, RangeOrExpression, Span, Type};
+use leo_core_ast::{Expression, RangeOrExpression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/array/array.rs

@@ -22,7 +22,7 @@ use crate::{
     value::ConstrainedValue,
     GroupType,
 };
-use leo_typed::{Expression, Span, SpreadOrExpression, Type};
+use leo_core_ast::{Expression, Span, SpreadOrExpression, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/array/index.rs

@@ -17,7 +17,7 @@
 //! Enforces an array index expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Expression, IntegerType, Span, Type};
+use leo_core_ast::{Expression, IntegerType, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/binary/binary.rs

@@ -17,7 +17,7 @@
 //! Enforces a binary expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Expression, Span, Type};
+use leo_core_ast::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/binary/operand.rs

@@ -17,7 +17,7 @@
 //! Enforces one operand in a binary expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Expression, Span, Type};
+use leo_core_ast::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/circuit/access.rs

@@ -22,7 +22,7 @@ use crate::{
     value::ConstrainedValue,
     GroupType,
 };
-use leo_typed::{Expression, Identifier, Span, Type};
+use leo_core_ast::{Expression, Identifier, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/circuit/circuit.rs

@@ -22,7 +22,7 @@ use crate::{
     value::{ConstrainedCircuitMember, ConstrainedValue},
     GroupType,
 };
-use leo_typed::{CircuitMember, CircuitVariableDefinition, Identifier, Span};
+use leo_core_ast::{CircuitMember, CircuitVariableDefinition, Identifier, Span};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/circuit/static_access.rs

@@ -17,7 +17,7 @@
 //! Enforces a circuit static access expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{CircuitMember, Expression, Identifier, Span, Type};
+use leo_core_ast::{CircuitMember, Expression, Identifier, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/conditional/conditional.rs

@@ -17,7 +17,7 @@
 //! Enforces a conditional expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Expression, Span, Type};
+use leo_core_ast::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/expression.rs

@@ -28,7 +28,7 @@ use crate::{
     GroupType,
     Integer,
 };
-use leo_typed::{Expression, Type};
+use leo_core_ast::{Expression, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/function/core_circuit.rs

@@ -17,7 +17,7 @@ use crate::{program::ConstrainedProgram, value::ConstrainedValue, GroupType};
 
 use crate::errors::{ExpressionError, FunctionError};
 use leo_core::call_core_circuit;
-use leo_typed::{Expression, Span, Type};
+use leo_core_ast::{Expression, Span, Type};
 use snarkos_models::{
     curves::{Field, PrimeField},
     gadgets::r1cs::ConstraintSystem,

compiler/src/expression/function/function.rs

@@ -17,7 +17,7 @@
 //! Enforce a function call expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, new_scope, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Expression, Span, Type};
+use leo_core_ast::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/identifier/identifier.rs

@@ -23,7 +23,7 @@ use crate::{
     Address,
     GroupType,
 };
-use leo_typed::{Identifier, Type};
+use leo_core_ast::{Identifier, Type};
 
 use snarkos_models::curves::{Field, PrimeField};
 

compiler/src/expression/logical/and.rs

@@ -17,7 +17,7 @@
 //! Enforces a logical `&&` operator in a resolved Leo program.
 
 use crate::{errors::BooleanError, value::ConstrainedValue, GroupType};
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/logical/not.rs

@@ -17,7 +17,7 @@
 //! Enforces a logical `!` operator in a resolved Leo program.
 
 use crate::{errors::BooleanError, value::ConstrainedValue, GroupType};
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::curves::{Field, PrimeField};
 

compiler/src/expression/logical/or.rs

@@ -17,7 +17,7 @@
 //! Enforces a logical `||` operator in a resolved Leo program.
 
 use crate::{errors::BooleanError, value::ConstrainedValue, GroupType};
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/relational/eq.rs

@@ -17,7 +17,7 @@
 //! Enforces a relational `==` operator in a resolved Leo program.
 
 use crate::{enforce_and, errors::ExpressionError, value::ConstrainedValue, GroupType};
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/relational/ge.rs

@@ -17,8 +17,8 @@
 //! Enforces a relational `>=` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
+use leo_core_ast::Span;
 use leo_gadgets::bits::ComparatorGadget;
-use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/relational/gt.rs

@@ -17,8 +17,8 @@
 //! Enforces a relational `>` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
+use leo_core_ast::Span;
 use leo_gadgets::bits::ComparatorGadget;
-use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/relational/le.rs

@@ -17,8 +17,8 @@
 //! Enforces a relational `<=` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
+use leo_core_ast::Span;
 use leo_gadgets::bits::ComparatorGadget;
-use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/relational/lt.rs

@@ -17,8 +17,8 @@
 //! Enforces a relational `<` operator in a resolved Leo program.
 
 use crate::{errors::ExpressionError, value::ConstrainedValue, GroupType};
+use leo_core_ast::Span;
 use leo_gadgets::bits::comparator::EvaluateLtGadget;
-use leo_typed::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/tuple/access.rs

@@ -17,7 +17,7 @@
 //! Enforces array access in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Expression, Span, Type};
+use leo_core_ast::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/expression/tuple/tuple.rs

@@ -17,7 +17,7 @@
 //! Enforces an tuple expression in a compiled Leo program.
 
 use crate::{errors::ExpressionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Expression, Span, Type};
+use leo_core_ast::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/function/function.rs

@@ -23,7 +23,7 @@ use crate::{
     GroupType,
 };
 
-use leo_typed::{Expression, Function, FunctionInput, Span, Type};
+use leo_core_ast::{Expression, Function, FunctionInput, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/function/input/array.rs

@@ -23,7 +23,7 @@ use crate::{
     GroupType,
 };
 
-use leo_typed::{InputValue, Span, Type};
+use leo_core_ast::{InputValue, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/function/input/function_input.rs

@@ -18,7 +18,7 @@
 
 use crate::{errors::FunctionError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
 
-use leo_typed::{Expression, Type};
+use leo_core_ast::{Expression, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/function/input/input_keyword.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{errors::FunctionError, ConstrainedCircuitMember, ConstrainedProgram, ConstrainedValue, GroupType};
-use leo_typed::{Identifier, Input};
+use leo_core_ast::{Identifier, Input};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/function/input/input_section.rs

@@ -16,7 +16,7 @@
 
 use crate::{errors::FunctionError, ConstrainedCircuitMember, ConstrainedProgram, ConstrainedValue, GroupType};
 
-use leo_typed::{Identifier, InputValue, Parameter};
+use leo_core_ast::{Identifier, InputValue, Parameter};
 use snarkos_models::{
     curves::{Field, PrimeField},
     gadgets::r1cs::ConstraintSystem,

compiler/src/function/input/main_function_input.rs

@@ -30,7 +30,7 @@ use crate::{
     Integer,
 };
 
-use leo_typed::{InputValue, Span, Type};
+use leo_core_ast::{InputValue, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/function/input/tuple.rs

@@ -23,7 +23,7 @@ use crate::{
     GroupType,
 };
 
-use leo_typed::{InputValue, Span, Type};
+use leo_core_ast::{InputValue, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/function/main_function.rs

@@ -23,7 +23,7 @@ use crate::{
     OutputBytes,
 };
 
-use leo_typed::{Expression, Function, FunctionInput, Input};
+use leo_core_ast::{Expression, Function, FunctionInput, Input};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/function/result/result.rs

@@ -18,7 +18,7 @@
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
 
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/import/parser/import_parser.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::errors::ImportError;
-use leo_typed::{Package, Program};
+use leo_core_ast::{Package, Program};
 
 use std::{collections::HashMap, env::current_dir};
 

compiler/src/import/store/core_package.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{new_scope, ConstrainedProgram, ConstrainedValue, GroupType};
-use leo_typed::Package;
+use leo_core_ast::Package;
 
 use leo_core::{CorePackageList, LeoCoreError};
 use snarkos_models::curves::{Field, PrimeField};

compiler/src/import/store/import.rs

@@ -15,9 +15,9 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{errors::ImportError, ConstrainedProgram, GroupType};
+use leo_core_ast::ImportStatement;
 use leo_imports::ImportParser;
 use leo_symbol_table::imported_symbols::ImportedSymbols;
-use leo_typed::ImportStatement;
 
 use snarkos_models::curves::{Field, PrimeField};
 

compiler/src/import/store/symbol.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{errors::ImportError, new_scope, ConstrainedProgram, ConstrainedValue, GroupType};
-use leo_typed::{ImportSymbol, Program};
+use leo_core_ast::{ImportSymbol, Program};
 
 use snarkos_models::curves::{Field, PrimeField};
 

compiler/src/output/output_bytes.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{errors::OutputBytesError, ConstrainedValue, GroupType, REGISTERS_VARIABLE_NAME};
-use leo_typed::{Parameter, Registers, Span};
+use leo_core_ast::{Parameter, Registers, Span};
 
 use snarkos_models::curves::{Field, PrimeField};
 

compiler/src/statement/assign/array.rs

@@ -17,7 +17,7 @@
 //! Enforces an array assignment statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{RangeOrExpression, Span};
+use leo_core_ast::{RangeOrExpression, Span};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/statement/assign/assign.rs

@@ -24,7 +24,7 @@ use crate::{
     value::ConstrainedValue,
     GroupType,
 };
-use leo_typed::{Assignee, AssigneeAccess, Expression, Span};
+use leo_core_ast::{Assignee, AssigneeAccess, Expression, Span};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/statement/assign/assignee.rs

@@ -17,7 +17,7 @@
 //! Resolves assignees in a compiled Leo program.
 
 use crate::{errors::StatementError, new_scope, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Assignee, Span};
+use leo_core_ast::{Assignee, Span};
 
 use snarkos_models::curves::{Field, PrimeField};
 

compiler/src/statement/assign/circuit_variable.rs

@@ -17,7 +17,7 @@
 //! Enforces a circuit variable assignment statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Identifier, Span};
+use leo_core_ast::{Identifier, Span};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/statement/assign/tuple.rs

@@ -17,7 +17,7 @@
 //! Enforces a tuple assignment statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/statement/branch/branch.rs

@@ -17,7 +17,7 @@
 //! Enforces a branch of a conditional or iteration statement in a compiled Leo program.
 
 use crate::{program::ConstrainedProgram, GroupType, IndicatorAndConstrainedValue, StatementResult};
-use leo_typed::{Statement, Type};
+use leo_core_ast::{Statement, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/statement/conditional/conditional.rs

@@ -24,7 +24,7 @@ use crate::{
     IndicatorAndConstrainedValue,
     StatementResult,
 };
-use leo_typed::{ConditionalNestedOrEndStatement, ConditionalStatement, Span, Type};
+use leo_core_ast::{ConditionalNestedOrEndStatement, ConditionalStatement, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/statement/definition/definition.rs

@@ -17,7 +17,7 @@
 //! Enforces a definition statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, ConstrainedValue, GroupType};
-use leo_typed::{Declare, Expression, Span, VariableName, Variables};
+use leo_core_ast::{Declare, Expression, Span, VariableName, Variables};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/statement/iteration/iteration.rs

@@ -25,7 +25,7 @@ use crate::{
     Integer,
     StatementResult,
 };
-use leo_typed::{Expression, Identifier, Span, Statement, Type};
+use leo_core_ast::{Expression, Identifier, Span, Statement, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/statement/return_/return_.rs

@@ -17,7 +17,7 @@
 //! Enforces a return statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Expression, Span, Type};
+use leo_core_ast::{Expression, Span, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/statement/statement.rs

@@ -17,7 +17,7 @@
 //! Enforces a statement in a compiled Leo program.
 
 use crate::{errors::StatementError, program::ConstrainedProgram, value::ConstrainedValue, GroupType};
-use leo_typed::{Statement, Type};
+use leo_core_ast::{Statement, Type};
 
 use snarkos_models::{
     curves::{Field, PrimeField},

compiler/src/value/address/address.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{errors::AddressError, ConstrainedValue, GroupType};
-use leo_typed::{InputValue, Span};
+use leo_core_ast::{InputValue, Span};
 
 use snarkos_dpc::base_dpc::instantiated::Components;
 use snarkos_errors::gadgets::SynthesisError;

compiler/src/value/boolean/input.rs

@@ -17,7 +17,7 @@
 //! Methods to enforce constraints on input boolean values in a resolved Leo program.
 
 use crate::{errors::BooleanError, value::ConstrainedValue, GroupType};
-use leo_typed::{InputValue, Span};
+use leo_core_ast::{InputValue, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{

compiler/src/value/field/field_type.rs

@@ -17,7 +17,7 @@
 //! A data type that represents a field value
 
 use crate::errors::FieldError;
-use leo_typed::Span;
+use leo_core_ast::Span;
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{

compiler/src/value/field/input.rs

@@ -17,7 +17,7 @@
 //! Methods to enforce constraints on input field values in a compiled Leo program.
 
 use crate::{errors::FieldError, value::ConstrainedValue, FieldType, GroupType};
-use leo_typed::{InputValue, Span};
+use leo_core_ast::{InputValue, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{

compiler/src/value/group/group_type.rs

@@ -17,7 +17,7 @@
 //! A data type that represents members in the group formed by the set of affine points on a curve.
 
 use crate::errors::GroupError;
-use leo_typed::{GroupValue, Span};
+use leo_core_ast::{GroupValue, Span};
 
 use snarkos_models::{
     curves::{Field, One},

compiler/src/value/group/input.rs

@@ -17,7 +17,7 @@
 //! Methods to enforce constraints on input group values in a Leo program.
 
 use crate::{errors::GroupError, ConstrainedValue, GroupType};
-use leo_typed::{GroupValue, InputValue, Span};
+use leo_core_ast::{GroupValue, InputValue, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{

compiler/src/value/group/targets/edwards_bls12.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{errors::GroupError, GroupType};
-use leo_typed::{GroupCoordinate, GroupTuple, GroupValue, Span};
+use leo_core_ast::{GroupCoordinate, GroupTuple, GroupValue, Span};
 
 use snarkos_curves::{
     edwards_bls12::{EdwardsAffine, EdwardsParameters, Fq},

compiler/src/value/implicit/implicit.rs

@@ -17,7 +17,7 @@
 //! Enforces constraints on an implicit number in a compiled Leo program.
 
 use crate::{errors::ValueError, value::ConstrainedValue, GroupType};
-use leo_typed::{Span, Type};
+use leo_core_ast::{Span, Type};
 
 use snarkos_models::curves::{Field, PrimeField};
 

compiler/src/value/integer/integer.rs

@@ -16,12 +16,12 @@
 
 //! Conversion of integer declarations to constraints in Leo.
 use crate::{errors::IntegerError, IntegerTrait};
+use leo_core_ast::{InputValue, IntegerType, Span};
 use leo_gadgets::{
     arithmetic::*,
     bits::comparator::{ComparatorGadget, EvaluateLtGadget},
     signed_integer::*,
 };
-use leo_typed::{InputValue, IntegerType, Span};
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{

compiler/src/value/value.rs

@@ -27,7 +27,7 @@ use crate::{
     Integer,
 };
 use leo_core::Value;
-use leo_typed::{Circuit, Function, GroupValue, Identifier, Span, Type};
+use leo_core_ast::{Circuit, Function, GroupValue, Identifier, Span, Type};
 
 use snarkos_errors::gadgets::SynthesisError;
 use snarkos_models::{

compiler/tests/address/mod.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{assert_satisfied, expect_compiler_error, generate_main_input, parse_program};
-use leo_typed::InputValue;
+use leo_core_ast::InputValue;
 
 static TEST_ADDRESS_1: &str = "aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8";
 static TEST_ADDRESS_2: &str = "aleo18qgam03qe483tdrcc3fkqwpp38ehff4a2xma6lu7hams6lfpgcpq3dq05r";

compiler/tests/console/mod.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{assert_satisfied, expect_compiler_error, generate_main_input, parse_program};
-use leo_typed::InputValue;
+use leo_core_ast::InputValue;
 
 #[test]
 fn test_log() {

compiler/tests/core/packages/unstable/blake2s/mod.rs

@@ -23,8 +23,8 @@ use crate::{
     parse_program_with_input,
 };
 
+use leo_core_ast::InputValue;
 use leo_input::types::{IntegerType, U8Type, UnsignedIntegerType};
-use leo_typed::InputValue;
 use rand::{Rng, SeedableRng};
 use rand_xorshift::XorShiftRng;
 use snarkos_algorithms::prf::blake2s::Blake2s as B2SPRF;

compiler/tests/field/mod.rs

@@ -15,7 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{assert_satisfied, expect_compiler_error, generate_main_input, parse_program};
-use leo_typed::InputValue;
+use leo_core_ast::InputValue;
 
 use snarkos_curves::edwards_bls12::Fq;
 use snarkos_utilities::bytes::ToBytes;

compiler/tests/group/mod.rs

@@ -15,15 +15,10 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-    assert_satisfied,
-    expect_compiler_error,
-    expect_synthesis_error,
-    field::field_to_decimal_string,
-    generate_main_input,
-    parse_program,
-    parse_program_with_input,
+    assert_satisfied, expect_compiler_error, expect_synthesis_error, field::field_to_decimal_string,
+    generate_main_input, parse_program, parse_program_with_input,
 };
-use leo_typed::{GroupCoordinate, GroupTuple, GroupValue, InputValue, Span};
+use leo_core_ast::{GroupCoordinate, GroupTuple, GroupValue, InputValue, Span};
 
 use snarkos_curves::edwards_bls12::EdwardsAffine;
 

compiler/tests/integers/i128/mod.rs

@@ -21,8 +21,8 @@ use crate::{
     integers::{expect_computation_error, expect_parsing_error, IntegerTester},
     parse_program,
 };
+use leo_core_ast::InputValue;
 use leo_input::types::{I128Type, IntegerType, SignedIntegerType};
-use leo_typed::InputValue;
 
 test_int!(
     TestI128,

compiler/tests/integers/i16/mod.rs

@@ -21,8 +21,8 @@ use crate::{
     integers::{expect_computation_error, expect_parsing_error, IntegerTester},
     parse_program,
 };
+use leo_core_ast::InputValue;
 use leo_input::types::{I16Type, IntegerType, SignedIntegerType};
-use leo_typed::InputValue;
 
 test_int!(
     TestI16,

compiler/tests/integers/i32/mod.rs

@@ -21,8 +21,8 @@ use crate::{
     integers::{expect_computation_error, expect_parsing_error, IntegerTester},
     parse_program,
 };
+use leo_core_ast::InputValue;
 use leo_input::types::{I32Type, IntegerType, SignedIntegerType};
-use leo_typed::InputValue;
 
 test_int!(
     TestI32,

compiler/tests/integers/i64/mod.rs

@@ -21,8 +21,8 @@ use crate::{
     integers::{expect_computation_error, expect_parsing_error, IntegerTester},
     parse_program,
 };
+use leo_core_ast::InputValue;
 use leo_input::types::{I64Type, IntegerType, SignedIntegerType};
-use leo_typed::InputValue;
 
 test_int!(
     TestI64,

compiler/tests/integers/i8/mod.rs

@@ -21,8 +21,8 @@ use crate::{
     integers::{expect_computation_error, expect_parsing_error, IntegerTester},
     parse_program,
 };
+use leo_core_ast::InputValue;
 use leo_input::types::{I8Type, IntegerType, SignedIntegerType};
-use leo_typed::InputValue;
 
 test_int!(
     TestI8,

compiler/tests/integers/u128/mod.rs

@@ -21,8 +21,8 @@ use crate::{
     integers::{expect_parsing_error, IntegerTester},
     parse_program,
 };
+use leo_core_ast::InputValue;
 use leo_input::types::{IntegerType, U128Type, UnsignedIntegerType};
-use leo_typed::InputValue;
 
 test_uint!(
     TestU128,

compiler/tests/integers/u16/mod.rs

@@ -21,8 +21,8 @@ use crate::{
     integers::{expect_parsing_error, IntegerTester},
     parse_program,
 };
+use leo_core_ast::InputValue;
 use leo_input::types::{IntegerType, U16Type, UnsignedIntegerType};
-use leo_typed::InputValue;
 
 test_uint!(
     TestU16,

compiler/tests/integers/u32/mod.rs

@@ -21,8 +21,8 @@ use crate::{
     integers::{expect_parsing_error, IntegerTester},
     parse_program,
 };
+use leo_core_ast::InputValue;
 use leo_input::types::{IntegerType, U32Type, UnsignedIntegerType};
-use leo_typed::InputValue;
 
 test_uint!(
     TestU32,

compiler/tests/integers/u64/mod.rs

@@ -21,8 +21,8 @@ use crate::{
     integers::{expect_parsing_error, IntegerTester},
     parse_program,
 };
+use leo_core_ast::InputValue;
 use leo_input::types::{IntegerType, U64Type, UnsignedIntegerType};
-use leo_typed::InputValue;
 
 test_uint!(
     TestU64,