summaryrefslogtreecommitdiff
path: root/src/map/magic-interpreter-aux.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/magic-interpreter-aux.hpp')
-rw-r--r--src/map/magic-interpreter-aux.hpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/map/magic-interpreter-aux.hpp b/src/map/magic-interpreter-aux.hpp
index ea05b88..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;
+}
-#endif /* !defined(MAGIC_INTERPRETER_AUX_H_) */
+// 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