Changeset 10011 for branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Statements/WhileStat.cs

Timestamp:

10/01/13 12:08:25 (11 years ago)

Author:

jkarder

Message:

#2069:

• refactored grammar and symbols
• fixed cloning and storable ctors
• fixed plugin dependencies

Location:

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Statements

Files:

• . (moved) (moved from branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Branches)
• WhileStat.cs (copied) (copied from branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Branches/WhileLoop.cs) (3 diffs)

branches/Robocode.TrunkInt/HeuristicLab.Problems.Robocode/3.3/Symbols/Statements/WhileStat.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -26 +28 @@
 namespace HeuristicLab.Problems.Robocode {
   [StorableClass]
-  public class WhileLoop : CodeNode {
+  public class WhileStat : CodeNode {
     public override int MinimumArity { get { return 2; } }
     public override int MaximumArity { get { return 2; } }
@@ -37 +39 @@
 
     [StorableConstructor]
-    private WhileLoop(bool deserializing) : base(deserializing) { }
-    private WhileLoop(WhileLoop original, Cloner cloner)
-      : base(original, cloner) {
+    protected WhileStat(bool deserializing) : base(deserializing) { }
+    protected WhileStat(WhileStat original, Cloner cloner) : base(original, cloner) { }
 
-    }
-
-    public WhileLoop()
-      : base("WhileLoop", "A WhileLoop.") {
-      this.Prefix = "while(";
-      this.Suffix = ")";
+    public WhileStat()
+      : base("WhileStat", "A while statement.") {
+      Prefix = "while (";
+      Suffix = ")";
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new WhileLoop(this, cloner);
+      return new WhileStat(this, cloner);
     }
 
-    public override string Interpret(ISymbolicExpressionTreeNode node, System.Collections.Generic.IEnumerable<ISymbolicExpressionTreeNode> children) {
-      string condition = "", ifTrue = "";
-      foreach (ISymbolicExpressionTreeNode c in children) {
+    public override string Interpret(ISymbolicExpressionTreeNode node, IEnumerable<ISymbolicExpressionTreeNode> children) {
+      string condition = string.Empty, ifTrue = string.Empty;
+      foreach (var c in children) {
         if (c.Symbol is LogicalExpression)
           condition = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
-        else if (c.Symbol is Block)
+        else if (c.Symbol is Stat || c.Symbol is EmptyEvent || c.Symbol is DoNothing)
           ifTrue = ((CodeNode)c.Symbol).Interpret(c, c.Subtrees);
-        else
-          throw new System.Exception("Unexpected Child node.");
+        else throw new ArgumentException("Unexpected children.", "children");
       }
-      return this.Prefix + " " + condition + " " + this.Suffix +
-          "\r\n" + ifTrue + "\r\n";
+      return Prefix + condition + Suffix + Environment.NewLine + ifTrue + Environment.NewLine;
     }
   }