diff --git a/app/imports/api/creature/computation/afterComputation/evaluateString.js b/app/imports/api/creature/computation/afterComputation/evaluateString.js index 7cd6934a..759d9c97 100644 --- a/app/imports/api/creature/computation/afterComputation/evaluateString.js +++ b/app/imports/api/creature/computation/afterComputation/evaluateString.js @@ -1,6 +1,8 @@ import { parse, CompilationContext } from '/imports/parser/parser.js'; import ConstantNode from '/imports/parser/parseTree/ConstantNode.js'; +//TODO replace constants with their parsed node + export default function evaluateString(string, scope, fn = 'compile', context){ let errors = []; if (!string){ diff --git a/app/imports/api/creature/computation/afterComputation/evalutateStringWithEmbeddedCalculations.js b/app/imports/api/creature/computation/afterComputation/evalutateStringWithEmbeddedCalculations.js deleted file mode 100644 index 23869348..00000000 --- a/app/imports/api/creature/computation/afterComputation/evalutateStringWithEmbeddedCalculations.js +++ /dev/null @@ -1,13 +0,0 @@ -import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js'; - -// Strings can have computations in bracers like so: {computation} -export default function evalutateStringWithEmbeddedCalculations(string, scope){ - console.warn('evalutateStringWithEmbeddedCalculations should be replaced with ' + - 'fetching the result from the compuations on the property doc'); - if (!string) return string; - // Compute everything inside bracers - return string.replace(/\{([^{}]*)\}/g, function(match, p1){ - let {result} = evaluateString(p1, scope); - return result; - }); -}