pub use eval::type mods

Thaumy · Nov 18, 2023 · 1052517 · 1052517
1 parent ee8f26c
commit 1052517
Show file tree

Hide file tree

Showing 31 changed files with 71 additions and 67 deletions.
diff --git a/src/eval/env/expr_env.rs b/src/eval/env/expr_env.rs
@@ -1,7 +1,7 @@
 use std::rc::Rc;
 
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::Type;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
 

diff --git a/src/eval/env/mod.rs b/src/eval/env/mod.rs
@@ -3,8 +3,8 @@ use std::rc::Rc;
 
 use crate::eval::env::expr_env::{ExprEnv, ExprEnvEntry};
 use crate::eval::env::type_env::{TypeEnv, TypeEnvEntry};
-use crate::eval::r#type::expr::OptExpr;
-use crate::eval::r#type::r#type::OptType;
+use crate::eval::r#type::OptExpr;
+use crate::eval::r#type::OptType;
 use crate::infer::env::def_map_to_env_vec as def_map_to_ct_env_vec;
 use crate::infer::env::def_vec_to_def_map;
 use crate::infer::env::expr_env::ExprEnv as CtExprEnv;

diff --git a/src/eval/env/type_env.rs b/src/eval/env/type_env.rs
@@ -1,6 +1,6 @@
 use std::collections::BTreeSet;
 
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::Type;
 use crate::infra::option::WrapOption;
 
 pub type TypeEnvEntry = (String, Type);

diff --git a/src/eval/eval_expr/case/apply/fn/mod.rs b/src/eval/eval_expr/case/apply/fn/mod.rs
@@ -4,9 +4,9 @@ use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::r#macro::{false_type, namely_type, true_type};
-use crate::eval::r#type::eval_err::EvalErr;
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::EvalErr;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::Type;
 use crate::infra::result::WrapResult;
 
 mod primitive_apply;

diff --git a/src/eval/eval_expr/case/apply/fn/primitive_apply.rs b/src/eval/eval_expr/case/apply/fn/primitive_apply.rs
@@ -10,8 +10,8 @@ use crate::eval::eval_expr::case::apply::{
     int_expr
 };
 use crate::eval::eval_expr::EvalRet;
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::expr::PrimitiveOp;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::PrimitiveOp;
 use crate::infra::option::WrapOption;
 use crate::infra::result::WrapResult;
 

diff --git a/src/eval/eval_expr/case/apply/fn/source_lhs_to_closure.rs b/src/eval/eval_expr/case/apply/fn/source_lhs_to_closure.rs
@@ -4,10 +4,10 @@ use std::rc::Rc;
 use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
-use crate::eval::r#type::eval_err::EvalErr;
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::expr::PrimitiveOp;
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::EvalErr;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::PrimitiveOp;
+use crate::eval::r#type::Type;
 use crate::infra::either::{Either, EitherAnyExt};
 use crate::infra::rc::RcAnyExt;
 use crate::infra::result::WrapResult;

diff --git a/src/eval/eval_expr/case/apply/mod.rs b/src/eval/eval_expr/case/apply/mod.rs
@@ -5,7 +5,7 @@ use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::case::apply::primitive_apply;
 use crate::eval::eval_expr::case::apply::source_lhs_expr_to_closure;
 use crate::eval::eval_expr::{eval_expr, EvalRet};
-use crate::eval::r#type::expr::Expr;
+use crate::eval::r#type::Expr;
 use crate::infra::either::Either;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;

diff --git a/src/eval/eval_expr/case/apply/test.rs b/src/eval/eval_expr/case/apply/test.rs
@@ -2,8 +2,8 @@ use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::r#macro::namely_type;
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::expr::PrimitiveOp;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::PrimitiveOp;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
 use crate::infra::result::WrapResult;

diff --git a/src/eval/eval_expr/case/closure/mod.rs b/src/eval/eval_expr/case/closure/mod.rs
@@ -2,8 +2,8 @@ use std::rc::Rc;
 
 use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::eval_expr::EvalRet;
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::Type;
 use crate::infra::option::WrapOption;
 use crate::infra::result::WrapResult;
 

