Parser now works with variables passed into scope

2020-09-10 11:38:28 +02:00
parent ede4e1367d
commit 5dec760452
6 changed files with 93 additions and 17 deletions
--- a/app/imports/parser/parseTree/IfNode.js
+++ b/app/imports/parser/parseTree/IfNode.js
@@ -22,13 +22,12 @@ export default class IfNode extends ParseNode {
  }
  resolve(fn, scope){
    let condition = this.condition[fn](scope);
-    let consequent = this.consequent[fn](scope);
-    let alternative = this.alternative[fn](scope);
-    this.resolve(condition, consequent, alternative);
    if (condition.value){
+      let consequent = this.consequent[fn](scope);
      consequent.inheritDetails([condition, this]);
-      return consequent;
+      return this.consequent[fn](scope);
    } else {
+      let alternative = this.alternative[fn](scope);
      alternative.inheritDetails([condition, this]);
      return alternative;
    }