Merge c166ca5 into cd9fb4a

tbklang · May 11, 2024 · ef39d01 · ef39d01
2 parents cd9fb4a + c166ca5
commit ef39d01
Show file tree

Hide file tree

Showing 5 changed files with 389 additions and 1 deletion.
diff --git a/dub.json b/dub.json
@@ -6,7 +6,7 @@
 	"dependencies": {
 		"gogga": ">=3.1.1",
 		"jcli": "0.25.0-beta.3",
-		"niknaks": ">=0.9.8"
+		"niknaks": ">=0.17.0"
 	},
 	"description": "The official Tristan language compiler project",
 	"homepage": "http://deavmi.assigned.network/projects/tlang",

diff --git a/source/tlang/compiler/symbols/containers.d b/source/tlang/compiler/symbols/containers.d
@@ -6,6 +6,7 @@ import tlang.compiler.symbols.typing.core;
 
 // AST manipulation interfaces
 import tlang.compiler.symbols.mcro : MStatementSearchable, MStatementReplaceable, MCloneable;
+import niknaks.arrays : insertAt;
 
 /**
 * Used so often that we may as well
@@ -204,6 +205,46 @@ public class Module : Entity, Container
         }
     }
 
+    public bool insertBefore(Statement thiz, Statement that)
+    {
+        // Direct replacement
+        for(size_t i = 0; i < this.statements.length; i++)
+        {
+            if(that == this.statements[i])
+            {
+                // Insert and re-parent
+                this.statements = insertAt(this.statements, i, thiz);
+                thiz.parentTo(this);
+                return true;
+            }
+        }
+
+        // Matching within
+        for(size_t i = 0; i < this.statements.length; i++)
+        {
+            MStatementReplaceable replaceable = cast(MStatementReplaceable)this.statements[i];
+            if(replaceable)
+            {
+                if(replaceable.insertBefore(thiz, that))
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    // public bool insertAfter(Statement thiz, Statement that)
+    // {
+
+    // }
+
+    // public bool remove(Statement thiz)
+    // {
+
+    // }
+
     /** 
      * Provides a string representation of
      * this module
@@ -321,6 +362,36 @@ public class Struct : Type, Container, MCloneable
         }
     }
 
+    public bool insertBefore(Statement thiz, Statement that)
+    {
+        // Direct replacement
+        for(size_t i = 0; i < this.statements.length; i++)
+        {
+            if(that == this.statements[i])
+            {
+                // Insert and re-parent
+                this.statements = insertAt(this.statements, i, thiz);
+                thiz.parentTo(this);
+                return true;
+            }
+        }
+
+        // Matching within
+        for(size_t i = 0; i < this.statements.length; i++)
+        {
+            MStatementReplaceable replaceable = cast(MStatementReplaceable)this.statements[i];
+            if(replaceable)
+            {
+                if(replaceable.insertBefore(thiz, that))
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     /** 
      * Clones this struct recursively returning a
      * fresh copy of all its members and the struct
@@ -482,6 +553,35 @@ public class Clazz : Type, Container
         }
     }
 
+    public bool insertBefore(Statement thiz, Statement that)
+    {
+        // Direct replacement
+        for(size_t i = 0; i < this.statements.length; i++)
+        {
+            if(that == this.statements[i])
+            {
+                // Insert and re-parent
+                this.statements = insertAt(this.statements, i, thiz);
+                thiz.parentTo(this);
+                return true;
+            }
+        }
+
+        // Matching within
+        for(size_t i = 0; i < this.statements.length; i++)
+        {
+            MStatementReplaceable replaceable = cast(MStatementReplaceable)this.statements[i];
+            if(replaceable)
+            {
+                if(replaceable.insertBefore(thiz, that))
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }