diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/pprint.cpp (renamed from src/write.cpp) | 0 | ||||
| -rw-r--r-- | src/typing.cpp | 8 | ||||
| -rw-r--r-- | src/unify.cpp | 7 |
4 files changed, 9 insertions, 10 deletions
@@ -15,10 +15,10 @@ OBJECTS = \ build/gc.o \ build/gclib.so \ build/llvm.so \ + build/pprint.o \ build/tuplr.o \ build/typing.o \ - build/unify.o \ - build/write.o + build/unify.o build/tuplr: $(OBJECTS) g++ -o $@ $^ $(LDFLAGS) diff --git a/src/write.cpp b/src/pprint.cpp index 04e3401..04e3401 100644 --- a/src/write.cpp +++ b/src/pprint.cpp diff --git a/src/typing.cpp b/src/typing.cpp index 5791fdc..787f445 100644 --- a/src/typing.cpp +++ b/src/typing.cpp @@ -18,14 +18,6 @@ #include <set> #include "tuplr.hpp" -void -Constraints::constrain(TEnv& tenv, const AST* o, AType* t) -{ - assert(!o->to<const AType*>()); - push_back(Constraint(tenv.var(o), t, o->loc)); -} - - /*************************************************************************** * AST Type Constraints * ***************************************************************************/ diff --git a/src/unify.cpp b/src/unify.cpp index 2a8e6a0..91d6fde 100644 --- a/src/unify.cpp +++ b/src/unify.cpp @@ -22,6 +22,13 @@ * Type Inference/Substitution * ***************************************************************************/ +void +Constraints::constrain(TEnv& tenv, const AST* o, AType* t) +{ + assert(!o->to<const AType*>()); + push_back(Constraint(tenv.var(o), t, o->loc)); +} + static void substitute(ATuple* tup, const AST* from, AST* to) { |