From b00e3d3c2e4e22cd88e70c7eb23f4c3219166c9d Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Sun, 25 Jul 2021 21:09:23 -0600 Subject: [PATCH] be more careful about compiler flags overwriting values in KissInterp --- kiss/src/kiss/Macros.hx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kiss/src/kiss/Macros.hx b/kiss/src/kiss/Macros.hx index 4b7fdc07..99ec9820 100644 --- a/kiss/src/kiss/Macros.hx +++ b/kiss/src/kiss/Macros.hx @@ -131,8 +131,10 @@ class Macros { var conditionInterp = new KissInterp(true); var conditionStr = Reader.toString(conditionExp.def); for (flag => value in Context.getDefines()) { - if (flag != "kiss") + // Don't overwrite types that are put in all KissInterps, i.e. the kiss namespace + if (!conditionInterp.variables.exists(flag)) { conditionInterp.variables.set(flag, value); + } } try { var hscriptStr = Prelude.convertToHScript(conditionStr);