pub use mods

Thaumy · Nov 19, 2023 · 94144c0 · 94144c0
1 parent cddaaf4
commit 94144c0
Show file tree

Hide file tree

Showing 38 changed files with 74 additions and 70 deletions.
diff --git a/src/eval/env/mod.rs b/src/eval/env/mod.rs
@@ -9,10 +9,7 @@ use crate::infer::env::ExprEnv as CtExprEnv;
 use crate::infer::env::ExprEnvEntry as CtExprEnvEntry;
 use crate::infer::env::TypeConstraint;
 use crate::infer::env::TypeEnv as CtTypeEnv;
-use crate::infer::infer_type_of_defs::{
-    infer_type_of_defs,
-    InferErr
-};
+use crate::infer::{infer_type_of_defs, InferErr};
 use crate::infra::VecExt;
 use crate::infra::WrapOption;
 use crate::infra::WrapRc;

diff --git a/src/eval/eval_expr/case/apply/fn/mod.rs b/src/eval/eval_expr/case/apply/fn/mod.rs
@@ -2,7 +2,7 @@ use std::rc::Rc;
 
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::EvalErr;
 use crate::eval::Expr;
 use crate::eval::Type;

diff --git a/src/eval/eval_expr/case/apply/fn/primitive_apply.rs b/src/eval/eval_expr/case/apply/fn/primitive_apply.rs
@@ -1,15 +1,10 @@
 use std::ops::Rem;
 use std::rc::Rc;
 
+use super::{bool_expr, eval_to_bool, eval_to_int, int_expr};
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::case::apply::{
-    bool_expr,
-    eval_to_bool,
-    eval_to_int,
-    int_expr
-};
-use crate::eval::eval_expr::EvalRet;
+use crate::eval::EvalRet;
 use crate::eval::Expr;
 use crate::eval::PrimitiveOp;
 use crate::infra::WrapOption;

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
@@ -3,7 +3,7 @@ use std::rc::Rc;
 
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::EvalErr;
 use crate::eval::Expr;
 use crate::eval::PrimitiveOp;

diff --git a/src/eval/eval_expr/case/apply/mod.rs b/src/eval/eval_expr/case/apply/mod.rs
@@ -2,16 +2,14 @@ use std::rc::Rc;
 
 use crate::eval::env::ExprEnv;
 use crate::eval::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::Expr;
 use crate::infra::Either;
 use crate::infra::WrapOption;
 use crate::infra::WrapRc;
 
 mod r#fn;
-pub use r#fn::*;
+use r#fn::*;
 
 #[cfg(test)]
 mod test;

diff --git a/src/eval/eval_expr/case/apply/test.rs b/src/eval/eval_expr/case/apply/test.rs
@@ -1,6 +1,6 @@
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::namely_type;
 use crate::eval::Expr;
 use crate::eval::PrimitiveOp;

diff --git a/src/eval/eval_expr/case/closure/test.rs b/src/eval/eval_expr/case/closure/test.rs
@@ -1,6 +1,6 @@
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::Expr;
 use crate::eval::{closure_type, namely_type};
 use crate::infra::WrapOption;

diff --git a/src/eval/eval_expr/case/cond/mod.rs b/src/eval/eval_expr/case/cond/mod.rs
@@ -5,9 +5,9 @@ use std::rc::Rc;
 
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::{eval_expr, EvalRet};
 use crate::eval::Expr;
 use crate::eval::Type;
+use crate::eval::{eval_expr, EvalRet};
 
 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
@@ -1,6 +1,6 @@
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::namely_type;
 use crate::eval::Expr;
 use crate::infra::WrapRc;

