X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fstmt.c;h=77b39859d1775972f743138e40e48946c9c9f4b1;hb=b3496bb343a2c93284a8669da4b52cf45b3db3dd;hp=833d49c70c644cad41f0db0751b6b1f5607fa1cd;hpb=2fead582431c9017cae8fb3c0289c248de5c9923;p=cc65 diff --git a/src/cc65/stmt.c b/src/cc65/stmt.c index 833d49c70..77b39859d 100644 --- a/src/cc65/stmt.c +++ b/src/cc65/stmt.c @@ -1,10 +1,35 @@ -/* - * stmt.c - * - * Ullrich von Bassewitz, 06.08.1998 - * - * Original by John R. Dunning - see copyleft.jrd - */ +/*****************************************************************************/ +/* */ +/* stmt.c */ +/* */ +/* Parse a statement */ +/* */ +/* */ +/* */ +/* (C) 1998-2003 Ullrich von Bassewitz */ +/* Wacholderweg 14 */ +/* D-70597 Stuttgart */ +/* EMail: uz@cc65.org */ +/* */ +/* */ +/* This software is provided 'as-is', without any expressed or implied */ +/* warranty. In no event will the authors be held liable for any damages */ +/* arising from the use of this software. */ +/* */ +/* Permission is granted to anyone to use this software for any purpose, */ +/* including commercial applications, and to alter it and redistribute it */ +/* freely, subject to the following restrictions: */ +/* */ +/* 1. The origin of this software must not be misrepresented; you must not */ +/* claim that you wrote the original software. If you use this software */ +/* in a product, an acknowledgment in the product documentation would be */ +/* appreciated but is not required. */ +/* 2. Altered source versions must be plainly marked as such, and must not */ +/* be misrepresented as being the original software. */ +/* 3. This notice may not be removed or altered from any source */ +/* distribution. */ +/* */ +/*****************************************************************************/ @@ -12,6 +37,7 @@ #include /* common */ +#include "coll.h" #include "xmalloc.h" /* cc65 */ @@ -29,54 +55,101 @@ #include "loop.h" #include "pragma.h" #include "scanner.h" +#include "swstmt.h" #include "symtab.h" #include "stmt.h" +#include "typeconv.h" /*****************************************************************************/ -/* Data */ +/* Helper functions */ /*****************************************************************************/ -/* Maximum count of cases */ -#define CASE_MAX 257 +static void CheckTok (token_t Tok, const char* Msg, int* PendingToken) +/* Helper function for Statement. Will check for Tok and print Msg if not + * found. If PendingToken is NULL, it will the skip the token, otherwise + * it will store one to PendingToken. + */ +{ + if (CurTok.Tok != Tok) { + Error (Msg); + } else if (PendingToken) { + *PendingToken = 1; + } else { + NextToken (); + } +} -/*****************************************************************************/ -/* Code */ -/*****************************************************************************/ +static void CheckSemi (int* PendingToken) +/* Helper function for Statement. Will check for a semicolon and print an + * error message if not found (plus some error recovery). If PendingToken is + * NULL, it will the skip the token, otherwise it will store one to + * PendingToken. + * This function is a special version of CheckTok with the addition of the + * error recovery. + */ +{ + int HaveToken = (CurTok.Tok == TOK_SEMI); + if (!HaveToken) { + Error ("`;' expected"); + /* Try to be smart about errors */ + if (CurTok.Tok == TOK_COLON || CurTok.Tok == TOK_COMMA) { + HaveToken = 1; + } + } + if (HaveToken) { + if (PendingToken) { + *PendingToken = 1; + } else { + NextToken (); + } + } +} + + + +static void SkipPending (int PendingToken) +/* Skip the pending token if we have one */ +{ + if (PendingToken) { + NextToken (); + } +} -static int statement (void); -/* Forward decl */ +/*****************************************************************************/ +/* Code */ +/*****************************************************************************/ -static int doif (void) -/* Handle 'if' statement here */ +static int IfStatement (void) +/* Handle an 'if' statement */ { - int flab1; - int flab2; - int gotbreak; + unsigned Label1; + int GotBreak; /* Skip the if */ NextToken (); /* Generate a jump label and parse the condition */ - flab1 = GetLabel (); - test (flab1, 0); + Label1 = GetLocalLabel (); + TestInParens (Label1, 0); /* Parse the if body */ - gotbreak = statement (); + GotBreak = Statement (0); /* Else clause present? */ - if (curtok != TOK_ELSE) { + if (CurTok.Tok != TOK_ELSE) { + + g_defcodelabel (Label1); - g_defloclabel (flab1); /* Since there's no else clause, we're not sure, if the a break * statement is really executed. */ @@ -84,120 +157,145 @@ static int doif (void) } else { - /* Skip the else */ + /* Generate a jump around the else branch */ + unsigned Label2 = GetLocalLabel (); + g_jump (Label2); + + /* Skip the else */ NextToken (); - /* If we had some sort of break statement at the end of the if clause, - * there's no need to generate an additional jump around the else - * clause, since the jump is never reached. - */ - if (!gotbreak) { - flab2 = GetLabel (); - g_jump (flab2); - } else { - /* Mark the label as unused */ - flab2 = 0; - } - g_defloclabel (flab1); - gotbreak &= statement (); + /* Define the target for the first test */ + g_defcodelabel (Label1); + + /* Total break only if both branches had a break. */ + GotBreak &= Statement (0); /* Generate the label for the else clause */ - if (flab2) { - g_defloclabel (flab2); - } + g_defcodelabel (Label2); /* Done */ - return gotbreak; + return GotBreak; } } -static void dowhile (char wtype) -/* Handle 'while' statement here */ +static void DoStatement (void) +/* Handle the 'do' statement */ { - int loop; - int lab; + /* Get the loop control labels */ + unsigned loop = GetLocalLabel (); + unsigned lab = GetLocalLabel (); + /* Skip the while token */ NextToken (); - loop = GetLabel (); - lab = GetLabel (); + + /* Add the loop to the loop stack */ AddLoop (oursp, loop, lab, 0, 0); - g_defloclabel (loop); - if (wtype == 'w') { - - /* While loop */ - test (lab, 0); - - /* If the statement following the while loop is empty, that is, we have - * something like "while (1) ;", the test function ommitted the jump as - * an optimization. Since we know, the condition codes are set, we can - * do another small optimization here, and use a conditional jump - * instead an absolute one. - */ - if (curtok == TOK_SEMI) { - /* Shortcut */ - NextToken (); - /* Use a conditional jump */ - g_truejump (CF_NONE, loop); - } else { - /* There is code inside the while loop */ - statement (); - g_jump (loop); - g_defloclabel (lab); - } - } else { + /* Define the head label */ + g_defcodelabel (loop); - /* Do loop */ - statement (); - Consume (TOK_WHILE, "`while' expected"); - test (loop, 1); - ConsumeSemi (); - g_defloclabel (lab); + /* Parse the loop body */ + Statement (0); - } + /* Parse the end condition */ + Consume (TOK_WHILE, "`while' expected"); + TestInParens (loop, 1); + ConsumeSemi (); + + /* Define the break label */ + g_defcodelabel (lab); + + /* Remove the loop from the loop stack */ DelLoop (); } -static void doreturn (void) -/* Handle 'return' statement here */ +static void WhileStatement (void) +/* Handle the 'while' statement */ { - struct expent lval; - unsigned Flags = 0; /* Code generator flags */ - int HaveVal = 0; /* Do we have a return value in ax? */ + int PendingToken; + /* Get the loop control labels */ + unsigned loop = GetLocalLabel (); + unsigned lab = GetLocalLabel (); + /* Skip the while token */ NextToken (); - if (curtok != TOK_SEMI) { - if (HasVoidReturn (CurrentFunc)) { + + /* Add the loop to the loop stack */ + AddLoop (oursp, loop, lab, 0, 0); + + /* Define the head label */ + g_defcodelabel (loop); + + /* Test the loop condition */ + TestInParens (lab, 0); + + /* Loop body */ + Statement (&PendingToken); + + /* Jump back to loop top */ + g_jump (loop); + + /* Exit label */ + g_defcodelabel (lab); + + /* Eat remaining tokens that were delayed because of line info + * correctness + */ + SkipPending (PendingToken); + + /* Remove the loop from the loop stack */ + DelLoop (); +} + + + +static void ReturnStatement (void) +/* Handle the 'return' statement */ +{ + ExprDesc Expr; + int k; + + NextToken (); + if (CurTok.Tok != TOK_SEMI) { + + /* Check if the function has a return value declared */ + if (F_HasVoidReturn (CurrentFunc)) { Error ("Returning a value in function with return type void"); } - if (evalexpr (CF_NONE, hie0, &lval) == 0) { - /* Constant value */ - Flags = CF_CONST; - } else { - /* Value in the primary register */ - HaveVal = 1; - } - /* Convert the return value to the type of the function result */ - if (!HasVoidReturn (CurrentFunc)) { - Flags |= (assignadjust (GetReturnType (CurrentFunc), &lval) & ~CF_CONST) | CF_REG; + /* Evaluate the return expression */ + k = hie0 (InitExprDesc (&Expr)); + + /* Ignore the return expression if the function returns void */ + if (!F_HasVoidReturn (CurrentFunc)) { + + /* Convert the return value to the type of the function result */ + k = TypeConversion (&Expr, k, F_GetReturnType (CurrentFunc)); + + /* Load the value into the primary */ + ExprLoad (CF_NONE, k, &Expr); } - } else if (!HasVoidReturn (CurrentFunc)) { - Error ("Function `%s' must return a value", GetFuncName (CurrentFunc)); + + } else if (!F_HasVoidReturn (CurrentFunc) && !F_HasOldStyleIntRet (CurrentFunc)) { + Error ("Function `%s' must return a value", F_GetFuncName (CurrentFunc)); } - RestoreRegVars (HaveVal); - g_leave (Flags, lval.e_const); + + /* Cleanup the stack in case we're inside a block with locals */ + g_space (oursp - F_GetTopLevelSP (CurrentFunc)); + + /* Output a jump to the function exit code */ + g_jump (F_GetRetLab (CurrentFunc)); } -static void dobreak (void) -/* Handle 'break' statement here */ +static void BreakStatement (void) +/* Handle the 'break' statement */ { LoopDesc* L; @@ -209,9 +307,9 @@ static void dobreak (void) /* Check if we are inside a loop */ if (L == 0) { - /* Error: No current loop */ - Error ("`break' statement not within loop or switch"); - return; + /* Error: No current loop */ + Error ("`break' statement not within loop or switch"); + return; } /* Correct the stack pointer if needed */ @@ -223,8 +321,8 @@ static void dobreak (void) -static void docontinue (void) -/* Handle 'continue' statement here */ +static void ContinueStatement (void) +/* Handle the 'continue' statement */ { LoopDesc* L; @@ -234,19 +332,19 @@ static void docontinue (void) /* Get the current loop descriptor */ L = CurrentLoop (); if (L) { - /* Search for the correct loop */ - do { - if (L->Loop) { - break; - } - L = L->Next; - } while (L); + /* Search for the correct loop */ + do { + if (L->Loop) { + break; + } + L = L->Next; + } while (L); } /* Did we find it? */ if (L == 0) { - Error ("`continue' statement not within a loop"); - return; + Error ("`continue' statement not within a loop"); + return; } /* Correct the stackpointer if needed */ @@ -262,441 +360,226 @@ static void docontinue (void) -static void cascadeswitch (struct expent* eval) -/* Handle a switch statement for chars with a cmp cascade for the selector */ +static void ForStatement (void) +/* Handle a 'for' statement */ { - unsigned ExitLab; /* Exit label */ - unsigned NextLab; /* Next case label */ - unsigned CodeLab; /* Label that starts the actual selector code */ - int HaveBreak; /* Remember if we exited with break */ - int HaveDefault; /* Remember if we had a default label */ - int lcount; /* Label count */ - unsigned Flags; /* Code generator flags */ - struct expent lval; /* Case label expression */ - long Val; /* Case label value */ - - - /* Create a loop so we may break out, init labels */ - ExitLab = GetLabel (); - AddLoop (oursp, 0, ExitLab, 0, 0); - - /* Setup some variables needed in the loop below */ - Flags = TypeOf (eval->e_tptr) | CF_CONST | CF_FORCECHAR; - CodeLab = NextLab = 0; - HaveBreak = 1; - HaveDefault = 0; - - /* Parse the labels */ - lcount = 0; - while (curtok != TOK_RCURLY) { - - if (curtok == TOK_CASE || curtok == TOK_DEFAULT) { - - /* If the code for the previous selector did not end with a - * break statement, we must jump over the next selector test. - */ - if (!HaveBreak) { - /* Define a label for the code */ - if (CodeLab == 0) { - CodeLab = GetLabel (); - } - g_jump (CodeLab); - } - - /* If we have a cascade label, emit it */ - if (NextLab) { - g_defloclabel (NextLab); - NextLab = 0; - } - - while (curtok == TOK_CASE || curtok == TOK_DEFAULT) { - - /* Parse the selector */ - if (curtok == TOK_CASE) { - - /* Count labels */ - ++lcount; - - /* Skip the "case" token */ - NextToken (); - - /* Read the selector expression */ - constexpr (&lval); - if (!IsClassInt (lval.e_tptr)) { - Error ("Switch quantity not an integer"); - } - - /* Check the range of the expression */ - Val = lval.e_const; - switch (*eval->e_tptr) { - - case T_SCHAR: - /* Signed char */ - if (Val < -128 || Val > 127) { - Error ("Range error"); - } - break; - - case T_UCHAR: - if (Val < 0 || Val > 255) { - Error ("Range error"); - } - break; - - case T_INT: - if (Val < -32768 || Val > 32767) { - Error ("Range error"); - } - break; - - case T_UINT: - if (Val < 0 || Val > 65535) { - Error ("Range error"); - } - break; - - default: - Internal ("Invalid type: %02X", *eval->e_tptr & 0xFF); - } - - /* Skip the colon */ - ConsumeColon (); - - /* Emit a compare */ - g_cmp (Flags, Val); - - /* If another case follows, we will jump to the code if - * the condition is true. - */ - if (curtok == TOK_CASE) { - /* Create a code label if needed */ - if (CodeLab == 0) { - CodeLab = GetLabel (); - } - g_falsejump (CF_NONE, CodeLab); - } else if (curtok != TOK_DEFAULT) { - /* No case follows, jump to next selector */ - if (NextLab == 0) { - NextLab = GetLabel (); - } - g_truejump (CF_NONE, NextLab); - } - - } else { - - /* Default case */ - NextToken (); - - /* Skip the colon */ - ConsumeColon (); - - /* Handle the pathologic case: DEFAULT followed by CASE */ - if (curtok == TOK_CASE) { - if (CodeLab == 0) { - CodeLab = GetLabel (); - } - g_jump (CodeLab); - } - - /* Remember that we had a default label */ - HaveDefault = 1; - } - - } - - } + ExprDesc lval1; + ExprDesc lval3; + int HaveIncExpr; + CodeMark IncExprStart; + CodeMark IncExprEnd; + int PendingToken; + + /* Get several local labels needed later */ + unsigned TestLabel = GetLocalLabel (); + unsigned lab = GetLocalLabel (); + unsigned IncLabel = GetLocalLabel (); + unsigned lstat = GetLocalLabel (); + + /* Skip the FOR token */ + NextToken (); - /* Emit a code label if we have one */ - if (CodeLab) { - g_defloclabel (CodeLab); - CodeLab = 0; - } + /* Add the loop to the loop stack */ + AddLoop (oursp, TestLabel, lab, IncLabel, lstat); - /* Parse statements */ - if (curtok != TOK_RCURLY) { - HaveBreak = statement (); - } - } + /* Skip the opening paren */ + ConsumeLParen (); - /* Check if we have any labels */ - if (lcount == 0 && !HaveDefault) { - Warning ("No case labels"); + /* Parse the initializer expression */ + if (CurTok.Tok != TOK_SEMI) { + expression (&lval1); } + ConsumeSemi (); - /* Eat the closing curly brace */ - NextToken (); + /* Label for the test expressions */ + g_defcodelabel (TestLabel); - /* Define the exit label and, if there's a next label left, create this - * one, too. - */ - if (NextLab) { - g_defloclabel (NextLab); + /* Parse the test expression */ + if (CurTok.Tok != TOK_SEMI) { + Test (lstat, 1); + g_jump (lab); + } else { + g_jump (lstat); } - g_defloclabel (ExitLab); - - /* End the loop */ - DelLoop (); -} + ConsumeSemi (); + /* Remember the start of the increment expression */ + IncExprStart = GetCodePos(); + /* Label for the increment expression */ + g_defcodelabel (IncLabel); -static void tableswitch (struct expent* eval) -/* Handle a switch statement via table based selector */ -{ - /* Entry for one case in a switch statement */ - struct swent { - long sw_const; /* selector value */ - unsigned sw_lab; /* label for this selector */ - }; - - int dlabel; /* for default */ - int lab; /* exit label */ - int label; /* label for case */ - int lcase; /* label for compares */ - int lcount; /* Label count */ - int HaveBreak; /* Last statement has a break */ - int HaveDefault; /* Remember if we had a default label */ - unsigned Flags; /* Code generator flags */ - struct expent lval; /* Case label expression */ - struct swent *p; - struct swent *swtab; - - /* Allocate memory for the switch table */ - swtab = xmalloc (CASE_MAX * sizeof (struct swent)); - - /* Create a look so we may break out, init labels */ - HaveBreak = 0; /* Keep gcc silent */ - HaveDefault = 0; /* No default case until now */ - dlabel = 0; /* init */ - lab = GetLabel (); /* get exit */ - p = swtab; - AddLoop (oursp, 0, lab, 0, 0); - - /* Jump behind the code for the CASE labels */ - g_jump (lcase = GetLabel ()); - lcount = 0; - while (curtok != TOK_RCURLY) { - if (curtok == TOK_CASE || curtok == TOK_DEFAULT) { - if (lcount >= CASE_MAX) { - Fatal ("Too many case labels"); - } - label = GetLabel (); - do { - if (curtok == TOK_CASE) { - NextToken (); - constexpr (&lval); - if (!IsClassInt (lval.e_tptr)) { - Error ("Switch quantity not an integer"); - } - p->sw_const = lval.e_const; - p->sw_lab = label; - ++p; - ++lcount; - } else { - NextToken (); - dlabel = label; - HaveDefault = 1; - } - ConsumeColon (); - } while (curtok == TOK_CASE || curtok == TOK_DEFAULT); - g_defloclabel (label); - HaveBreak = 0; - } - if (curtok != TOK_RCURLY) { - HaveBreak = statement (); - } + /* Parse the increment expression */ + HaveIncExpr = (CurTok.Tok != TOK_RPAREN); + if (HaveIncExpr) { + expression (&lval3); } - /* Check if we have any labels */ - if (lcount == 0 && !HaveDefault) { - Warning ("No case labels"); - } + /* Jump to the test */ + g_jump (TestLabel); - /* Eat the closing curly brace */ - NextToken (); + /* Remember the end of the increment expression */ + IncExprEnd = GetCodePos(); - /* If the last statement doesn't have a break or return, add one */ - if (!HaveBreak) { - g_jump (lab); - } + /* Skip the closing paren */ + ConsumeRParen (); - /* Actual selector code goes here */ - g_defloclabel (lcase); + /* Loop body */ + g_defcodelabel (lstat); + Statement (&PendingToken); - /* Create the call to the switch subroutine */ - Flags = TypeOf (eval->e_tptr); - g_switch (Flags); + /* If we had an increment expression, move the code to the bottom of + * the loop. In this case we don't need to jump there at the end of + * the loop body. + */ + if (HaveIncExpr) { + MoveCode (IncExprStart, IncExprEnd, GetCodePos()); + } else { + /* Jump back to the increment expression */ + g_jump (IncLabel); + } - /* First entry is negative of label count */ - g_defdata (CF_INT | CF_CONST, -((int)lcount)-1, 0); + /* Skip a pending token if we have one */ + SkipPending (PendingToken); - /* Create the case selector table */ - AddCodeHint ("casetable"); - p = swtab; - while (lcount) { - g_case (Flags, p->sw_lab, p->sw_const); /* Create one label */ - --lcount; - ++p; - } + /* Declare the break label */ + g_defcodelabel (lab); - if (dlabel) { - g_jump (dlabel); - } - g_defloclabel (lab); + /* Remove the loop from the loop stack */ DelLoop (); - - /* Free the allocated space for the labels */ - xfree (swtab); } -static void doswitch (void) -/* Handle 'switch' statement here */ +static int CompoundStatement (void) +/* Compound statement. Allow any number of statements inside braces. The + * function returns true if the last statement was a break or return. + */ { - struct expent eval; /* Switch statement expression */ + int GotBreak; - /* Eat the "switch" */ - NextToken (); + /* Remember the stack at block entry */ + int OldStack = oursp; - /* Read the switch expression */ - ConsumeLParen (); - intexpr (&eval); - ConsumeRParen (); + /* Enter a new lexical level */ + EnterBlockLevel (); - /* result of expr is in P */ - ConsumeLCurly (); + /* Parse local variable declarations if any */ + DeclareLocals (); - /* Now decide which sort of switch we will create: */ - if (IsTypeChar (eval.e_tptr) || (CodeSizeFactor >= 200 && IsClassInt (eval.e_tptr))) { - cascadeswitch (&eval); - } else { - tableswitch (&eval); + /* Now process statements in this block */ + GotBreak = 0; + while (CurTok.Tok != TOK_RCURLY) { + if (CurTok.Tok != TOK_CEOF) { + GotBreak = Statement (0); + } else { + break; + } } -} + /* Clean up the stack. */ + if (!GotBreak) { + g_space (oursp - OldStack); + } + oursp = OldStack; + /* Emit references to imports/exports for this block */ + EmitExternals (); -static void dofor (void) -/* Handle 'for' statement here */ -{ - int loop; - int lab; - int linc; - int lstat; - struct expent lval1; - struct expent lval2; - struct expent lval3; + /* Leave the lexical level */ + LeaveBlockLevel (); - NextToken (); - loop = GetLabel (); - lab = GetLabel (); - linc = GetLabel (); - lstat = GetLabel (); - AddLoop (oursp, loop, lab, linc, lstat); - ConsumeLParen (); - if (curtok != TOK_SEMI) { /* exp1 */ - expression (&lval1); - } - ConsumeSemi (); - g_defloclabel (loop); - if (curtok != TOK_SEMI) { /* exp2 */ - boolexpr (&lval2); - g_truejump (CF_NONE, lstat); - g_jump (lab); - } else { - g_jump (lstat); - } - ConsumeSemi (); - g_defloclabel (linc); - if (curtok != TOK_RPAREN) { /* exp3 */ - expression (&lval3); - } - ConsumeRParen (); - g_jump (loop); - g_defloclabel (lstat); - statement (); - g_jump (linc); - g_defloclabel (lab); - DelLoop (); + return GotBreak; } -static int statement (void) -/* Statement parser. Called whenever syntax requires a statement. - * This routine performs that statement and returns 1 if it is a branch, - * 0 otherwise +int Statement (int* PendingToken) +/* Statement parser. Returns 1 if the statement does a return/break, returns + * 0 otherwise. If the PendingToken pointer is not NULL, the function will + * not skip the terminating token of the statement (closing brace or + * semicolon), but store true if there is a pending token, and false if there + * is none. The token is always checked, so there is no need for the caller to + * check this token, it must be skipped, however. If the argument pointer is + * NULL, the function will skip the token. */ { - struct expent lval; + ExprDesc lval; + int GotBreak; - /* */ - if (curtok == TOK_IDENT && nxttok == TOK_COLON) { + /* Assume no pending token */ + if (PendingToken) { + *PendingToken = 0; + } + + /* Check for a label */ + if (CurTok.Tok == TOK_IDENT && NextTok.Tok == TOK_COLON) { /* Special handling for a label */ DoLabel (); } else { - switch (curtok) { + switch (CurTok.Tok) { case TOK_LCURLY: - return compound (); + NextToken (); + GotBreak = CompoundStatement (); + CheckTok (TOK_RCURLY, "`{' expected", PendingToken); + return GotBreak; case TOK_IF: - return doif (); + return IfStatement (); case TOK_WHILE: - dowhile ('w'); - break; + WhileStatement (); + break; case TOK_DO: - dowhile ('d'); - break; + DoStatement (); + break; case TOK_SWITCH: - doswitch (); - break; + SwitchStatement (); + break; case TOK_RETURN: - doreturn (); - ConsumeSemi (); - return 1; + ReturnStatement (); + CheckSemi (PendingToken); + return 1; case TOK_BREAK: - dobreak (); - ConsumeSemi (); + BreakStatement (); + CheckSemi (PendingToken); return 1; case TOK_CONTINUE: - docontinue (); - ConsumeSemi (); + ContinueStatement (); + CheckSemi (PendingToken); return 1; case TOK_FOR: - dofor (); + ForStatement (); break; case TOK_GOTO: - DoGoto (); - ConsumeSemi (); + GotoStatement (); + CheckSemi (PendingToken); return 1; case TOK_SEMI: - /* ignore it. */ - NextToken (); + /* Ignore it */ + CheckSemi (PendingToken); break; case TOK_PRAGMA: DoPragma (); - break; + break; default: - AddCodeHint ("stmt:start"); + /* Actual statement */ expression (&lval); - AddCodeHint ("stmt:end"); - ConsumeSemi (); + CheckSemi (PendingToken); } } return 0; @@ -704,61 +587,4 @@ static int statement (void) -int compound (void) -/* Compound statement. Allow any number of statements, inside braces. */ -{ - static unsigned CurrentLevel = 0; - - int isbrk; - int oldsp; - - /* eat LCURLY */ - NextToken (); - - /* Remember the stack at block entry */ - oldsp = oursp; - - /* If we're not on function level, enter a new lexical level */ - if (CurrentLevel++ > 0) { - /* A nested block */ - EnterBlockLevel (); - } - - /* Parse local variable declarations if any */ - DeclareLocals (); - - /* Now process statements in the function body */ - isbrk = 0; - while (curtok != TOK_RCURLY) { - if (curtok == TOK_CEOF) - break; - else { - isbrk = statement (); - } - } - - /* Emit references to imports/exports for this block */ - EmitExternals (); - - /* If this is not the top level compound statement, clean up the stack. - * For a top level statement this will be done by the function exit code. - */ - if (--CurrentLevel != 0) { - /* Some sort of nested block */ - LeaveBlockLevel (); - if (isbrk) { - oursp = oldsp; - } else { - g_space (oursp - oldsp); - oursp = oldsp; - } - } - - /* Eat closing brace */ - ConsumeRCurly (); - - return isbrk; -} - -