pub use mods

Thaumy · Nov 18, 2023 · de0e0a3 · de0e0a3
1 parent 7d86f3a
commit de0e0a3
Show file tree

Hide file tree

Showing 138 changed files with 363 additions and 353 deletions.
diff --git a/src/eval/env/expr_env.rs b/src/eval/env/expr_env.rs
@@ -2,8 +2,8 @@ use std::rc::Rc;
 
 use crate::eval::Expr;
 use crate::eval::Type;
-use crate::infra::option::WrapOption;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapOption;
 
 // 某些表达式可能是递归定义的(常见于顶层环境和 Let)
 // 对于这样的表达式, 其求值环境将具具备自引用结构

diff --git a/src/eval/env/mod.rs b/src/eval/env/mod.rs
@@ -13,20 +13,17 @@ use crate::infer::infer_type_of_defs::{
     infer_type_of_defs,
     InferErr
 };
-use crate::infra::option::WrapOption;
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
-use crate::infra::vec::VecExt;
+use crate::infra::RcAnyExt;
+use crate::infra::VecExt;
+use crate::infra::WrapOption;
+use crate::infra::WrapResult;
 use crate::lexer::lexical_analyze;
 use crate::parser::ast::parse_ast;
 use crate::parser::expr::r#type::{
     Expr as CtExpr,
     OptExpr as OptCtExpr
 };
-use crate::parser::r#type::r#type::{
-    OptType as OptCtType,
-    Type as CtType
-};
+use crate::parser::r#type::{OptType as OptCtType, Type as CtType};
 use crate::pp::preprocess;
 
 mod expr_env;

diff --git a/src/eval/env/type_env.rs b/src/eval/env/type_env.rs
@@ -1,7 +1,7 @@
 use std::collections::BTreeSet;
 
 use crate::eval::Type;
-use crate::infra::option::WrapOption;
+use crate::infra::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
@@ -7,7 +7,7 @@ use crate::eval::EvalErr;
 use crate::eval::Expr;
 use crate::eval::Type;
 use crate::eval::{false_type, namely_type, true_type};
-use crate::infra::result::WrapResult;
+use crate::infra::WrapResult;
 
 mod primitive_apply;
 mod source_lhs_to_closure;

