From c7bb41fad4d251e2551e6e1f8bd95e7a56c76da2 Mon Sep 17 00:00:00 2001
From: Jason O'Neil <jason.oneil@gmail.com>
Date: Thu, 17 Oct 2013 08:30:53 +0800
Subject: [PATCH] Avoid conflicting `tink.Outcome` and `tink.OutcomeTools`
 typedefs

Aliases for `tink.core.Outcome` were defined in both `tink.CoreApi` and `tink.MacroApi`.

This resulted in the error message:

> Type name tink.Outcome is redefined from module tink.MacroApi
---
 src/tink/MacroApi.hx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tink/MacroApi.hx b/src/tink/MacroApi.hx
index 16da748..a6ba3cf 100644
--- a/src/tink/MacroApi.hx
+++ b/src/tink/MacroApi.hx
@@ -10,8 +10,8 @@ typedef Types = tink.macro.Types;
 typedef Binops = tink.macro.Ops.Binary;
 typedef Unops = tink.macro.Ops.Unary;
 
-typedef Outcome<D, F> = tink.core.Outcome<D, F>;
-typedef OutcomeTools = tink.core.Outcome.OutcomeTools;
+typedef MacroOutcome<D, F> = tink.core.Outcome<D, F>;
+typedef MacroOutcomeTools = tink.core.Outcome.OutcomeTools;
 //TODO: consider adding stuff from haxe.macro.Expr here
 
 class MacroApi {
@@ -20,4 +20,4 @@ class MacroApi {
 		return prefix + Std.string(idCounter++);
 	static public function pos() 
 		return haxe.macro.Context.currentPos();
-}
\ No newline at end of file
+}