From 1b4c9aa9c3f0d3ac1e82d5e5d8e2919a23f28e7b Mon Sep 17 00:00:00 2001 From: Shunsuke Shibayama Date: Mon, 5 Sep 2022 23:50:32 +0900 Subject: [PATCH] Move eval.rs to `context` --- compiler/erg_compiler/codegen.rs | 2 +- compiler/erg_compiler/{ => context}/eval.rs | 0 compiler/erg_compiler/context/instantiate.rs | 2 +- compiler/erg_compiler/context/mod.rs | 1 + compiler/erg_compiler/hir.rs | 2 +- compiler/erg_compiler/lib.rs | 2 +- 6 files changed, 5 insertions(+), 4 deletions(-) rename compiler/erg_compiler/{ => context}/eval.rs (100%) diff --git a/compiler/erg_compiler/codegen.rs b/compiler/erg_compiler/codegen.rs index 9a33de76..89bcfe13 100644 --- a/compiler/erg_compiler/codegen.rs +++ b/compiler/erg_compiler/codegen.rs @@ -23,8 +23,8 @@ use erg_type::value::ValueObj; use erg_type::{HasType, TypeCode, TypePair}; use crate::compile::{AccessKind, Name, StoreLoadKind}; +use crate::context::eval::eval_lit; use crate::error::{CompileError, CompileErrors, CompileResult}; -use crate::eval::eval_lit; use crate::hir::{ Accessor, Args, Array, Block, Call, DefBody, Expr, Local, Signature, SubrSignature, Tuple, VarSignature, HIR, diff --git a/compiler/erg_compiler/eval.rs b/compiler/erg_compiler/context/eval.rs similarity index 100% rename from compiler/erg_compiler/eval.rs rename to compiler/erg_compiler/context/eval.rs diff --git a/compiler/erg_compiler/context/instantiate.rs b/compiler/erg_compiler/context/instantiate.rs index ee69be4a..9aa7563b 100644 --- a/compiler/erg_compiler/context/instantiate.rs +++ b/compiler/erg_compiler/context/instantiate.rs @@ -23,9 +23,9 @@ use erg_type::typaram::{IntervalOp, TyParam, TyParamOrdering}; use erg_type::value::ValueObj; use erg_type::{HasType, ParamTy, Predicate, SubrKind, TyBound, Type}; +use crate::context::eval::eval_lit; use crate::context::{Context, RegistrationMode}; use crate::error::TyCheckResult; -use crate::eval::eval_lit; use crate::hir; use RegistrationMode::*; diff --git a/compiler/erg_compiler/context/mod.rs b/compiler/erg_compiler/context/mod.rs index dedc8c8e..fa3abe91 100644 --- a/compiler/erg_compiler/context/mod.rs +++ b/compiler/erg_compiler/context/mod.rs @@ -2,6 +2,7 @@ //! `Context` is used for type inference and type checking. pub mod cache; pub mod compare; +pub mod eval; pub mod hint; pub mod initialize; pub mod inquire; diff --git a/compiler/erg_compiler/hir.rs b/compiler/erg_compiler/hir.rs index 5070a81e..2e70f682 100644 --- a/compiler/erg_compiler/hir.rs +++ b/compiler/erg_compiler/hir.rs @@ -19,8 +19,8 @@ use erg_type::typaram::TyParam; use erg_type::value::ValueObj; use erg_type::{impl_t, impl_t_for_enum, HasType, Type}; +use crate::context::eval::type_from_token_kind; use crate::error::readable_name; -use crate::eval::type_from_token_kind; #[derive(Debug, Clone)] pub struct Literal { diff --git a/compiler/erg_compiler/lib.rs b/compiler/erg_compiler/lib.rs index b0c1974b..199b4448 100644 --- a/compiler/erg_compiler/lib.rs +++ b/compiler/erg_compiler/lib.rs @@ -7,8 +7,8 @@ pub use compile::*; mod codegen; pub mod effectcheck; pub mod error; -pub mod eval; pub mod hir; +pub mod link; pub mod lower; pub use lower::ASTLowerer; pub mod context;