A little bit of cleanup.

vddCore · May 9, 2024 · 31eec2c · 31eec2c
1 parent 9814c86
commit 31eec2c
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 74 deletions.
diff --git a/Core/EVIL.Grammar/AST/Base/AstNode.cs b/Core/EVIL.Grammar/AST/Base/AstNode.cs
@@ -32,7 +32,7 @@ protected void Reparent(params AstNode?[] nodes)
             }
         }
 
-        protected void Reparent(IEnumerable<AstNode> nodes) 
+        protected void Reparent(IEnumerable<AstNode?> nodes)
             => Reparent(nodes.ToArray());
     }
 }
diff --git a/Core/EVIL.Grammar/AST/Expressions/ArrayExpression.cs b/Core/EVIL.Grammar/AST/Expressions/ArrayExpression.cs
@@ -13,7 +13,8 @@ public ArrayExpression(Expression? sizeExpression, List<Expression> initializers
             SizeExpression = sizeExpression;
             Initializers = initializers;
 
-            Reparent(initializers);
+            Reparent(SizeExpression);
+            Reparent(Initializers);
         }
     }
 }
diff --git a/Core/EVIL.Grammar/AST/Expressions/ByExpression.cs b/Core/EVIL.Grammar/AST/Expressions/ByExpression.cs
@@ -7,7 +7,6 @@ namespace EVIL.Grammar.AST.Expressions
     public class ByExpression : Expression
     {
         public Expression Qualifier { get; }
-
         public List<ByArmNode> Arms { get; }
         public AstNode? ElseArm { get; }
 
@@ -19,11 +18,7 @@ public ByExpression(Expression qualifier, List<ByArmNode> arms, AstNode? elseArm
 
             Reparent(Qualifier);
             Reparent(Arms);
-
-            if (ElseArm != null)
-            {
-                Reparent(ElseArm);
-            }
+            Reparent(ElseArm);
         }
     }
 }
diff --git a/Core/EVIL.Grammar/AST/Expressions/ErrorExpression.cs b/Core/EVIL.Grammar/AST/Expressions/ErrorExpression.cs
@@ -13,15 +13,8 @@ public ErrorExpression(StringConstant? implicitMessageConstant, TableExpression?
             ImplicitMessageConstant = implicitMessageConstant;
             UserDataTable = userDataTable;
 
-            if (ImplicitMessageConstant != null)
-            {
-                Reparent(ImplicitMessageConstant);
-            }
-
-            if (UserDataTable != null)
-            {
-                Reparent(UserDataTable);
-            }
+            Reparent(ImplicitMessageConstant);
+            Reparent(UserDataTable);
         }
     }
 }
diff --git a/Core/EVIL.Grammar/AST/Expressions/FnExpression.cs b/Core/EVIL.Grammar/AST/Expressions/FnExpression.cs
@@ -15,11 +15,7 @@ public FnExpression(
             ParameterList = parameterList;
             Statement = statement;
 
-            if (ParameterList != null)
-            {
-                Reparent(ParameterList);
-            }
-
+            Reparent(ParameterList);
             Reparent(Statement);
         }
     }

diff --git a/Core/EVIL.Grammar/AST/Expressions/SelfFnExpression.cs b/Core/EVIL.Grammar/AST/Expressions/SelfFnExpression.cs
@@ -15,12 +15,8 @@ public SelfFnExpression(
         {
             ParameterList = parameterList;
             Statement = statement;
-
-            if (ParameterList != null)
-            {
-                Reparent(ParameterList);
-            }
-
+
+            Reparent(ParameterList);
             Reparent(Statement);
         }
     }

diff --git a/Core/EVIL.Grammar/AST/Expressions/TableExpression.cs b/Core/EVIL.Grammar/AST/Expressions/TableExpression.cs
@@ -13,8 +13,7 @@ public TableExpression(List<Expression> initializers, bool keyed)
             Initializers = initializers;
             Keyed = keyed;
 
-            for (var i = 0; i < Initializers.Count; i++)
-                Reparent(Initializers[i]);
+            Reparent(Initializers);
         }
     }
 }
diff --git a/Core/EVIL.Grammar/AST/Miscellaneous/AttributeNode.cs b/Core/EVIL.Grammar/AST/Miscellaneous/AttributeNode.cs
@@ -20,7 +20,7 @@ public AttributeNode(
             Properties = properties;
 
             Reparent(Identifier);
-            Reparent(values);
+            Reparent(Values);
             Reparent(Properties.Keys);
             Reparent(Properties.Values);
         }

diff --git a/Core/EVIL.Grammar/AST/Miscellaneous/ParameterNode.cs b/Core/EVIL.Grammar/AST/Miscellaneous/ParameterNode.cs
@@ -16,9 +16,7 @@ public ParameterNode(IdentifierNode identifier, bool readWrite, ConstantExpressi
             Initializer = initializer;
 
             Reparent(Identifier);
-
-            if (Initializer != null)
-                Reparent(Initializer);
+            Reparent(Initializer);
         }
     }
 }
