From b5ecc52fa6a31c0e536d1a2bfa2540d57cbf0003 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Thu, 7 Oct 2021 21:31:38 -0600 Subject: [PATCH] KissInterp evalKiss --- src/nat/BoolExpInterp.hx | 1 - src/nat/BoolExpInterp.kiss | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/nat/BoolExpInterp.hx b/src/nat/BoolExpInterp.hx index 41f835d..10d0a23 100644 --- a/src/nat/BoolExpInterp.hx +++ b/src/nat/BoolExpInterp.hx @@ -1,7 +1,6 @@ package nat; import kiss.KissInterp; -import hscript.Parser; import kiss.Prelude; @:build(kiss.Kiss.build()) diff --git a/src/nat/BoolExpInterp.kiss b/src/nat/BoolExpInterp.kiss index 2b2a05d..9abb6a3 100644 --- a/src/nat/BoolExpInterp.kiss +++ b/src/nat/BoolExpInterp.kiss @@ -1,9 +1,5 @@ (function eval [:String expStr :Array activeConditions] - (let [hscript (Prelude.convertToHScript expStr) - parser (new Parser) - hscriptExp (parser.parseString hscript) - interp (new BoolExpInterp)] - + (let [interp (new BoolExpInterp)] (doFor condition activeConditions (interp.variables.set condition true)) - ?(interp.execute hscriptExp))) + ?(interp.evalKiss expStr)))