From 83b2e0b3ceda907b7186acfcc56c214fc04d9c13 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 7 Feb 2013 19:38:32 -0800
Subject: Remove some macros

---
 src/map/magic-interpreter-aux.hpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/map/magic-interpreter-aux.hpp')

diff --git a/src/map/magic-interpreter-aux.hpp b/src/map/magic-interpreter-aux.hpp
index 983d3d6..4bb0a82 100644
--- a/src/map/magic-interpreter-aux.hpp
+++ b/src/map/magic-interpreter-aux.hpp
@@ -1,8 +1,18 @@
 #ifndef MAGIC_INTERPRETER_AUX_HPP
 #define MAGIC_INTERPRETER_AUX_HPP
 
-#define CHECK_TYPE(v, t) ((v)->ty == t)
+#include "magic-interpreter.t.hpp"
 
-#define VAR(i) ((!env->vars || env->vars[i].ty == TY_UNDEF)? env->base_env->vars[i] : env->vars[i])
+template<class T>
+bool CHECK_TYPE(T *v, TYPE t)
+{
+    return v->ty == t;
+}
+
+// FIXME: macro capture!
+#define VAR(i)  \
+    ((!env->vars || env->vars[i].ty == TYPE::UNDEF)   \
+            ? env->base_env->vars[i]                \
+            : env->vars[i])
 
 #endif // MAGIC_INTERPRETER_AUX_HPP
-- 
cgit v1.2.3-70-g09d2