Merge branch 'vardec_varass_dependency' into feature/multi_module

tbklang · Mar 18, 2024 · 2537005 · 2537005
2 parents 07be57a + 7a2ea96
commit 2537005
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/source/tlang/compiler/parsing/core.d b/source/tlang/compiler/parsing/core.d
@@ -572,8 +572,12 @@ public final class Parser
             /* If it is a type */
             if (symbolType == SymbolType.IDENT_TYPE)
             {
-                /* Might be a function, might be a variable, or assignment */
-                structMember = parseName();
+                /* Might be a function definition or variable declaration */
+                structMember = parseTypedDeclaration();
+
+                /* Should have a semi-colon and consume it */
+                expect(SymbolType.SEMICOLON, lexer.getCurrentToken());
+                lexer.nextToken();
             }
             /* If it is an accessor */
             else if (isAccessor(lexer.getCurrentToken()))
@@ -1890,8 +1894,12 @@ public final class Parser
             /* If it is a type */
             if (symbolType == SymbolType.IDENT_TYPE)
             {
-                /* Might be a function, might be a variable, or assignment */
-                structMember = parseName();
+                /* Might be a function definition or variable declaration */
+                structMember = parseTypedDeclaration();
+
+                /* Should have a semi-colon and consume it */
+                expect(SymbolType.SEMICOLON, lexer.getCurrentToken());
+                lexer.nextToken();
             }
             /* If it is a class */
             else if(symbolType == SymbolType.CLASS)

diff --git a/source/tlang/compiler/symbols/containers.d b/source/tlang/compiler/symbols/containers.d
@@ -36,10 +36,33 @@ public Statement[] weightReorder(Statement[] statements)
 // AND MCloneable
 public interface Container : MStatementSearchable, MStatementReplaceable
 {
+    /** 
+     * Appends the given statement to
+     * this container's body
+     *
+     * Params:
+     *   statement = the `Statement`
+     * to add
+     */
     public void addStatement(Statement statement);
 
+    /** 
+     * Appends the list of statemnets
+     * (in order) to this container's
+     * body
+     *
+     * Params:
+     *   statements = the `Statement[]`
+     * to add
+     */
     public void addStatements(Statement[] statements);
 
+    /** 
+     * Returns the body of this
+     * container
+     *
+     * Returns: a `Statement[]`
+     */
     public Statement[] getStatements();
 }
 
@@ -93,6 +116,7 @@ public class Module : Entity, Container
 
     public Statement[] getStatements()
     {
+        // TODO: Holy naai this is expensive
         return weightReorder(statements);
     }
 
@@ -204,6 +228,7 @@ public class Struct : Type, Container, MCloneable
 
     public Statement[] getStatements()
     {
+        // TODO: Holy naai this is expensive
         return weightReorder(statements);
     }
 
@@ -369,6 +394,7 @@ public class Clazz : Type, Container
 
     public Statement[] getStatements()
     {
+        // TODO: Holy naai this is expensive
         return weightReorder(statements);
     }