diff --git a/src/eval/eval_expr/case/discard.rs b/src/eval/eval_expr/case/discard.rs
@@ -14,7 +14,7 @@ mod test {
 
     use crate::eval::env::ExprEnv;
     use crate::eval::env::TypeEnv;
-    use crate::eval::eval_expr::eval_expr;
+    use crate::eval::eval_expr;
     use crate::eval::namely_type;
     use crate::eval::Expr;
     use crate::infra::WrapRc;

diff --git a/src/eval/eval_expr/case/env_ref/test.rs b/src/eval/eval_expr/case/env_ref/test.rs
@@ -1,6 +1,6 @@
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::namely_type;
 use crate::eval::Expr;
 use crate::infra::WrapOption;

diff --git a/src/eval/eval_expr/case/int.rs b/src/eval/eval_expr/case/int.rs
@@ -11,7 +11,7 @@ pub fn case_int(type_annot: &Type, int_value: &i64) -> EvalRet {
 mod test {
     use crate::eval::env::ExprEnv;
     use crate::eval::env::TypeEnv;
-    use crate::eval::eval_expr::eval_expr;
+    use crate::eval::eval_expr;
     use crate::eval::namely_type;
     use crate::eval::Expr;
     use crate::infra::WrapRc;

diff --git a/src/eval/eval_expr/case/let/test.rs b/src/eval/eval_expr/case/let/test.rs
@@ -1,6 +1,6 @@
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::namely_type;
 use crate::eval::Expr;
 use crate::infra::WrapRc;

diff --git a/src/eval/eval_expr/case/match/mod.rs b/src/eval/eval_expr/case/match/mod.rs
@@ -1,5 +1,5 @@
 mod r#fn;
-pub use r#fn::*;
+use r#fn::*;
 
 #[cfg(test)]
 mod test;
@@ -8,7 +8,6 @@ use std::rc::Rc;
 
 use crate::eval::env::ExprEnv;
 use crate::eval::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::EvalErr;
 use crate::eval::Expr;

diff --git a/src/eval/eval_expr/case/match/test.rs b/src/eval/eval_expr/case/match/test.rs
@@ -2,7 +2,7 @@ use std::assert_matches::assert_matches;
 
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::namely_type;
 use crate::eval::EvalErr;
 use crate::eval::Expr;

diff --git a/src/eval/eval_expr/case/primitive_op/test.rs b/src/eval/eval_expr/case/primitive_op/test.rs
@@ -1,6 +1,6 @@
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::Expr;
 use crate::eval::PrimitiveOp;
 use crate::eval::{closure_type, namely_type};

diff --git a/src/eval/eval_expr/case/struct/test.rs b/src/eval/eval_expr/case/struct/test.rs
@@ -1,6 +1,6 @@
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::Expr;
 use crate::eval::{namely_type, prod_type};
 use crate::infra::WrapRc;

diff --git a/src/eval/eval_expr/case/unit.rs b/src/eval/eval_expr/case/unit.rs
@@ -11,7 +11,7 @@ pub fn case_unit(type_annot: &Type) -> EvalRet {
 mod test {
     use crate::eval::env::ExprEnv;
     use crate::eval::env::TypeEnv;
-    use crate::eval::eval_expr::eval_expr;
+    use crate::eval::eval_expr;
     use crate::eval::namely_type;
     use crate::eval::Expr;
     use crate::infra::WrapRc;

diff --git a/src/eval/eval_expr/mod.rs b/src/eval/eval_expr/mod.rs
@@ -4,19 +4,20 @@ mod test;
 
 use std::rc::Rc;
 
+use case::case_apply;
+use case::case_closure;
+use case::case_cond;
+use case::case_discard;
+use case::case_env_ref;
+use case::case_int;
+use case::case_let;
+use case::case_match;
+use case::case_primitive_op;
+use case::case_struct;
+use case::case_unit;
+
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::case::case_apply;
-use crate::eval::eval_expr::case::case_closure;
-use crate::eval::eval_expr::case::case_cond;
-use crate::eval::eval_expr::case::case_discard;
-use crate::eval::eval_expr::case::case_env_ref;
-use crate::eval::eval_expr::case::case_int;
-use crate::eval::eval_expr::case::case_let;
-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::EvalErr;
 use crate::eval::Expr;
 

diff --git a/src/eval/eval_expr/test/approx_pi.rs b/src/eval/eval_expr/test/approx_pi.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use crate::eval::env::parse_to_env;
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::std::std_code;
 use crate::infra::WrapRc;
 

diff --git a/src/eval/eval_expr/test/expt.rs b/src/eval/eval_expr/test/expt.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use crate::eval::env::parse_to_env;
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::std::std_code;
 use crate::infra::WrapRc;
 

diff --git a/src/eval/eval_expr/test/fib.rs b/src/eval/eval_expr/test/fib.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use crate::eval::env::parse_to_env;
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::std::std_code;
 use crate::infra::WrapRc;
 

diff --git a/src/eval/eval_expr/test/filter.rs b/src/eval/eval_expr/test/filter.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use crate::eval::env::parse_to_env;
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::std::std_code;
 use crate::infra::WrapRc;
 

diff --git a/src/eval/eval_expr/test/find.rs b/src/eval/eval_expr/test/find.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use crate::eval::env::parse_to_env;
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::std::std_code;
 use crate::infra::WrapRc;
 

diff --git a/src/eval/eval_expr/test/gcd.rs b/src/eval/eval_expr/test/gcd.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use crate::eval::env::parse_to_env;
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::std::std_code;
 use crate::infra::WrapRc;
 

diff --git a/src/eval/eval_expr/test/map.rs b/src/eval/eval_expr/test/map.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use crate::eval::env::parse_to_env;
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::std::std_code;
 use crate::infra::WrapRc;
 

diff --git a/src/eval/eval_expr/test/pi.rs b/src/eval/eval_expr/test/pi.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use crate::eval::env::parse_to_env;
 use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
-use crate::eval::eval_expr::eval_expr;
+use crate::eval::eval_expr;
 use crate::eval::std::std_code;
 use crate::infra::WrapRc;
 

diff --git a/src/eval/mod.rs b/src/eval/mod.rs
@@ -1,8 +1,9 @@
 pub mod env;
-pub mod eval_expr;
+mod eval_expr;
 mod r#macro;
 pub mod std;
 pub mod r#type;
 
+pub use eval_expr::*;
 pub use r#macro::*;
 pub use r#type::*;
diff --git a/src/infer/infer_type/case/apply/mod.rs b/src/infer/infer_type/case/apply/mod.rs
@@ -6,10 +6,11 @@ mod test;
 use std::ops::Deref;
 use std::rc::Rc;
 
+use case_ri::case_ri;
+use case_t_rc::case_t_rc;
+
 use crate::infer::env::ExprEnv;
 use crate::infer::env::TypeEnv;
-use crate::infer::infer_type::case::apply::case_ri::case_ri;
-use crate::infer::infer_type::case::apply::case_t_rc::case_t_rc;
 use crate::infer::infer_type::InferTypeRet;
 use crate::infer::infer_type::TypeMissMatch;
 use crate::infra::Triple;

diff --git a/src/infer/infer_type/case/closure/mod.rs b/src/infer/infer_type/case/closure/mod.rs
@@ -6,10 +6,11 @@ mod test;
 use std::ops::Deref;
 use std::rc::Rc;
 
+use has_input_type::has_input_type;
+use no_input_type::no_input_type;
+
 use crate::infer::env::ExprEnv;
 use crate::infer::env::TypeEnv;
-use crate::infer::infer_type::case::closure::has_input_type::has_input_type;
-use crate::infer::infer_type::case::closure::no_input_type::no_input_type;
 use crate::infer::infer_type::r#fn::destruct_namely_type;
 use crate::infer::infer_type::InferTypeRet;
 use crate::infer::infer_type::ReqInfo;

diff --git a/src/infer/infer_type/case/cond/infer_branch_type/mod.rs b/src/infer/infer_type/case/cond/infer_branch_type/mod.rs
@@ -2,14 +2,16 @@ mod case_ri;
 mod case_t_rc;
 
 use std::rc::Rc;
+
+use case_ri::case_ri;
+use case_t_rc::case_t_rc;
+
 use crate::infer::env::ExprEnv;
 use crate::infer::env::TypeEnv;
-use crate::infer::infer_type::case::cond::infer_branch_type::case_ri::case_ri;
-use crate::infer::infer_type::case::cond::infer_branch_type::case_t_rc::case_t_rc;
 use crate::infer::infer_type::InferTypeRet;
+use crate::infra::Triple;
 use crate::infra::WrapOption;
 use crate::infra::WrapRc;
-use crate::infra::Triple;
 use crate::parser::expr::r#type::Expr;
 use crate::parser::r#type::OptType;
 

diff --git a/src/infer/infer_type/case/cond/mod.rs b/src/infer/infer_type/case/cond/mod.rs
@@ -4,10 +4,11 @@ mod test;
 
 use std::rc::Rc;
 
+use infer_branch_type::infer_branch_type;
+
 use crate::infer::env::bool_type;
 use crate::infer::env::ExprEnv;
 use crate::infer::env::TypeEnv;
-use crate::infer::infer_type::case::cond::infer_branch_type::infer_branch_type;
 use crate::infer::infer_type::InferTypeRet;
 use crate::infer::infer_type::ReqConstraint;
 use crate::infer::infer_type::ReqInfo;

diff --git a/src/infer/infer_type/case/let/mod.rs b/src/infer/infer_type/case/let/mod.rs
@@ -6,10 +6,11 @@ mod test;
 
 use std::rc::Rc;
 
+use case_ri::case_ri;
+use case_t_rc::case_t_rc;
+
 use crate::infer::env::ExprEnv;
 use crate::infer::env::TypeEnv;
-use crate::infer::infer_type::case::r#let::case_ri::case_ri;
-use crate::infer::infer_type::case::r#let::case_t_rc::case_t_rc;
 use crate::infer::infer_type::InferTypeRet;
 use crate::infer::infer_type::TypeMissMatch;
 use crate::infra::Triple;

diff --git a/src/infer/infer_type/case/match/case_ri.rs b/src/infer/infer_type/case/match/case_ri.rs
@@ -1,8 +1,8 @@
 use std::rc::Rc;
 
+use super::r#fn::destruct_match_const_to_expr_env_inject;
 use crate::infer::env::ExprEnv;
 use crate::infer::env::TypeEnv;
-use crate::infer::infer_type::case::r#match::r#fn::destruct_match_const_to_expr_env_inject;
 use crate::infer::infer_type::InferTypeRet;
 use crate::infer::infer_type::ReqInfo;
 use crate::infer::infer_type::TypeMissMatch;