diff --git a/src/eval/eval_expr/case/apply/fn/primitive_apply.rs b/src/eval/eval_expr/case/apply/fn/primitive_apply.rs
@@ -12,8 +12,8 @@ use crate::eval::eval_expr::case::apply::{
 use crate::eval::eval_expr::EvalRet;
 use crate::eval::Expr;
 use crate::eval::PrimitiveOp;
-use crate::infra::option::WrapOption;
-use crate::infra::result::WrapResult;
+use crate::infra::WrapOption;
+use crate::infra::WrapResult;
 
 pub fn primitive_apply(
     type_env: &TypeEnv,

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
@@ -8,9 +8,9 @@ use crate::eval::EvalErr;
 use crate::eval::Expr;
 use crate::eval::PrimitiveOp;
 use crate::eval::Type;
-use crate::infra::either::{Either, EitherAnyExt};
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapResult;
+use crate::infra::{Either, EitherAnyExt};
 
 pub fn source_lhs_expr_to_closure(
     type_env: &'_ TypeEnv,

diff --git a/src/eval/eval_expr/case/apply/mod.rs b/src/eval/eval_expr/case/apply/mod.rs
@@ -6,9 +6,9 @@ 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::Either;
-use crate::infra::option::WrapOption;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::Either;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapOption;
 
 mod r#fn;
 pub use r#fn::*;

diff --git a/src/eval/eval_expr/case/apply/test.rs b/src/eval/eval_expr/case/apply/test.rs
@@ -4,9 +4,9 @@ use crate::eval::eval_expr::eval_expr;
 use crate::eval::namely_type;
 use crate::eval::Expr;
 use crate::eval::PrimitiveOp;
-use crate::infra::option::WrapOption;
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapOption;
+use crate::infra::WrapResult;
 
 // neg 10
 #[test]

diff --git a/src/eval/eval_expr/case/closure/mod.rs b/src/eval/eval_expr/case/closure/mod.rs
@@ -4,8 +4,8 @@ use crate::eval::env::ExprEnv;
 use crate::eval::eval_expr::EvalRet;
 use crate::eval::Expr;
 use crate::eval::Type;
-use crate::infra::option::WrapOption;
-use crate::infra::result::WrapResult;
+use crate::infra::WrapOption;
+use crate::infra::WrapResult;
 
 #[cfg(test)]
 mod test;

diff --git a/src/eval/eval_expr/case/closure/test.rs b/src/eval/eval_expr/case/closure/test.rs
@@ -3,9 +3,9 @@ use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::Expr;
 use crate::eval::{closure_type, namely_type};
-use crate::infra::option::WrapOption;
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapOption;
+use crate::infra::WrapResult;
 
 // (a: Int) -> 1
 #[test]

diff --git a/src/eval/eval_expr/case/cond/test.rs b/src/eval/eval_expr/case/cond/test.rs
@@ -3,8 +3,8 @@ use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::namely_type;
 use crate::eval::Expr;
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapResult;
 
 // if false then 10 else 20
 #[test]

diff --git a/src/eval/eval_expr/case/discard.rs b/src/eval/eval_expr/case/discard.rs
@@ -1,7 +1,7 @@
 use crate::eval::eval_expr::EvalRet;
 use crate::eval::EvalErr;
 use crate::eval::Type;
-use crate::infra::result::WrapResult;
+use crate::infra::WrapResult;
 
 pub fn case_discard(type_annot: &Type) -> EvalRet {
     EvalErr::EvalDiscard(format!("Trying to eval _:{type_annot:?}"))
@@ -17,7 +17,7 @@ mod test {
     use crate::eval::eval_expr::eval_expr;
     use crate::eval::namely_type;
     use crate::eval::Expr;
-    use crate::infra::rc::RcAnyExt;
+    use crate::infra::RcAnyExt;
 
     // _: Int
     #[test]

diff --git a/src/eval/eval_expr/case/env_ref/mod.rs b/src/eval/eval_expr/case/env_ref/mod.rs
@@ -7,7 +7,7 @@ use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::{eval_expr, EvalRet};
 use crate::eval::EvalErr;
-use crate::infra::result::WrapResult;
+use crate::infra::WrapResult;
 
 pub fn case_env_ref(
     type_env: &TypeEnv,

diff --git a/src/eval/eval_expr/case/env_ref/test.rs b/src/eval/eval_expr/case/env_ref/test.rs
@@ -3,9 +3,9 @@ use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::namely_type;
 use crate::eval::Expr;
-use crate::infra::option::WrapOption;
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapOption;
+use crate::infra::WrapResult;
 
 // def a = 10
 #[test]

diff --git a/src/eval/eval_expr/case/int.rs b/src/eval/eval_expr/case/int.rs
@@ -1,7 +1,7 @@
 use crate::eval::eval_expr::EvalRet;
 use crate::eval::Expr;
 use crate::eval::Type;
-use crate::infra::result::WrapResult;
+use crate::infra::WrapResult;
 
 pub fn case_int(type_annot: &Type, int_value: &i64) -> EvalRet {
     Expr::Int(type_annot.clone(), *int_value).wrap_ok()
@@ -14,8 +14,8 @@ mod test {
     use crate::eval::eval_expr::eval_expr;
     use crate::eval::namely_type;
     use crate::eval::Expr;
-    use crate::infra::rc::RcAnyExt;
-    use crate::infra::result::WrapResult;
+    use crate::infra::RcAnyExt;
+    use crate::infra::WrapResult;
 
     // 10: Int
     #[test]

diff --git a/src/eval/eval_expr/case/let/mod.rs b/src/eval/eval_expr/case/let/mod.rs
@@ -8,8 +8,8 @@ use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::{eval_expr, EvalRet};
 use crate::eval::Expr;
 use crate::eval::Type;
-use crate::infra::option::WrapOption;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapOption;
 
 pub fn case_let(
     type_env: &TypeEnv,

diff --git a/src/eval/eval_expr/case/let/test.rs b/src/eval/eval_expr/case/let/test.rs
@@ -3,8 +3,8 @@ use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::namely_type;
 use crate::eval::Expr;
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapResult;
 
 // let a = 10 in a
 #[test]

diff --git a/src/eval/eval_expr/case/match/fn.rs b/src/eval/eval_expr/case/match/fn.rs
@@ -3,8 +3,8 @@ use std::rc::Rc;
 use crate::eval::env::TypeEnv;
 use crate::eval::env::{ExprEnv, ExprEnvEntry};
 use crate::eval::{Expr, StructField};
-use crate::infra::option::WrapOption;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapOption;
 
 fn is_struct_match_pattern_then_env_vec(
     type_env: &TypeEnv,

diff --git a/src/eval/eval_expr/case/match/mod.rs b/src/eval/eval_expr/case/match/mod.rs
@@ -12,9 +12,9 @@ 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;
-use crate::infra::option::WrapOption;
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapOption;
+use crate::infra::WrapResult;
 
 pub fn case_match(
     type_env: &TypeEnv,

diff --git a/src/eval/eval_expr/case/match/test.rs b/src/eval/eval_expr/case/match/test.rs
@@ -6,8 +6,8 @@ use crate::eval::eval_expr::eval_expr;
 use crate::eval::namely_type;
 use crate::eval::EvalErr;
 use crate::eval::Expr;
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapResult;
 
 // match 5 with
 // | 10 -> 1

diff --git a/src/eval/eval_expr/case/primitive_op/mod.rs b/src/eval/eval_expr/case/primitive_op/mod.rs
@@ -4,7 +4,7 @@ use crate::eval::eval_expr::EvalRet;
 use crate::eval::Expr;
 use crate::eval::PrimitiveOp;
 use crate::eval::Type;
-use crate::infra::result::WrapResult;
+use crate::infra::WrapResult;
 
 #[cfg(test)]
 mod test;

diff --git a/src/eval/eval_expr/case/primitive_op/test.rs b/src/eval/eval_expr/case/primitive_op/test.rs
@@ -4,9 +4,9 @@ use crate::eval::eval_expr::eval_expr;
 use crate::eval::Expr;
 use crate::eval::PrimitiveOp;
 use crate::eval::{closure_type, namely_type};
-use crate::infra::option::WrapOption;
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapOption;
+use crate::infra::WrapResult;
 
 // add
 #[test]

diff --git a/src/eval/eval_expr/case/struct/mod.rs b/src/eval/eval_expr/case/struct/mod.rs
@@ -9,9 +9,9 @@ use crate::eval::eval_expr::{eval_expr, EvalRet};
 use crate::eval::EvalErr;
 use crate::eval::Type;
 use crate::eval::{Expr, StructField};
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
-use crate::infra::vec::VecExt;
+use crate::infra::RcAnyExt;
+use crate::infra::VecExt;
+use crate::infra::WrapResult;
 
 pub fn case_struct(
     type_env: &TypeEnv,

diff --git a/src/eval/eval_expr/case/struct/test.rs b/src/eval/eval_expr/case/struct/test.rs
@@ -3,8 +3,8 @@ use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::Expr;
 use crate::eval::{namely_type, prod_type};
-use crate::infra::rc::RcAnyExt;
-use crate::infra::result::WrapResult;
+use crate::infra::RcAnyExt;
+use crate::infra::WrapResult;
 
 // { a: Int = 10, b: Bool = true, c: Unit = ()}
 #[test]

diff --git a/src/eval/eval_expr/case/unit.rs b/src/eval/eval_expr/case/unit.rs
@@ -1,7 +1,7 @@
 use crate::eval::eval_expr::EvalRet;
 use crate::eval::Expr;
 use crate::eval::Type;
-use crate::infra::result::WrapResult;
+use crate::infra::WrapResult;
 
 pub fn case_unit(type_annot: &Type) -> EvalRet {
     Expr::Unit(type_annot.clone()).wrap_ok()
@@ -14,8 +14,8 @@ mod test {
     use crate::eval::eval_expr::eval_expr;
     use crate::eval::namely_type;
     use crate::eval::Expr;
-    use crate::infra::rc::RcAnyExt;
-    use crate::infra::result::WrapResult;
+    use crate::infra::RcAnyExt;
+    use crate::infra::WrapResult;
 
     // (): Unit
     #[test]

diff --git a/src/eval/eval_expr/test/approx_pi.rs b/src/eval/eval_expr/test/approx_pi.rs
@@ -5,7 +5,7 @@ use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::std::std_code;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::RcAnyExt;
 
 fn gen_env<'t>() -> (TypeEnv<'t>, Rc<ExprEnv>) {
     let seq =  std_code().to_owned().to_owned() +

diff --git a/src/eval/eval_expr/test/expt.rs b/src/eval/eval_expr/test/expt.rs
@@ -5,7 +5,7 @@ use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::std::std_code;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::RcAnyExt;
 
 fn gen_env<'t>() -> (TypeEnv<'t>, Rc<ExprEnv>) {
     let seq = std_code().to_owned().to_owned() +

diff --git a/src/eval/eval_expr/test/fib.rs b/src/eval/eval_expr/test/fib.rs
@@ -5,7 +5,7 @@ use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::std::std_code;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::RcAnyExt;
 
 fn gen_env<'t>() -> (TypeEnv<'t>, Rc<ExprEnv>) {
     let seq = std_code().to_owned() +

diff --git a/src/eval/eval_expr/test/filter.rs b/src/eval/eval_expr/test/filter.rs
@@ -5,7 +5,7 @@ use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::std::std_code;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::RcAnyExt;
 
 fn gen_env<'t>() -> (TypeEnv<'t>, Rc<ExprEnv>) {
     let seq = std_code().to_owned() +

diff --git a/src/eval/eval_expr/test/find.rs b/src/eval/eval_expr/test/find.rs
@@ -5,7 +5,7 @@ use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::std::std_code;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::RcAnyExt;
 
 fn gen_env<'t>() -> (TypeEnv<'t>, Rc<ExprEnv>) {
     let seq = std_code().to_owned() +

diff --git a/src/eval/eval_expr/test/gcd.rs b/src/eval/eval_expr/test/gcd.rs
@@ -5,7 +5,7 @@ use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::std::std_code;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::RcAnyExt;
 
 fn gen_env<'t>() -> (TypeEnv<'t>, Rc<ExprEnv>) {
     let seq = std_code().to_owned() +

diff --git a/src/eval/eval_expr/test/map.rs b/src/eval/eval_expr/test/map.rs
@@ -5,7 +5,7 @@ use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::std::std_code;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::RcAnyExt;
 
 fn gen_env<'t>() -> (TypeEnv<'t>, Rc<ExprEnv>) {
     let seq = std_code().to_owned() +

diff --git a/src/eval/eval_expr/test/pi.rs b/src/eval/eval_expr/test/pi.rs
@@ -5,7 +5,7 @@ use crate::eval::env::ExprEnv;
 use crate::eval::env::TypeEnv;
 use crate::eval::eval_expr::eval_expr;
 use crate::eval::std::std_code;
-use crate::infra::rc::RcAnyExt;
+use crate::infra::RcAnyExt;
 
 fn gen_env<'t>() -> (TypeEnv<'t>, Rc<ExprEnv>) {
     let seq = std_code().to_owned() +