a

mahkoh · Jun 27, 2020 · 6682b22 · 6682b22
1 parent cee0147
commit 6682b22
Show file tree

Hide file tree

Showing 16 changed files with 562 additions and 445 deletions.
diff --git a/src/diag.rs b/src/diag.rs
@@ -295,6 +295,7 @@ impl Diagnostic {
             ErrorType::CannotStringifyNonInteger => {
                 format!("cannot stringify numbers that are not integers")
             }
+            ErrorType::UnmatchedToken(tt) => format!("unmatched token `{}`", tt.as_str()),
         };
         self.common(msg.span, "error: ", &text);
         self.trace(e, msg);

diff --git a/src/eval/force.rs b/src/eval/force.rs
@@ -118,7 +118,7 @@ impl Elang {
         let ctx = ErrorContext::EvalArithmetic(expr.id);
 
         let num = |slf: &mut Self, v| match slf.get_int_(v) {
-            Ok(v) => Ok(v.clone()),
+            Ok(v) => Ok(v),
             Err(mut e) => {
                 e.context.push(ctx);
                 Err(e)
@@ -136,7 +136,11 @@ impl Elang {
                     return self.error(denom, ErrorType::DivideByZero).ctx(ctx);
                 }
                 let res = &*numer / &*denom_;
-                if int { res.trunc() } else { res }
+                if int {
+                    res.trunc()
+                } else {
+                    res
+                }
             }
             ExprType::Mod { numer, denom, int } => {
                 let numer = num(self, numer)?;
@@ -145,7 +149,11 @@ impl Elang {
                     return self.error(denom, ErrorType::DivideByZero).ctx(ctx);
                 }
                 let res = &*numer % &*denom_;
-                if int { res.trunc() } else { res }
+                if int {
+                    res.trunc()
+                } else {
+                    res
+                }
             }
             ExprType::Neg { val } => (*num(self, val)?).clone().neg(),
             _ => unreachable!(),

diff --git a/src/eval/mod.rs b/src/eval/mod.rs
@@ -123,18 +123,58 @@ impl Elang {
                 ExprType::Mul { lhs, rhs } => {
                     bin!(|lhs, rhs| ExprType::Mul { lhs, rhs }, lhs, rhs)
                 }
-                ExprType::Div { numer, denom, int: true } => {
-                    bin!(|numer, denom| ExprType::Div { numer, denom, int: true }, numer, denom)
-                }
-                ExprType::Mod { numer, denom, int: true } => {
-                    bin!(|numer, denom| ExprType::Mod { numer, denom, int: true }, numer, denom)
-                }
-                ExprType::Div { numer, denom, int: false } => {
-                    bin!(|numer, denom| ExprType::Div { numer, denom, int: false }, numer, denom)
-                }
-                ExprType::Mod { numer, denom, int: false } => {
-                    bin!(|numer, denom| ExprType::Mod { numer, denom, int: false }, numer, denom)
-                }
+                ExprType::Div {
+                    numer,
+                    denom,
+                    int: true,
+                } => bin!(
+                    |numer, denom| ExprType::Div {
+                        numer,
+                        denom,
+                        int: true
+                    },
+                    numer,
+                    denom
+                ),
+                ExprType::Mod {
+                    numer,
+                    denom,
+                    int: true,
+                } => bin!(
+                    |numer, denom| ExprType::Mod {
+                        numer,
+                        denom,
+                        int: true
+                    },
+                    numer,
+                    denom
+                ),
+                ExprType::Div {
+                    numer,
+                    denom,
+                    int: false,
+                } => bin!(
+                    |numer, denom| ExprType::Div {
+                        numer,
+                        denom,
+                        int: false
+                    },
+                    numer,
+                    denom
+                ),
+                ExprType::Mod {
+                    numer,
+                    denom,
+                    int: false,
+                } => bin!(
+                    |numer, denom| ExprType::Mod {
+                        numer,
+                        denom,
+                        int: false
+                    },
+                    numer,
+                    denom
+                ),
                 ExprType::Gt { lhs, rhs } => {
                     bin!(|lhs, rhs| ExprType::Gt { lhs, rhs }, lhs, rhs)
                 }
@@ -303,7 +343,7 @@ impl Elang {
                     },
             } => ExprType::Fn {
                 func: FnType::Normal {
-                    param: Spanned::new(span, FnParam::Ident { param_name }),
+                    param: span.span(FnParam::Ident { param_name }),
                     body: copy!(body),
                 },
             },
@@ -334,7 +374,7 @@ impl Elang {
                 };
                 ExprType::Fn {
                     func: FnType::Normal {
-                        param: Spanned::new(span, pat),
+                        param: span.span(pat),
                         body: copy!(body),
                     },
                 }