Merge aafa429 into ebefcd5

.github/workflows/d.yml

@@ -451,10 +451,21 @@ jobs:
         run: |
           ./tlang compile source/tlang/testing/simple_while.t
           ./tlang.out
-      #- name: Simple do-while
-      #  run: |
-      #    ./tlang compile source/tlang/testing/simple_do_while.t
-      #    ./tlang.out
+      - name: Simple do-while
+        run: |
+          ./tlang compile source/tlang/testing/simple_do_while.t
+
+          set +e
+          ./tlang.out
+
+          if [ $? = 6 ]
+          then
+              set -e
+              exit 0
+          else
+              set -e
+              exit 1
+          fi
       - name: Simple for-loops
         run: |
           ./tlang compile source/tlang/testing/simple_for_loops.t

source/tlang/compiler/codegen/emit/dgen.d

@@ -462,18 +462,39 @@ public final class DCodeEmitter : CodeEmitter
 
             string emit;
 
-            /* Generate the `while(<expr>)` and opening curly brace */
-            emit = "while("~transform(conditionInstr)~")\n";
-            emit~=genTabs(transformDepth)~"{\n"; 
-
-            /* Transform each body statement */
-            foreach(Instruction curBodyInstr; bodyInstructions)
+            /* While-loop */
+            if(!whileLoopInstr.isDoWhileLoop())
             {
-                emit~=genTabs(transformDepth)~"\t"~transform(curBodyInstr)~"\n";
+                /* Generate the `while(<expr>)` and opening curly brace */
+                emit = "while("~transform(conditionInstr)~")\n";
+                emit~=genTabs(transformDepth)~"{\n"; 
+
+                /* Transform each body statement */
+                foreach(Instruction curBodyInstr; bodyInstructions)
+                {
+                    emit~=genTabs(transformDepth)~"\t"~transform(curBodyInstr)~"\n";
+                }
+
+                /* Closing curly brace */
+                emit~=genTabs(transformDepth)~"}";
             }
+            /* Do-while loop */
+            else
+            {
+                /* Generate `do {` */
+                emit = "do\n";
+                emit~=genTabs(transformDepth)~"{\n";
 
-            /* Closing curly brace */
-            emit~=genTabs(transformDepth)~"}";
+                /* Transform each body statement */
+                foreach(Instruction curBodyInstr; bodyInstructions)
+                {
+                    emit~=genTabs(transformDepth)~"\t"~transform(curBodyInstr)~"\n";
+                }
+
+                /* Closing curly brace and `while(<expr>)` */
+                emit~=genTabs(transformDepth)~"}\n";
+                emit~=genTabs(transformDepth)~"while("~transform(conditionInstr)~");";
+            }
 
             emmmmit = emit;
         }

source/tlang/compiler/codegen/instruction.d

@@ -405,10 +405,12 @@ public final class IfStatementInstruction : Instruction
 public final class WhileLoopInstruction : Instruction
 {
     private BranchInstruction branchInstruction;
+    private bool isDoWhile;
 
-    this(BranchInstruction branchInstruction)
+    this(BranchInstruction branchInstruction, bool isDoWhile = false)
     {
         this.branchInstruction = branchInstruction;
+        this.isDoWhile = isDoWhile;
 
         addInfo = "Branch: "~to!(string)(branchInstruction);
     }
@@ -417,6 +419,12 @@ public final class WhileLoopInstruction : Instruction
     {
         return branchInstruction;
     }
+
+    public bool isDoWhileLoop()
+    {
+        return this.isDoWhile;
+    }
+
 }
 
 public final class ForLoopInstruction : Instruction

source/tlang/compiler/core.d

@@ -398,6 +398,7 @@ unittest
                         "source/tlang/testing/simple_variables_only_decs.t",
                         "source/tlang/testing/simple_variables_decls_ass.t",
                         "source/tlang/testing/simple_while.t",
+                        "source/tlang/testing/simple_do_while.t",
 
                         "source/tlang/testing/simple_for_loops.t",
                         "source/tlang/testing/simple_cast.t",

