Add variables dictionary to evaluate methods

Author: tomc128

BooleanExpressionParser/Nodes/AndOperatorNode.cs

@@ -2,5 +2,5 @@ class AndOperatorNode : OperatorNode
 {
     public AndOperatorNode(Node left, Node right) : base(left, right) { }
 
-    public override bool Evaluate() => Left.Evaluate() && Right!.Evaluate();
+    public override bool Evaluate(Dictionary<string, bool> variables) => Left.Evaluate(variables) && Right!.Evaluate(variables);
 }

BooleanExpressionParser/Nodes/NandOperatorNode.cs

@@ -1,6 +1,6 @@
 class NandOperatorNode : OperatorNode
 {
     public NandOperatorNode(Node left, Node right) : base(left, right) { }
-
-    public override bool Evaluate() => !(Left.Evaluate() && Right!.Evaluate());
+    
+    public override bool Evaluate(Dictionary<string, bool> variables) => !(Left.Evaluate(variables) && Right!.Evaluate(variables));
 }

BooleanExpressionParser/Nodes/Node.cs

@@ -1,4 +1,4 @@
 abstract class Node
 {
-    public abstract bool Evaluate();
+    public abstract bool Evaluate(Dictionary<string, bool> variables);
 }

BooleanExpressionParser/Nodes/NorOperatorNode.cs

@@ -2,5 +2,5 @@ class NorOperatorNode : OperatorNode
 {
     public NorOperatorNode(Node left, Node right) : base(left, right) { }
 
-    public override bool Evaluate() => !(Left.Evaluate() || Right!.Evaluate());
+    public override bool Evaluate(Dictionary<string, bool> variables) => !(Left.Evaluate(variables) || Right!.Evaluate(variables));
 }

BooleanExpressionParser/Nodes/NotOperatorNode.cs

@@ -2,5 +2,5 @@ class NotOperatorNode : OperatorNode
 {
     public NotOperatorNode(Node left) : base(left, null) { }
 
-    public override bool Evaluate() => !Left.Evaluate();
+    public override bool Evaluate(Dictionary<string, bool> variables) => !Left.Evaluate(variables);
 }

BooleanExpressionParser/Nodes/OrOperatorNode.cs

@@ -2,5 +2,5 @@ class OrOperatorNode : OperatorNode
 {
     public OrOperatorNode(Node left, Node right) : base(left, right) { }
 
-    public override bool Evaluate() => Left.Evaluate() || Right!.Evaluate();
+    public override bool Evaluate(Dictionary<string, bool> variables) => Left.Evaluate(variables) || Right!.Evaluate(variables);
 }

BooleanExpressionParser/Nodes/VariableNode.cs

@@ -6,7 +6,7 @@ public VariableNode(String name)
     }
 
     public String Name { get; set; }
-    public bool Value { get; set; }
+    // public bool Value { get; set; }
 
-    public override bool Evaluate() => Value;
+    public override bool Evaluate(Dictionary<string, bool> variables) => variables[Name];
 }

BooleanExpressionParser/Nodes/XnorOperatorNode.cs

@@ -2,5 +2,5 @@ class XnorOperatorNode : OperatorNode
 {
     public XnorOperatorNode(Node left, Node right) : base(left, right) { }
 
-    public override bool Evaluate() => Left.Evaluate() == Right!.Evaluate();
+    public override bool Evaluate(Dictionary<string, bool> variables) => Left.Evaluate(variables) == Right!.Evaluate(variables);
 }

BooleanExpressionParser/Nodes/XorOperatorNode.cs

@@ -2,5 +2,5 @@ class XorOperatorNode : OperatorNode
 {
     public XorOperatorNode(Node left, Node right) : base(left, right) { }
 
-    public override bool Evaluate() => Left.Evaluate() ^ Right!.Evaluate();
+    public override bool Evaluate(Dictionary<string, bool> variables) => Left.Evaluate(variables) ^ Right!.Evaluate(variables);
 }