diff --git a/Core/EVIL.Grammar/AST/Statements/BlockStatement.cs b/Core/EVIL.Grammar/AST/Statements/BlockStatement.cs
@@ -10,11 +10,7 @@ public sealed class BlockStatement : Statement
         public BlockStatement(List<Statement> statements)
         {
             Statements = statements;
-
-            for (var i = 0; i < statements.Count; i++)
-            {
-                Reparent(statements[i]);
-            }
+            Reparent(Statements);
         }
     }
 }
diff --git a/Core/EVIL.Grammar/AST/Statements/EachStatement.cs b/Core/EVIL.Grammar/AST/Statements/EachStatement.cs
@@ -23,10 +23,7 @@ public EachStatement(
             Statement = statement;
 
             Reparent(KeyIdentifier);
-
-            if (ValueIdentifier != null)
-                Reparent(ValueIdentifier);
-
+            Reparent(ValueIdentifier);
             Reparent(Iterable, Statement);
         }
     }

diff --git a/Core/EVIL.Grammar/AST/Statements/FnStatement.cs b/Core/EVIL.Grammar/AST/Statements/FnStatement.cs
@@ -26,12 +26,7 @@ public FnStatement(
             IsLocalDefintion = isLocalDefintion;
 
             Reparent(Identifier);
-
-            if (ParameterList != null)
-            {
-                Reparent(ParameterList);
-            }
-
+            Reparent(ParameterList);
             Reparent(Statement);
             Reparent(Attributes);
         }

diff --git a/Core/EVIL.Grammar/AST/Statements/FnTargetedStatement.cs b/Core/EVIL.Grammar/AST/Statements/FnTargetedStatement.cs
@@ -12,6 +12,7 @@ public class FnTargetedStatement : Statement
         public ParameterList? ParameterList { get; }
         public Statement Statement { get; }
         public List<AttributeNode> Attributes { get; }
+
         public bool IsSelfTargeting => PrimaryTarget is SelfExpression;
 
         public FnTargetedStatement(
@@ -29,12 +30,7 @@ public FnTargetedStatement(
 
             Reparent(PrimaryTarget);
             Reparent(SecondaryIdentifier);
-
-            if (ParameterList != null)
-            {
-                Reparent(ParameterList);
-            }
-
+            Reparent(ParameterList);
             Reparent(Statement);
             Reparent(Attributes);
         }

diff --git a/Core/EVIL.Grammar/AST/Statements/OverrideStatement.cs b/Core/EVIL.Grammar/AST/Statements/OverrideStatement.cs
@@ -24,12 +24,7 @@ Statement statement
             Statement = statement;
 
             Reparent(Target);
-
-            if (ParameterList != null)
-            {
-                Reparent(ParameterList);
-            }
-
+            Reparent(ParameterList);
             Reparent(Statement);
         }
     }

diff --git a/Core/EVIL.Grammar/AST/Statements/RetStatement.cs b/Core/EVIL.Grammar/AST/Statements/RetStatement.cs
@@ -9,11 +9,7 @@ public sealed class RetStatement : Statement
         public RetStatement(Expression? expression)
         {
             Expression = expression;
-
-            if (Expression != null)
-            {
-                Reparent(Expression);
-            }
+            Reparent(Expression);
         }
     }
 }
diff --git a/Core/EVIL.Grammar/AST/Statements/TryStatement.cs b/Core/EVIL.Grammar/AST/Statements/TryStatement.cs
@@ -6,7 +6,6 @@ namespace EVIL.Grammar.AST.Statements
     public class TryStatement : Statement
     {
         public Statement InnerStatement { get; }
-
         public IdentifierNode? HandlerExceptionLocal { get; }
         public Statement HandlerStatement { get; }
 

diff --git a/Core/EVIL.Grammar/AST/Statements/ValStatement.cs b/Core/EVIL.Grammar/AST/Statements/ValStatement.cs
@@ -17,12 +17,7 @@ public ValStatement(
             ReadWrite = readWrite;
 
             Reparent(Definitions.Keys);
-
-            foreach (var kvp in Definitions)
-            {
-                if (kvp.Value != null)
-                    Reparent(kvp.Value);
-            }
+            Reparent(Definitions.Values);
         }
     }
 }
diff --git a/VirtualMachine/Tests/Ceres.LanguageTests/tests/023_try.vil b/VirtualMachine/Tests/Ceres.LanguageTests/tests/023_try.vil
@@ -176,7 +176,7 @@ fn try_error_implicit_message_and_userdata {
   assert.equal(result2, "meow");
 }
 
-#[test;disasm("always")]
+#[test]
 fn try_no_local() {
   rw val caught = false;