source/tlang/compiler/symbols/data.d

@@ -1277,7 +1277,7 @@ public final class WhileLoop : Entity, Container
 {
     private Branch branch;
     private static ulong whileStmtContainerRollingNameCounter = 0;
-    public const bool isDoWhile;
+    private bool isDoWhile;
 
     /** 
      * Creates a new While Loop parser node, optionally specifying
@@ -1378,6 +1378,11 @@ public final class WhileLoop : Entity, Container
             return branch.replace(thiz, that);
         }
     }
+
+    public bool isDoWhileLoop()
+    {
+        return this.isDoWhile;
+    }
 }
 
 public final class ForLoop : Entity, Container

source/tlang/compiler/typecheck/core.d

@@ -2623,14 +2623,6 @@ public final class TypeChecker
             else if(cast(WhileLoop)statement)
             {
                 WhileLoop whileLoop = cast(WhileLoop)statement;
-
-                // FIXME: Do-while loops are still being considered in terms of dependency construction
-                if(whileLoop.isDoWhile)
-                {
-                    DEBUG("Still looking at dependency construction in this thing (do while loops )");
-                    assert(false);
-                }
-
                 Branch branch = whileLoop.getBranch();
 
                 /* The condition `Value` instruction should be on the stack */
@@ -2664,7 +2656,7 @@ public final class TypeChecker
                 * 2. Set the context
                 * 3. Add the instruction
                 */
-                WhileLoopInstruction whileLoopInstruction = new WhileLoopInstruction(branchInstr);
+                WhileLoopInstruction whileLoopInstruction = new WhileLoopInstruction(branchInstr, whileLoop.isDoWhileLoop());
                 whileLoopInstruction.setContext(whileLoop.getContext());
                 addInstrB(whileLoopInstruction);
             }

source/tlang/compiler/typecheck/dependency/core.d

@@ -1325,8 +1325,10 @@ public class DNodeGenerator
             DNode branchDNode = pool(whileBranch);
             DEBUG("Branch: "~to!(string)(whileBranch));
 
-            // If this is a while-loop
-            if(!whileLoopStmt.isDoWhile)
+            /**
+             * while-loop
+             */
+            if(!whileLoopStmt.isDoWhileLoop())
             {
                 // Extract the condition
                 Expression branchCondition = whileBranch.getCondition();
@@ -1345,13 +1347,15 @@ public class DNodeGenerator
                 // Finally make the branchDNode depend on the body dnode (above)
                 branchDNode.needs(branchBodyDNode);
             }
-            // If this is a do-while loop
-            // TODO: I don't think we really need to reverse this?
-            // Logically we should, but the typechecker will add this things in the correct order anyways?
-            // We need to look into this!
-            // Our nodes at the back will always be placed at the back, and the expression will end ip upfront
-            // i think it is a problem oif maybe other expressions are left on the stack but is that ever a problem
-            //now with the statement <-> instruction mapping (like will that ever even occur?)
+            /** 
+             * do-while loop
+             *
+             * The order of dependencies is basically
+             * switched from [expr, stmts...] to
+             * [stmts..., expr] but at the end of the
+             * day the way it is processed by the
+             * typechecker won't change
+             */
             else
             {
                 // Pass over the statements in the branch's body
@@ -1375,8 +1379,6 @@ public class DNodeGenerator
             /* Make the while-loop/do-while loop depend on the branchDNode */
             whileLoopDNode.needs(branchDNode);
 
-            /* Make the node of this generalPass we are in depend on the whileLoop's DNode */
-            // node.needs(whileLoopDNode);
             return whileLoopDNode;
         }
         /**

source/tlang/testing/simple_do_while.t

@@ -2,13 +2,18 @@ module simple_do_while;
 
 int function(int i)
 {
-    int test = 2;
+    int test = 0;
     do
     {
         i = i - 1;
         test = test + i;
     }
-    while(i);
+    while(i > 1);
 
     return test;
-}
+}
+
+int main()
+{
+	return function(4);
+}