A continue statement within a do loop did not work. Cleaned up the loop

code a little bit.

git-svn-id: svn://svn.cc65.org/cc65/trunk@2722 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/cc65/loop.c b/src/cc65/loop.c
index cb58d126fb92422673f46696ca9ac1220fc3be23..d41b3f4a67a79b3146b9840fca72c60b5e519511 100644 (file)
--- a/src/cc65/loop.c
+++ b/src/cc65/loop.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2000 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               Römerstraße 52                                              */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -34,6 +34,7 @@
 
 
 /* common */
+#include "check.h"
 #include "xmalloc.h"
 
 /* cc65 */
@@ -59,19 +60,16 @@ static LoopDesc* LoopStack = 0;
 
 
 
-LoopDesc* AddLoop (unsigned sp, unsigned loop, unsigned label,
-                  unsigned linc, unsigned lstat)
-/* Create and add a new loop descriptor */
+LoopDesc* AddLoop (unsigned SP, unsigned BreakLabel, unsigned ContinueLabel)
+/* Create and add a new loop descriptor. */
 {
     /* Allocate a new struct */
-    LoopDesc* L = (LoopDesc*) xmalloc (sizeof (LoopDesc));
+    LoopDesc* L = xmalloc (sizeof (LoopDesc));
 
     /* Fill in the data */
-    L->StackPtr        = sp;
-    L->Loop            = loop;
-    L->Label           = label;
-    L->linc            = linc;
-    L->lstat           = lstat;
+    L->StackPtr                = SP;
+    L->BreakLabel       = BreakLabel;
+    L->ContinueLabel           = ContinueLabel;
 
     /* Insert it into the list */
     L->Next = LoopStack;
@@ -95,6 +93,7 @@ void DelLoop (void)
 /* Remove the current loop */
 {
     LoopDesc* L = LoopStack;
+    CHECK (L != 0);
     LoopStack = LoopStack->Next;
     xfree (L);
 }

diff --git a/src/cc65/loop.h b/src/cc65/loop.h
index d71e3668b04e1e8ed615877bbda7c08a4b147ba6..81889cf5b07f7e1eb04d5da6787af7b281212d1c 100644 (file)
--- a/src/cc65/loop.h
+++ b/src/cc65/loop.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2000 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               Römerstraße 52                                              */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -39,7 +39,7 @@
 
 
 /*****************************************************************************/
-/*                                  data                                    */
+/*                                  data                                    */
 /*****************************************************************************/
 
 
@@ -48,10 +48,8 @@ typedef struct LoopDesc LoopDesc;
 struct LoopDesc {
     LoopDesc*  Next;
     unsigned   StackPtr;
-    unsigned   Loop;
-    unsigned   Label;
-    unsigned   linc;
-    unsigned   lstat;
+    unsigned           BreakLabel;
+    unsigned   ContinueLabel;
 };
 
 
@@ -62,9 +60,8 @@ struct LoopDesc {
 
 
 
-LoopDesc* AddLoop (unsigned sp, unsigned loop, unsigned label,
-                  unsigned linc, unsigned lstat);
-/* Create and add a new loop descriptor */
+LoopDesc* AddLoop (unsigned SP, unsigned BreakLabel, unsigned ContinueLabel);
+/* Create and add a new loop descriptor. */
 
 LoopDesc* CurrentLoop (void);
 /* Return a pointer to the descriptor of the current loop */

diff --git a/src/cc65/stmt.c b/src/cc65/stmt.c
index 77b39859d1775972f743138e40e48946c9c9f4b1..9d7b1e74ca1a1133a3026b52f0ab8d490b047d29 100644 (file)
--- a/src/cc65/stmt.c
+++ b/src/cc65/stmt.c
@@ -7,8 +7,8 @@
 /*                                                                           */
 /*                                                                           */
 /* (C) 1998-2003 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
+/*               Römerstraße 52                                              */
+/*               D-70794 Filderstadt                                         */
 /* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
@@ -184,28 +184,32 @@ static void DoStatement (void)
 /* Handle the 'do' statement */
 {
     /* Get the loop control labels */
-    unsigned loop = GetLocalLabel ();
-    unsigned lab = GetLocalLabel ();
+    unsigned LoopLabel      = GetLocalLabel ();
+    unsigned BreakLabel     = GetLocalLabel ();
+    unsigned ContinueLabel  = GetLocalLabel ();
 
     /* Skip the while token */
     NextToken ();
 
     /* Add the loop to the loop stack */
-    AddLoop (oursp, loop, lab, 0, 0);
+    AddLoop (oursp, BreakLabel, ContinueLabel);
 
-    /* Define the head label */
-    g_defcodelabel (loop);
+    /* Define the loop label */
+    g_defcodelabel (LoopLabel);
 
     /* Parse the loop body */
     Statement (0);
 
+    /* Output the label for a continue */
+    g_defcodelabel (ContinueLabel);
+
     /* Parse the end condition */
     Consume (TOK_WHILE, "`while' expected");
-    TestInParens (loop, 1);
+    TestInParens (LoopLabel, 1);
     ConsumeSemi ();
 
     /* Define the break label */
-    g_defcodelabel (lab);
+    g_defcodelabel (BreakLabel);
 
     /* Remove the loop from the loop stack */
     DelLoop ();
@@ -219,29 +223,31 @@ static void WhileStatement (void)
     int PendingToken;
 
     /* Get the loop control labels */
-    unsigned loop = GetLocalLabel ();
-    unsigned lab = GetLocalLabel ();
+    unsigned LoopLabel  = GetLocalLabel ();
+    unsigned BreakLabel = GetLocalLabel ();
 
     /* Skip the while token */
     NextToken ();
 
-    /* Add the loop to the loop stack */
-    AddLoop (oursp, loop, lab, 0, 0);
+    /* Add the loop to the loop stack. In case of a while loop, the loop head
+     * label is used for continue statements.
+     */
+    AddLoop (oursp, BreakLabel, LoopLabel);
 
     /* Define the head label */
-    g_defcodelabel (loop);
+    g_defcodelabel (LoopLabel);
 
     /* Test the loop condition */
-    TestInParens (lab, 0);
+    TestInParens (BreakLabel, 0);
 
     /* Loop body */
     Statement (&PendingToken);
 
     /* Jump back to loop top */
-    g_jump (loop);
+    g_jump (LoopLabel);
 
     /* Exit label */
-    g_defcodelabel (lab);
+    g_defcodelabel (BreakLabel);
 
     /* Eat remaining tokens that were delayed because of line info
      * correctness
@@ -316,7 +322,7 @@ static void BreakStatement (void)
     g_space (oursp - L->StackPtr);
 
     /* Jump to the exit label of the loop */
-    g_jump (L->Label);
+    g_jump (L->BreakLabel);
 }
 
 
@@ -332,10 +338,10 @@ static void ContinueStatement (void)
     /* Get the current loop descriptor */
     L = CurrentLoop ();
     if (L) {
-       /* Search for the correct loop */
+       /* Search for a loop that has a continue label. */
        do {
-           if (L->Loop) {
-               break;
+           if (L->ContinueLabel) {
+               break;
            }
            L = L->Next;
        } while (L);
@@ -350,12 +356,8 @@ static void ContinueStatement (void)
     /* Correct the stackpointer if needed */
     g_space (oursp - L->StackPtr);
 
-    /* Output the loop code */
-    if (L->linc) {
-               g_jump (L->linc);
-    } else {
-               g_jump (L->Loop);
-    }
+    /* Jump to next loop iteration */
+    g_jump (L->ContinueLabel);
 }
 
 
@@ -371,23 +373,25 @@ static void ForStatement (void)
     int PendingToken;
 
     /* Get several local labels needed later */
-    unsigned TestLabel = GetLocalLabel ();
-    unsigned lab       = GetLocalLabel ();
-    unsigned IncLabel  = GetLocalLabel ();
-    unsigned lstat     = GetLocalLabel ();
+    unsigned TestLabel    = GetLocalLabel ();
+    unsigned BreakLabel   = GetLocalLabel ();
+    unsigned IncLabel     = GetLocalLabel ();
+    unsigned BodyLabel    = GetLocalLabel ();
 
     /* Skip the FOR token */
     NextToken ();
 
-    /* Add the loop to the loop stack */
-    AddLoop (oursp, TestLabel, lab, IncLabel, lstat);
+    /* Add the loop to the loop stack. A continue jumps to the start of the
+     * the increment condition.
+     */
+    AddLoop (oursp, BreakLabel, IncLabel);
 
     /* Skip the opening paren */
     ConsumeLParen ();
 
     /* Parse the initializer expression */
     if (CurTok.Tok != TOK_SEMI) {
-       expression (&lval1);
+       expression (&lval1);
     }
     ConsumeSemi ();
 
@@ -396,10 +400,10 @@ static void ForStatement (void)
 
     /* Parse the test expression */
     if (CurTok.Tok != TOK_SEMI) {
-        Test (lstat, 1);
-       g_jump (lab);
+        Test (BodyLabel, 1);
+       g_jump (BreakLabel);
     } else {
-       g_jump (lstat);
+       g_jump (BodyLabel);
     }
     ConsumeSemi ();
 
@@ -425,7 +429,7 @@ static void ForStatement (void)
     ConsumeRParen ();
 
     /* Loop body */
-    g_defcodelabel (lstat);
+    g_defcodelabel (BodyLabel);
     Statement (&PendingToken);
 
     /* If we had an increment expression, move the code to the bottom of
@@ -433,17 +437,17 @@ static void ForStatement (void)
      * the loop body.
      */
     if (HaveIncExpr) {
-       MoveCode (IncExprStart, IncExprEnd, GetCodePos());
+       MoveCode (IncExprStart, IncExprEnd, GetCodePos());
     } else {
-       /* Jump back to the increment expression */
-       g_jump (IncLabel);
+       /* Jump back to the increment expression */
+       g_jump (IncLabel);
     }
 
     /* Skip a pending token if we have one */
     SkipPending (PendingToken);
 
     /* Declare the break label */
-    g_defcodelabel (lab);
+    g_defcodelabel (BreakLabel);
 
     /* Remove the loop from the loop stack */
     DelLoop ();

diff --git a/src/cc65/swstmt.c b/src/cc65/swstmt.c
index 7a6b716c28faf8915f6af03fb366ce1d3c27a077..5c50f5e6aae7bac66c540c685277db1ddc48b2cd 100644 (file)
--- a/src/cc65/swstmt.c
+++ b/src/cc65/swstmt.c
@@ -117,7 +117,7 @@ void SwitchStatement (void)
     ExitLabel = GetLocalLabel ();
 
     /* Create a loop so we may use break. */
-    AddLoop (oursp, 0, ExitLabel, 0, 0);
+    AddLoop (oursp, ExitLabel, 0);
 
     /* Create the collection for the case node tree */
     Nodes = NewCollection ();