Add Evaluate method to all node types

tomc128 · tomc128 · commit 18b86dec042d · 2022-11-28T21:47:41.000Z
diff --git a/BooleanExpressionParser/Nodes/AndOperatorNode.cs b/BooleanExpressionParser/Nodes/AndOperatorNode.cs
@@ -1,4 +1,6 @@
 class AndOperatorNode : OperatorNode
 {
     public AndOperatorNode(Node left, Node right) : base(left, right) { }
+
+    public override bool Evaluate() => Left.Evaluate() && Right!.Evaluate();
 }
diff --git a/BooleanExpressionParser/Nodes/NandOperatorNode.cs b/BooleanExpressionParser/Nodes/NandOperatorNode.cs
@@ -1,4 +1,6 @@
 class NandOperatorNode : OperatorNode
 {
     public NandOperatorNode(Node left, Node right) : base(left, right) { }
+
+    public override bool Evaluate() => !(Left.Evaluate() && Right!.Evaluate());
 }
diff --git a/BooleanExpressionParser/Nodes/Node.cs b/BooleanExpressionParser/Nodes/Node.cs
@@ -1,4 +1,4 @@
 abstract class Node
 {
-    
+    public abstract bool Evaluate();
 }
diff --git a/BooleanExpressionParser/Nodes/NorOperatorNode.cs b/BooleanExpressionParser/Nodes/NorOperatorNode.cs
@@ -1,4 +1,6 @@
 class NorOperatorNode : OperatorNode
 {
     public NorOperatorNode(Node left, Node right) : base(left, right) { }
+
+    public override bool Evaluate() => !(Left.Evaluate() || Right!.Evaluate());
 }
diff --git a/BooleanExpressionParser/Nodes/NotOperatorNode.cs b/BooleanExpressionParser/Nodes/NotOperatorNode.cs
@@ -1,4 +1,6 @@
 class NotOperatorNode : OperatorNode
 {
     public NotOperatorNode(Node left) : base(left, null) { }
+
+    public override bool Evaluate() => !Left.Evaluate();
 }
diff --git a/BooleanExpressionParser/Nodes/OrOperatorNode.cs b/BooleanExpressionParser/Nodes/OrOperatorNode.cs
@@ -1,4 +1,6 @@
 class OrOperatorNode : OperatorNode
 {
     public OrOperatorNode(Node left, Node right) : base(left, right) { }
+
+    public override bool Evaluate() => Left.Evaluate() || Right!.Evaluate();
 }
diff --git a/BooleanExpressionParser/Nodes/VariableNode.cs b/BooleanExpressionParser/Nodes/VariableNode.cs
@@ -7,4 +7,6 @@ public VariableNode(String name)
 
     public String Name { get; set; }
     public bool Value { get; set; }
+
+    public override bool Evaluate() => Value;
 }
diff --git a/BooleanExpressionParser/Nodes/XnorOperatorNode.cs b/BooleanExpressionParser/Nodes/XnorOperatorNode.cs
@@ -1,4 +1,6 @@
 class XnorOperatorNode : OperatorNode
 {
     public XnorOperatorNode(Node left, Node right) : base(left, right) { }
+
+    public override bool Evaluate() => Left.Evaluate() == Right!.Evaluate();
 }
diff --git a/BooleanExpressionParser/Nodes/XorOperatorNode.cs b/BooleanExpressionParser/Nodes/XorOperatorNode.cs
@@ -1,4 +1,6 @@
 class XorOperatorNode : OperatorNode
 {
     public XorOperatorNode(Node left, Node right) : base(left, right) { }
+
+    public override bool Evaluate() => Left.Evaluate() ^ Right!.Evaluate();
 }
diff --git a/BooleanExpressionParser/Tokens/OperatorToken.cs b/BooleanExpressionParser/Tokens/OperatorToken.cs
@@ -5,7 +5,5 @@ protected OperatorToken(int precedence)
         Precedence = precedence;
     }
 
-    public int Precedence { get; protected set; }
-
-    
+    public int Precedence { get; protected set; }    
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`class AndOperatorNode : OperatorNode`
`2`	`2`	`{`
`3`	`3`	`public AndOperatorNode(Node left, Node right) : base(left, right) { }`
	`4`	`+`
	`5`	`+ public override bool Evaluate() => Left.Evaluate() && Right!.Evaluate();`
`4`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`class NandOperatorNode : OperatorNode`
`2`	`2`	`{`
`3`	`3`	`public NandOperatorNode(Node left, Node right) : base(left, right) { }`
	`4`	`+`
	`5`	`+ public override bool Evaluate() => !(Left.Evaluate() && Right!.Evaluate());`
`4`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`abstract class Node`
`2`	`2`	`{`
`3`		`-`
	`3`	`+ public abstract bool Evaluate();`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`class NorOperatorNode : OperatorNode`
`2`	`2`	`{`
`3`	`3`	`public NorOperatorNode(Node left, Node right) : base(left, right) { }`
	`4`	`+`
	`5`	`+ public override bool Evaluate() => !(Left.Evaluate() \|\| Right!.Evaluate());`
`4`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`class NotOperatorNode : OperatorNode`
`2`	`2`	`{`
`3`	`3`	`public NotOperatorNode(Node left) : base(left, null) { }`
	`4`	`+`
	`5`	`+ public override bool Evaluate() => !Left.Evaluate();`
`4`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`class OrOperatorNode : OperatorNode`
`2`	`2`	`{`
`3`	`3`	`public OrOperatorNode(Node left, Node right) : base(left, right) { }`
	`4`	`+`
	`5`	`+ public override bool Evaluate() => Left.Evaluate() \|\| Right!.Evaluate();`
`4`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,6 @@ public VariableNode(String name)`
`7`	`7`
`8`	`8`	`public String Name { get; set; }`
`9`	`9`	`public bool Value { get; set; }`
	`10`	`+`
	`11`	`+ public override bool Evaluate() => Value;`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`class XnorOperatorNode : OperatorNode`
`2`	`2`	`{`
`3`	`3`	`public XnorOperatorNode(Node left, Node right) : base(left, right) { }`
	`4`	`+`
	`5`	`+ public override bool Evaluate() => Left.Evaluate() == Right!.Evaluate();`
`4`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`class XorOperatorNode : OperatorNode`
`2`	`2`	`{`
`3`	`3`	`public XorOperatorNode(Node left, Node right) : base(left, right) { }`
	`4`	`+`
	`5`	`+ public override bool Evaluate() => Left.Evaluate() ^ Right!.Evaluate();`
`4`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,5 @@ protected OperatorToken(int precedence)`
`5`	`5`	`Precedence = precedence;`
`6`	`6`	`}`
`7`	`7`
`8`		`- public int Precedence { get; protected set; }`
`9`		`-`
`10`		`-`
	`8`	`+ public int Precedence { get; protected set; }`
`11`	`9`	`}`