aboutsummaryrefslogtreecommitdiffstats
path: root/src/unify.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-10-17 05:36:14 +0000
committerDavid Robillard <d@drobilla.net>2009-10-17 05:36:14 +0000
commit67dc4b38fab410dfa3a94fed5261bd1414c3e689 (patch)
tree492bb1f170fd48a62e9f72e2823a47cb8fe9f7a6 /src/unify.cpp
parentd066490a1ee302059731d3884dbbe2bae9d7173a (diff)
downloadresp-67dc4b38fab410dfa3a94fed5261bd1414c3e689.tar.gz
resp-67dc4b38fab410dfa3a94fed5261bd1414c3e689.tar.bz2
resp-67dc4b38fab410dfa3a94fed5261bd1414c3e689.zip
Fix ellipses unification logic.
git-svn-id: http://svn.drobilla.net/resp/tuplr@244 ad02d1e2-f140-0410-9f75-f8b11f17cedd
Diffstat (limited to 'src/unify.cpp')
-rw-r--r--src/unify.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/unify.cpp b/src/unify.cpp
index 278f3a5..dbc938f 100644
--- a/src/unify.cpp
+++ b/src/unify.cpp
@@ -136,9 +136,8 @@ unify(const Constraints& constraints)
else
cp.push_back(Constraint(st, tt, st->loc));
}
- if (si == s->end() && ti == t->end()
- || (*ti)->as<AType*>()->kind == AType::DOTS
- || (*si)->as<AType*>()->kind == AType::DOTS)
+ if (si == s->end() && (ti == t->end() || (*ti)->as<AType*>()->kind == AType::DOTS)
+ || ti == t->end() && (*si)->as<AType*>()->kind == AType::DOTS)
return unify(cp);
}
throw Error(s->loc ? s->loc : t->loc,