diff --git a/src/eval/eval_expr/case/closure/test.rs b/src/eval/eval_expr/case/closure/test.rs
@@ -2,7 +2,7 @@ use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::r#macro::{closure_type, namely_type};
-use crate::eval::r#type::expr::Expr;
+use crate::eval::r#type::Expr;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
 use crate::infra::result::WrapResult;

diff --git a/src/eval/eval_expr/case/cond/mod.rs b/src/eval/eval_expr/case/cond/mod.rs
@@ -6,8 +6,8 @@ use std::rc::Rc;
 use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::{eval_expr, EvalRet};
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::Type;
 
 pub fn case_cond(
     type_env: &TypeEnv,

diff --git a/src/eval/eval_expr/case/cond/test.rs b/src/eval/eval_expr/case/cond/test.rs
@@ -2,7 +2,7 @@ use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::r#macro::namely_type;
-use crate::eval::r#type::expr::Expr;
+use crate::eval::r#type::Expr;
 use crate::infra::rc::RcAnyExt;
 use crate::infra::result::WrapResult;
 

diff --git a/src/eval/eval_expr/case/discard.rs b/src/eval/eval_expr/case/discard.rs
@@ -1,6 +1,6 @@
 use crate::eval::eval_expr::EvalRet;
-use crate::eval::r#type::eval_err::EvalErr;
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::EvalErr;
+use crate::eval::r#type::Type;
 use crate::infra::result::WrapResult;
 
 pub fn case_discard(type_annot: &Type) -> EvalRet {
@@ -16,7 +16,7 @@ mod test {
     use crate::eval::env::type_env::TypeEnv;
     use crate::eval::eval_expr::eval_expr;
     use crate::eval::r#macro::namely_type;
-    use crate::eval::r#type::expr::Expr;
+    use crate::eval::r#type::Expr;
     use crate::infra::rc::RcAnyExt;
 
     // _: Int

diff --git a/src/eval/eval_expr/case/env_ref/mod.rs b/src/eval/eval_expr/case/env_ref/mod.rs
@@ -6,7 +6,7 @@ use std::rc::Rc;
 use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::{eval_expr, EvalRet};
-use crate::eval::r#type::eval_err::EvalErr;
+use crate::eval::r#type::EvalErr;
 use crate::infra::result::WrapResult;
 
 pub fn case_env_ref(

diff --git a/src/eval/eval_expr/case/env_ref/test.rs b/src/eval/eval_expr/case/env_ref/test.rs
@@ -2,7 +2,7 @@ use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::r#macro::namely_type;
-use crate::eval::r#type::expr::Expr;
+use crate::eval::r#type::Expr;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
 use crate::infra::result::WrapResult;

diff --git a/src/eval/eval_expr/case/int.rs b/src/eval/eval_expr/case/int.rs
@@ -1,6 +1,6 @@
 use crate::eval::eval_expr::EvalRet;
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::Type;
 use crate::infra::result::WrapResult;
 
 pub fn case_int(type_annot: &Type, int_value: &i64) -> EvalRet {
@@ -13,7 +13,7 @@ mod test {
     use crate::eval::env::type_env::TypeEnv;
     use crate::eval::eval_expr::eval_expr;
     use crate::eval::r#macro::namely_type;
-    use crate::eval::r#type::expr::Expr;
+    use crate::eval::r#type::Expr;
     use crate::infra::rc::RcAnyExt;
     use crate::infra::result::WrapResult;
 

diff --git a/src/eval/eval_expr/case/let/mod.rs b/src/eval/eval_expr/case/let/mod.rs
@@ -6,8 +6,8 @@ use std::rc::Rc;
 use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::{eval_expr, EvalRet};
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::Type;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
 

diff --git a/src/eval/eval_expr/case/let/test.rs b/src/eval/eval_expr/case/let/test.rs
@@ -2,7 +2,7 @@ use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::r#macro::namely_type;
-use crate::eval::r#type::expr::Expr;
+use crate::eval::r#type::Expr;
 use crate::infra::rc::RcAnyExt;
 use crate::infra::result::WrapResult;
 

diff --git a/src/eval/eval_expr/case/match/fn.rs b/src/eval/eval_expr/case/match/fn.rs
@@ -2,7 +2,7 @@ use std::rc::Rc;
 
 use crate::eval::env::expr_env::{ExprEnv, ExprEnvEntry};
 use crate::eval::env::type_env::TypeEnv;
-use crate::eval::r#type::expr::{Expr, StructField};
+use crate::eval::r#type::{Expr, StructField};
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
 

diff --git a/src/eval/eval_expr/case/match/mod.rs b/src/eval/eval_expr/case/match/mod.rs
@@ -10,8 +10,8 @@ use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::case::r#match::is_expr_match_pattern_then_env;
 use crate::eval::eval_expr::{eval_expr, EvalRet};
-use crate::eval::r#type::eval_err::EvalErr;
-use crate::eval::r#type::expr::Expr;
+use crate::eval::r#type::EvalErr;
+use crate::eval::r#type::Expr;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
 use crate::infra::result::WrapResult;

diff --git a/src/eval/eval_expr/case/match/test.rs b/src/eval/eval_expr/case/match/test.rs
@@ -4,8 +4,8 @@ use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::r#macro::namely_type;
-use crate::eval::r#type::eval_err::EvalErr;
-use crate::eval::r#type::expr::Expr;
+use crate::eval::r#type::EvalErr;
+use crate::eval::r#type::Expr;
 use crate::infra::rc::RcAnyExt;
 use crate::infra::result::WrapResult;
 

diff --git a/src/eval/eval_expr/case/primitive_op/mod.rs b/src/eval/eval_expr/case/primitive_op/mod.rs
@@ -1,9 +1,9 @@
 use std::rc::Rc;
 
 use crate::eval::eval_expr::EvalRet;
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::expr::PrimitiveOp;
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::PrimitiveOp;
+use crate::eval::r#type::Type;
 use crate::infra::result::WrapResult;
 
 #[cfg(test)]

diff --git a/src/eval/eval_expr/case/primitive_op/test.rs b/src/eval/eval_expr/case/primitive_op/test.rs
@@ -2,8 +2,8 @@ use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::r#macro::{closure_type, namely_type};
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::expr::PrimitiveOp;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::PrimitiveOp;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
 use crate::infra::result::WrapResult;

diff --git a/src/eval/eval_expr/case/struct/mod.rs b/src/eval/eval_expr/case/struct/mod.rs
@@ -6,9 +6,9 @@ use std::rc::Rc;
 use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::{eval_expr, EvalRet};
-use crate::eval::r#type::eval_err::EvalErr;
-use crate::eval::r#type::expr::{Expr, StructField};
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::EvalErr;
+use crate::eval::r#type::Type;
+use crate::eval::r#type::{Expr, StructField};
 use crate::infra::rc::RcAnyExt;
 use crate::infra::result::WrapResult;
 use crate::infra::vec::VecExt;

diff --git a/src/eval/eval_expr/case/struct/test.rs b/src/eval/eval_expr/case/struct/test.rs
@@ -2,7 +2,7 @@ use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::env::type_env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::r#macro::{namely_type, prod_type};
-use crate::eval::r#type::expr::Expr;
+use crate::eval::r#type::Expr;
 use crate::infra::rc::RcAnyExt;
 use crate::infra::result::WrapResult;
 

diff --git a/src/eval/eval_expr/case/unit.rs b/src/eval/eval_expr/case/unit.rs
@@ -1,6 +1,6 @@
 use crate::eval::eval_expr::EvalRet;
-use crate::eval::r#type::expr::Expr;
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::Expr;
+use crate::eval::r#type::Type;
 use crate::infra::result::WrapResult;
 
 pub fn case_unit(type_annot: &Type) -> EvalRet {
@@ -13,7 +13,7 @@ mod test {
     use crate::eval::env::type_env::TypeEnv;
     use crate::eval::eval_expr::eval_expr;
     use crate::eval::r#macro::namely_type;
-    use crate::eval::r#type::expr::Expr;
+    use crate::eval::r#type::Expr;
     use crate::infra::rc::RcAnyExt;
     use crate::infra::result::WrapResult;
 

diff --git a/src/eval/eval_expr/mod.rs b/src/eval/eval_expr/mod.rs
@@ -17,8 +17,8 @@ use crate::eval::eval_expr::case::case_match;
 use crate::eval::eval_expr::case::case_primitive_op;
 use crate::eval::eval_expr::case::case_struct;
 use crate::eval::eval_expr::case::case_unit;
-use crate::eval::r#type::eval_err::EvalErr;
-use crate::eval::r#type::expr::Expr;
+use crate::eval::r#type::EvalErr;
+use crate::eval::r#type::Expr;
 
 pub type EvalRet = Result<Expr, EvalErr>;
 

diff --git a/src/eval/macro.rs b/src/eval/macro.rs
@@ -1,7 +1,7 @@
 #[allow(unused_macros)]
 macro_rules! int_type {
     () => {{
-        use crate::eval::r#type::r#type::Type;
+        use crate::eval::r#type::Type;
         Type::NamelyType("Int".to_string())
     }};
 }
@@ -11,7 +11,7 @@ pub(crate) use int_type;
 #[allow(unused_macros)]
 macro_rules! unit_type {
     () => {{
-        use crate::eval::r#type::r#type::Type;
+        use crate::eval::r#type::Type;
         Type::NamelyType("Unit".to_string())
     }};
 }
@@ -21,7 +21,7 @@ pub(crate) use unit_type;
 #[allow(unused_macros)]
 macro_rules! namely_type {
     ($str:expr) => {{
-        use crate::eval::r#type::r#type::Type;
+        use crate::eval::r#type::Type;
         Type::NamelyType($str.to_string())
     }};
 }
@@ -31,7 +31,7 @@ pub(crate) use namely_type;
 #[allow(unused_macros)]
 macro_rules! closure_type {
     ($lhs:expr, $rhs:expr) => {{
-        use crate::eval::r#type::r#type::Type;
+        use crate::eval::r#type::Type;
         use crate::infra::rc::RcAnyExt;
 
         Type::ClosureType($lhs.rc(), $rhs.rc())
@@ -43,7 +43,7 @@ pub(crate) use closure_type;
 #[allow(unused_macros)]
 macro_rules! prod_type {
     ($($types:expr),* $(,)?) => ({
-        use crate::eval::r#type::r#type::Type;
+        use crate::eval::r#type::Type;
 
         Type::ProdType(vec![
             $(($types),)*
@@ -57,7 +57,7 @@ pub(crate) use prod_type;
 macro_rules! sum_type {
     ($($types:expr),* $(,)?) => ({
         use crate::{btree_set};
-        use crate::eval::r#type::r#type::Type;
+        use crate::eval::r#type::Type;
 
         Type::SumType(btree_set![
             $(($types),)*
@@ -70,7 +70,7 @@ pub(crate) use sum_type;
 #[allow(unused_macros)]
 macro_rules! true_type {
     () => {{
-        use crate::eval::r#type::r#type::Type;
+        use crate::eval::r#type::Type;
         Type::NamelyType("True".to_string())
     }};
 }
@@ -80,7 +80,7 @@ pub(crate) use true_type;
 #[allow(unused_macros)]
 macro_rules! false_type {
     () => {{
-        use crate::eval::r#type::r#type::Type;
+        use crate::eval::r#type::Type;
         Type::NamelyType("False".to_string())
     }};
 }
@@ -90,7 +90,7 @@ pub(crate) use false_type;
 #[allow(unused_macros)]
 macro_rules! bool_type {
     () => {{
-        use crate::eval::r#type::r#type::Type;
+        use crate::eval::r#type::Type;
         Type::NamelyType("Bool".to_string())
     }};
 }

diff --git a/src/eval/type/expr/mod.rs b/src/eval/type/expr/mod.rs
@@ -8,7 +8,7 @@ pub use primitive_op::*;
 
 use crate::eval::env::expr_env::ExprEnv;
 use crate::eval::r#type::r#type::OptType;
-use crate::eval::r#type::r#type::Type;
+use crate::eval::r#type::Type;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
 use crate::infra::vec::VecExt;