Macro -> function

binary-banter · Nov 8, 2023 · 5783ada · 5783ada
1 parent 96cc564
commit 5783ada
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/compiler/src/passes/validate/type_check/mod.rs b/compiler/src/passes/validate/type_check/mod.rs
@@ -28,7 +28,6 @@ use crate::passes::validate::type_check::uncover_globals::uncover_globals;
 use crate::passes::validate::type_check::validate_expr::validate_expr;
 use crate::passes::validate::type_check::validate_typedef::validate_typedef;
 use crate::passes::validate::{PrgTypeChecked, TExpr};
-use crate::s;
 use crate::utils::expect::expect;
 use crate::utils::push_map::PushMap;
 use std::collections::HashMap;
@@ -135,8 +134,8 @@ pub fn expect_type_eq<'p>(
         MismatchedTypes {
             t1: t1.clone().fmap(str::to_string),
             t2: t2.clone().fmap(str::to_string),
-            span_t1: s!(e1.span),
-            span_t2: s!(e2.span),
+            span_t1: s(e1.span),
+            span_t2: s(e2.span),
         },
     )?;
 
@@ -153,14 +152,11 @@ pub fn expect_type<'p>(
         MismatchedType {
             got: typ.clone().fmap(str::to_string),
             expect: expected.clone().fmap(str::to_string),
-            span: s!(expr.span),
+            span: s(expr.span),
         },
     )
 }
 
-#[macro_export]
-macro_rules! s {
-    ($span:expr) => {
-        ($span.0, $span.1 - $span.0)
-    };
+pub fn s(span: (usize, usize)) -> (usize, usize) {
+    (span.0, span.1 - span.0)
 }
diff --git a/compiler/src/passes/validate/type_check/validate_assign.rs b/compiler/src/passes/validate/type_check/validate_assign.rs
@@ -3,9 +3,8 @@ use crate::passes::parse::{Expr, Spanned};
 use crate::passes::validate::type_check::error::TypeError;
 use crate::passes::validate::type_check::error::TypeError::*;
 use crate::passes::validate::type_check::validate_expr::validate_expr;
-use crate::passes::validate::type_check::{Env, EnvEntry};
+use crate::passes::validate::type_check::{Env, EnvEntry, s};
 use crate::passes::validate::TExpr;
-use crate::s;
 use crate::utils::expect::expect;
 
 pub fn validate_assign<'p>(
@@ -16,7 +15,7 @@ pub fn validate_assign<'p>(
 ) -> Result<Spanned<TExpr<'p, &'p str>>, TypeError> {
     let entry = env.scope.get(&sym.inner).ok_or(UndeclaredVar {
         sym: (*sym.inner).to_string(),
-        span: s!(sym.span),
+        span: s(sym.span),
     })?;
 
     let EnvEntry::Type { mutable, .. } = entry else {

diff --git a/compiler/src/passes/validate/type_check/validate_lit.rs b/compiler/src/passes/validate/type_check/validate_lit.rs
@@ -3,7 +3,7 @@ use crate::passes::parse::{Lit, Spanned};
 use crate::passes::validate::type_check::error::TypeError;
 use crate::passes::validate::type_check::error::TypeError::*;
 use crate::passes::validate::{TExpr, TLit};
-use crate::s;
+use crate::passes::validate::type_check::s;
 
 pub fn validate_lit<'p>(
     val: Lit,
@@ -13,7 +13,7 @@ pub fn validate_lit<'p>(
         Lit::Int { val } => {
             let val = val
                 .parse()
-                .map_err(|_| IntegerOutOfBounds { span: s!(span) })?;
+                .map_err(|_| IntegerOutOfBounds { span: s(span) })?;
 
             TExpr::Lit {
                 val: TLit::Int { val },

diff --git a/compiler/src/passes/validate/type_check/validate_var.rs b/compiler/src/passes/validate/type_check/validate_var.rs
@@ -1,9 +1,8 @@
 use crate::passes::parse::Spanned;
 use crate::passes::validate::type_check::error::TypeError;
 use crate::passes::validate::type_check::error::TypeError::*;
-use crate::passes::validate::type_check::{Env, EnvEntry};
+use crate::passes::validate::type_check::{Env, EnvEntry, s};
 use crate::passes::validate::TExpr;
-use crate::s;
 
 pub fn validate_var<'p>(
     sym: &'p str,
@@ -12,7 +11,7 @@ pub fn validate_var<'p>(
 ) -> Result<Spanned<TExpr<'p, &'p str>>, TypeError> {
     let entry = env.scope.get(&sym).ok_or(UndeclaredVar {
         sym: (*sym).to_string(),
-        span: s!(span),
+        span: s(span),
     })?;
 
     let EnvEntry::Type { typ, .. } = entry else {