From 635e64ebf18ac67450d75db867017c77086a9c2e Mon Sep 17 00:00:00 2001 From: k Date: Tue, 26 Nov 2024 16:09:56 +0100 Subject: [PATCH] Fix weird partial module resolution See https://github.com/HaxeFoundation/haxe/pull/11338 --- src/tink/MacroApi.hx | 2 +- src/tink/macro/Exprs.hx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tink/MacroApi.hx b/src/tink/MacroApi.hx index db23b34..a558723 100644 --- a/src/tink/MacroApi.hx +++ b/src/tink/MacroApi.hx @@ -21,7 +21,7 @@ typedef TypeMap = tink.macro.TypeMap; //TODO: consider adding stuff from haxe.macro.Expr here typedef MacroOutcome = tink.core.Outcome; -typedef MacroOutcomeTools = tink.OutcomeTools; +typedef MacroOutcomeTools = tink.core.Outcome.OutcomeTools; typedef Member = tink.macro.Member; typedef Constructor = tink.macro.Constructor; diff --git a/src/tink/macro/Exprs.hx b/src/tink/macro/Exprs.hx index 480bdc5..b146296 100644 --- a/src/tink/macro/Exprs.hx +++ b/src/tink/macro/Exprs.hx @@ -357,7 +357,7 @@ class Exprs { expr = [EVars(locals).at(expr.pos), expr].toMBlock(expr.pos); Success(Context.typeof(expr)); } - catch (e:haxe.macro.Error) { + catch (e:haxe.macro.Expr.Error) { e.pos.makeFailure(e.message); } catch (e:Dynamic) {