Parser now uses context to store details of the computation

2020-09-18 10:14:53 +02:00
parent b69ad6c306
commit 06f17a6d33
12 changed files with 112 additions and 108 deletions
--- a/app/imports/parser/parseTree/ParenthesisNode.js
+++ b/app/imports/parser/parseTree/ParenthesisNode.js
@@ -5,21 +5,15 @@ export default class ParenthesisNode extends ParseNode {
 		super(...arguments);
    this.content = content;
  }
-  compile(scope){
-    return this.resolve('compile', scope);
-  }
-  roll(scope){
-    return this.resolve('roll', scope);
-  }
-  reduce(scope){
-    return this.resolve('reduce', scope);
-  }
  resolve(fn, scope){
    let content = this.content[fn](scope);
-    if (content.constructor.name === 'ConstantNode'){
-      return content;
-    } else {
+    if (
+      content.constructor.name === 'IfNode' ||
+      content.constructor.name === 'OperatorNode'
+    ){
      return new ParenthesisNode({content, previousNodes: [this]});
+    } else {
+      return content;
    }
  }
  toString(){