From f4bf23a66b2b659e12c5b9aa5720cb15d6fc0518 Mon Sep 17 00:00:00 2001
From: Eugene Griskov <eugene.griskov@dubitlimited.com>
Date: Tue, 19 May 2015 17:22:23 +0100
Subject: [PATCH] Made imports and using expressions to use CoreApi
 redefinitions.

---
 src/tink/MacroApi.hx    | 2 +-
 src/tink/macro/Exprs.hx | 2 +-
 src/tink/macro/Types.hx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tink/MacroApi.hx b/src/tink/MacroApi.hx
index 4bca404..2712a07 100644
--- a/src/tink/MacroApi.hx
+++ b/src/tink/MacroApi.hx
@@ -17,7 +17,7 @@ typedef Unops = tink.macro.Ops.Unary;
 
 //TODO: consider adding stuff from haxe.macro.Expr here
 typedef MacroOutcome<D, F> = tink.core.Outcome<D, F>;
-typedef MacroOutcomeTools = tink.core.Outcome.OutcomeTools;
+typedef MacroOutcomeTools = tink.OutcomeTools;
 
 typedef Option<T> = haxe.ds.Option<T>;
 
diff --git a/src/tink/macro/Exprs.hx b/src/tink/macro/Exprs.hx
index 1dfdd31..23df80f 100644
--- a/src/tink/macro/Exprs.hx
+++ b/src/tink/macro/Exprs.hx
@@ -14,7 +14,7 @@ using StringTools;
 using tink.macro.Positions;
 using tink.macro.Exprs;
 using tink.macro.Types;
-using tink.core.Outcome;
+using tink.CoreApi;
 
 typedef VarDecl = { name : String, type : ComplexType, expr : Null<Expr> };
 typedef ParamSubst = {
diff --git a/src/tink/macro/Types.hx b/src/tink/macro/Types.hx
index 3b16dfe..9e8a241 100644
--- a/src/tink/macro/Types.hx
+++ b/src/tink/macro/Types.hx
@@ -10,7 +10,7 @@ import haxe.macro.Type;
 using tink.macro.Exprs;
 using tink.macro.Positions;
 using tink.macro.Functions;
-using tink.core.Outcome;
+using tink.CoreApi;
 
 class Types {
 	static var types = new Map<Int,Void->Type>();