From 24bacd4211b8c53e3eeee97fbc929a2f6c4a19e8 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 4 Jul 2009 05:48:25 +0000
Subject: Eliminate AType::var().

git-svn-id: http://svn.drobilla.net/resp/tuplr@185 ad02d1e2-f140-0410-9f75-f8b11f17cedd
---
 src/tuplr.hpp | 1 -
 src/unify.cpp | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/tuplr.hpp b/src/tuplr.hpp
index 4b6c4bc..da8eea5 100644
--- a/src/tuplr.hpp
+++ b/src/tuplr.hpp
@@ -318,7 +318,6 @@ struct AType : public ATuple {
 	AType(Cursor c) : ATuple(c), kind(EXPR), id(0) {}
 	AType(Cursor c, AST* ast, va_list args) : ATuple(c, ast, args), kind(EXPR), id(0) {}
 	CValue compile(CEnv& cenv) { return NULL; }
-	bool   var() const { return kind == VAR; }
 	bool concrete() const {
 		switch (kind) {
 		case VAR:  return false;
diff --git a/src/unify.cpp b/src/unify.cpp
index 864ea81..b013e0c 100644
--- a/src/unify.cpp
+++ b/src/unify.cpp
@@ -82,10 +82,10 @@ unify(const Constraints& constraints)
 
 	if (*s == *t) {
 		return unify(cp);
-	} else if (s->var() && !t->contains(s)) {
+	} else if (s->kind == AType::VAR && !t->contains(s)) {
 		cp.replace(s, t);
 		return Subst::compose(unify(cp), Subst(s, t));
-	} else if (t->var() && !s->contains(t)) {
+	} else if (t->kind == AType::VAR && !s->contains(t)) {
 		cp.replace(t, s);
 		return Subst::compose(unify(cp), Subst(t, s));
 	} else if (s->kind == AType::EXPR && s->kind == t->kind && s->size() == t->size()) {
-- 
cgit v1.2.1