rename ResultAnyExt

Thaumy · Nov 18, 2023 · 734863a · 734863a
1 parent 0901c1a
commit 734863a
Show file tree

Hide file tree

Showing 29 changed files with 174 additions and 157 deletions.
diff --git a/src/eval/env/mod.rs b/src/eval/env/mod.rs
@@ -17,7 +17,7 @@ use crate::infer::infer_type_of_defs::{
 };
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
-use crate::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 use crate::infra::vec::VecExt;
 use crate::lexer::lexical_analyze;
 use crate::parser::ast::parse_ast;
@@ -63,7 +63,7 @@ fn ct_expr_env_vec_to_rt_expr_env_vec(
             _ => unreachable!()
         })
         .collect::<Vec<ExprEnvEntry>>()
-        .ok()
+        .wrap_ok()
 }
 
 fn def_map_to_env_vec(
@@ -73,23 +73,24 @@ fn def_map_to_env_vec(
     let (ct_type_env_vec, ct_expr_env_vec) =
         def_map_to_ct_env_vec(type_def_map, expr_def_map);
 
-    let rt_type_env_vec: Vec<TypeEnvEntry> =
-        ct_type_env_vec
-            .clone()
-            .into_iter()
-            .map(|(n, t)| (n, t.into()))
-            .try_fold(vec![], |acc, x| match x {
-                (n, Some(t)) => acc.chain_push((n, t)).ok(),
-                x => InferErr::of(format!("Invalid type def: {x:?}"))
-                    .err()
-            })?;
+    let rt_type_env_vec: Vec<TypeEnvEntry> = ct_type_env_vec
+        .clone()
+        .into_iter()
+        .map(|(n, t)| (n, t.into()))
+        .try_fold(vec![], |acc, x| match x {
+            (n, Some(t)) => acc
+                .chain_push((n, t))
+                .wrap_ok(),
+            x => InferErr::of(format!("Invalid type def: {x:?}"))
+                .wrap_err()
+        })?;
 
     let rt_expr_env_vec = ct_expr_env_vec_to_rt_expr_env_vec(
         CtTypeEnv::new(ct_type_env_vec),
         ct_expr_env_vec
     )?;
 
-    (rt_type_env_vec, rt_expr_env_vec).ok()
+    (rt_type_env_vec, rt_expr_env_vec).wrap_ok()
 }
 
 pub fn parse_to_env<'t>(

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::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::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 
 pub mod primitive_apply;
 pub mod source_lhs_to_closure;
@@ -18,9 +18,10 @@ pub fn eval_to_bool(
     expr: &Rc<Expr>
 ) -> Result<bool, EvalErr> {
     match eval_expr(type_env, expr_env, expr)? {
-        Expr::Int(Type::NamelyType(n), 1) if n == "True" => true.ok(),
+        Expr::Int(Type::NamelyType(n), 1) if n == "True" =>
+            true.wrap_ok(),
         Expr::Int(Type::NamelyType(n), 0) if n == "False" =>
-            false.ok(),
+            false.wrap_ok(),
         _ => unreachable!()
     }
 }
@@ -31,7 +32,8 @@ pub fn eval_to_int(
     expr: &Rc<Expr>
 ) -> Result<i64, EvalErr> {
     match eval_expr(type_env, expr_env, expr)? {
-        Expr::Int(Type::NamelyType(n), i) if n == "Int" => i.ok(),
+        Expr::Int(Type::NamelyType(n), i) if n == "Int" =>
+            i.wrap_ok(),
         _ => unreachable!()
     }
 }

diff --git a/src/eval/eval_expr/case/apply/fn/primitive_apply.rs b/src/eval/eval_expr/case/apply/fn/primitive_apply.rs
@@ -13,7 +13,7 @@ use crate::eval::eval_expr::EvalRet;
 use crate::eval::r#type::expr::primitive_op::PrimitiveOp;
 use crate::eval::r#type::expr::Expr;
 use crate::infra::option::WrapOption;
-use crate::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 
 pub fn primitive_apply(
     type_env: &TypeEnv,
@@ -96,5 +96,5 @@ pub fn primitive_apply(
         PrimitiveOp::Or(Some(e)) =>
             bool_expr(lhs_bool(e)? || rhs_bool()?),
     }
-    .ok()
+    .wrap_ok()
 }
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
@@ -10,7 +10,7 @@ use crate::eval::r#type::expr::Expr;
 use crate::eval::r#type::r#type::Type;
 use crate::infra::either::{Either, EitherAnyExt};
 use crate::infra::rc::RcAnyExt;
-use crate::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 
 pub fn source_lhs_expr_to_closure(
     type_env: &'_ TypeEnv,
@@ -42,7 +42,7 @@ pub fn source_lhs_expr_to_closure(
                 .unwrap_or(expr_env.clone())
         )
             .l()
-            .ok(),
+            .wrap_ok(),
 
         Expr::PrimitiveOp(_, op, lhs_eval_env) => (
             op.deref().clone(),
@@ -53,7 +53,7 @@ pub fn source_lhs_expr_to_closure(
                 .unwrap_or(expr_env.clone())
         )
             .r()
-            .ok(),
+            .wrap_ok(),
 
         // 由于现在 Closure 和 PrimitiveOp 会捕获环境
         // 所以可以对 lhs_expr 进行自由求值

diff --git a/src/eval/eval_expr/case/apply/test.rs b/src/eval/eval_expr/case/apply/test.rs
@@ -6,7 +6,7 @@ use crate::eval::r#type::expr::primitive_op::PrimitiveOp;
 use crate::eval::r#type::expr::Expr;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
-use crate::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 
 // neg 10
 #[test]
@@ -22,7 +22,7 @@ fn test_part1() {
 
     let r = Expr::Int(namely_type!("Int"), -10);
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
 
 // add 10
@@ -43,7 +43,7 @@ fn test_part2() {
             .wrap_some()
     ));
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
 
 // add 10 10
@@ -65,7 +65,7 @@ fn test_part3() {
 
     let r = Expr::Int(namely_type!("Int"), 20);
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
 
 // not false
@@ -86,7 +86,7 @@ fn test_part4() {
             .wrap_some()
     ));
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
 
 // and false
@@ -107,7 +107,7 @@ fn test_part5() {
             .wrap_some()
     ));
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
 
 // and true false
@@ -129,5 +129,5 @@ fn test_part6() {
 
     let r = Expr::Int(namely_type!("False"), 0);
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
diff --git a/src/eval/eval_expr/case/closure/mod.rs b/src/eval/eval_expr/case/closure/mod.rs
@@ -5,7 +5,7 @@ use crate::eval::eval_expr::EvalRet;
 use crate::eval::r#type::expr::Expr;
 use crate::eval::r#type::r#type::Type;
 use crate::infra::option::WrapOption;
-use crate::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 
 #[cfg(test)]
 mod test;
@@ -24,5 +24,5 @@ pub fn case_closure(
         output_expr.clone(),
         eval_env.clone().wrap_some()
     )
-    .ok()
+    .wrap_ok()
 }
diff --git a/src/eval/eval_expr/case/closure/test.rs b/src/eval/eval_expr/case/closure/test.rs
@@ -5,7 +5,7 @@ use crate::eval::r#macro::{closure_type, namely_type};
 use crate::eval::r#type::expr::Expr;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
-use crate::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 
 // (a: Int) -> 1
 #[test]
@@ -23,7 +23,7 @@ fn test_part1() {
     let evaluated =
         eval_expr(&type_env, &expr_env, &expr.clone().rc());
 
-    assert_ne!(evaluated, expr.ok());
+    assert_ne!(evaluated, expr.wrap_ok());
 }
 
 // (_: Int) -> 1
@@ -42,7 +42,7 @@ fn test_part2() {
     let evaluated =
         eval_expr(&type_env, &expr_env, &expr.clone().rc());
 
-    assert_ne!(evaluated, expr.ok());
+    assert_ne!(evaluated, expr.wrap_ok());
 }
 
 // (a: Int) -> 1
@@ -68,7 +68,7 @@ fn test_part3() {
         expr_env.wrap_some()
     );
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
 
 // (_: Int) -> 1
@@ -94,5 +94,5 @@ fn test_part4() {
         expr_env.wrap_some()
     );
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
diff --git a/src/eval/eval_expr/case/cond/test.rs b/src/eval/eval_expr/case/cond/test.rs
@@ -4,7 +4,7 @@ use crate::eval::eval_expr::eval_expr;
 use crate::eval::r#macro::namely_type;
 use crate::eval::r#type::expr::Expr;
 use crate::infra::rc::RcAnyExt;
-use crate::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 
 // if false then 10 else 20
 #[test]
@@ -21,7 +21,7 @@ fn test_part1() {
 
     let r = Expr::Int(namely_type!("Int"), 20);
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
 
 // if true then 10 else 20
@@ -39,5 +39,5 @@ fn test_part2() {
 
     let r = Expr::Int(namely_type!("Int"), 10);
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
diff --git a/src/eval/eval_expr/case/discard.rs b/src/eval/eval_expr/case/discard.rs
@@ -1,11 +1,11 @@
 use crate::eval::eval_expr::EvalRet;
 use crate::eval::r#type::eval_err::EvalErr;
 use crate::eval::r#type::r#type::Type;
-use crate::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 
 pub fn case_discard(type_annot: &Type) -> EvalRet {
     EvalErr::EvalDiscard(format!("Trying to eval _:{type_annot:?}"))
-        .err()
+        .wrap_err()
 }
 
 #[cfg(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::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::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 
 pub fn case_env_ref(
     type_env: &TypeEnv,
@@ -24,6 +24,6 @@ pub fn case_env_ref(
         None => EvalErr::EnvRefNotFound(format!(
             "EnvRef::{ref_name:?} not found in expr env"
         ))
-        .err()
+        .wrap_err()
     }
 }
diff --git a/src/eval/eval_expr/case/env_ref/test.rs b/src/eval/eval_expr/case/env_ref/test.rs
@@ -5,7 +5,7 @@ use crate::eval::r#macro::namely_type;
 use crate::eval::r#type::expr::Expr;
 use crate::infra::option::WrapOption;
 use crate::infra::rc::RcAnyExt;
-use crate::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 
 // def a = 10
 #[test]
@@ -26,7 +26,7 @@ fn test_part1() {
 
     let r = Expr::Int(namely_type!("Int"), 10);
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
 
 // def a = 10
@@ -57,7 +57,7 @@ fn test_part2() {
 
     let r = Expr::Int(namely_type!("Int"), 5);
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
 
 // def b = 10
@@ -99,5 +99,5 @@ fn test_part3() {
 
     let r = Expr::Int(namely_type!("Int"), 10);
 
-    assert_eq!(evaluated, r.ok());
+    assert_eq!(evaluated, r.wrap_ok());
 }
diff --git a/src/eval/eval_expr/case/int.rs b/src/eval/eval_expr/case/int.rs
@@ -1,10 +1,10 @@
 use crate::eval::eval_expr::EvalRet;
 use crate::eval::r#type::expr::Expr;
 use crate::eval::r#type::r#type::Type;
-use crate::infra::result::ResultAnyExt;
+use crate::infra::result::WrapResult;
 
 pub fn case_int(type_annot: &Type, int_value: &i64) -> EvalRet {
-    Expr::Int(type_annot.clone(), *int_value).ok()
+    Expr::Int(type_annot.clone(), *int_value).wrap_ok()
 }
 
 #[cfg(test)]
@@ -15,7 +15,7 @@ mod test {
     use crate::eval::r#macro::namely_type;
     use crate::eval::r#type::expr::Expr;
     use crate::infra::rc::RcAnyExt;
-    use crate::infra::result::ResultAnyExt;
+    use crate::infra::result::WrapResult;
 
     // 10: Int
     #[test]
@@ -27,6 +27,6 @@ mod test {
         let evaluated =
             eval_expr(&type_env, &expr_env, &expr.clone().rc());
 
-        assert_eq!(evaluated, expr.ok());
+        assert_eq!(evaluated, expr.wrap_ok());
     }
 }