Changed names of the pragmas to be identical to the corresponding command line

[cc65] / src / cc65 / stmt.c

diff --git a/src/cc65/stmt.c b/src/cc65/stmt.c
index b9b258aa09e365741b5263cf3d1e24d9e1715dfe..1f5a61ea4b785a00c424ff647accdb2debf0bfd7 100644 (file)
--- a/src/cc65/stmt.c
+++ b/src/cc65/stmt.c
@@ -91,7 +91,7 @@ static void CheckTok (token_t Tok, const char* Msg, int* PendingToken)
  */
 {
     if (CurTok.Tok != Tok) {
-       Error (Msg);
+       Error ("%s", Msg);
     } else if (PendingToken) {
        *PendingToken = 1;
     } else {
@@ -314,7 +314,7 @@ static void ReturnStatement (void)
     }
 
     /* Mark the function as having a return statement */
-    F_HasReturn (CurrentFunc);
+    F_ReturnFound (CurrentFunc);
 
     /* Cleanup the stack in case we're inside a block with locals */
     g_space (StackPtr - F_GetTopLevelSP (CurrentFunc));
@@ -544,101 +544,100 @@ int Statement (int* PendingToken)
        *PendingToken = 0;
     }
 
-    /* Check for a label */
-    if (CurTok.Tok == TOK_IDENT && NextTok.Tok == TOK_COLON) {
-
-       /* Special handling for a label */
+    /* Check for a label. A label is always part of a statement, it does not
+     * replace one.
+     */
+    while (CurTok.Tok == TOK_IDENT && NextTok.Tok == TOK_COLON) {
+       /* Handle the label */
        DoLabel ();
         CheckLabelWithoutStatement ();
+    }
 
-    } else {
+    switch (CurTok.Tok) {
 
-       switch (CurTok.Tok) {
-
-           case TOK_LCURLY:
-               NextToken ();
-               GotBreak = CompoundStatement ();
-                       CheckTok (TOK_RCURLY, "`{' expected", PendingToken);
-               return GotBreak;
-
-           case TOK_IF:
-               return IfStatement ();
-
-           case TOK_WHILE:
-               WhileStatement ();
-               break;
-
-           case TOK_DO:
-               DoStatement ();
-               break;
-
-           case TOK_SWITCH:
-               SwitchStatement ();
-               break;
-
-           case TOK_RETURN:
-               ReturnStatement ();
-               CheckSemi (PendingToken);
-               return 1;
-
-           case TOK_BREAK:
-               BreakStatement ();
-                       CheckSemi (PendingToken);
-               return 1;
-
-           case TOK_CONTINUE:
-               ContinueStatement ();
-               CheckSemi (PendingToken);
-               return 1;
-
-           case TOK_FOR:
-               ForStatement ();
-               break;
-
-           case TOK_GOTO:
-               GotoStatement ();
-               CheckSemi (PendingToken);
-               return 1;
-
-           case TOK_SEMI:
-               /* Ignore it */
-               CheckSemi (PendingToken);
-               break;
-
-           case TOK_PRAGMA:
-               DoPragma ();
-               break;
-
-            case TOK_CASE:
-                CaseLabel ();
-                CheckLabelWithoutStatement ();
-                break;
-
-            case TOK_DEFAULT:
-                DefaultLabel ();
-                CheckLabelWithoutStatement ();
-                break;
-
-           default:
-                /* Remember the current code position */
-                GetCodePos (&Start);
-               /* Actual statement */
-                ExprWithCheck (hie0, &Expr);
-                /* Load the result only if it is an lvalue and the type is
-                 * marked as volatile. Otherwise the load is useless.
-                 */
-                if (ED_IsLVal (&Expr) && IsQualVolatile (Expr.Type)) {
-                    LoadExpr (CF_NONE, &Expr);
-                }
-                /* If the statement didn't generate code, and is not of type
-                 * void, emit a warning.
-                 */
-                GetCodePos (&End);
-                if (CodeRangeIsEmpty (&Start, &End) && !IsTypeVoid (Expr.Type)) {
-                    Warning ("Statement has no effect");
-                }
-               CheckSemi (PendingToken);
-       }
+        case TOK_LCURLY:
+            NextToken ();
+            GotBreak = CompoundStatement ();
+            CheckTok (TOK_RCURLY, "`{' expected", PendingToken);
+            return GotBreak;
+
+        case TOK_IF:
+            return IfStatement ();
+
+        case TOK_WHILE:
+            WhileStatement ();
+            break;
+
+        case TOK_DO:
+            DoStatement ();
+            break;
+
+        case TOK_SWITCH:
+            SwitchStatement ();
+            break;
+
+        case TOK_RETURN:
+            ReturnStatement ();
+            CheckSemi (PendingToken);
+            return 1;
+
+        case TOK_BREAK:
+            BreakStatement ();
+            CheckSemi (PendingToken);
+            return 1;
+
+        case TOK_CONTINUE:
+            ContinueStatement ();
+            CheckSemi (PendingToken);
+            return 1;
+
+        case TOK_FOR:
+            ForStatement ();
+            break;
+
+        case TOK_GOTO:
+            GotoStatement ();
+            CheckSemi (PendingToken);
+            return 1;
+
+        case TOK_SEMI:
+            /* Ignore it */
+            CheckSemi (PendingToken);
+            break;
+
+        case TOK_PRAGMA:
+            DoPragma ();
+            break;
+
+        case TOK_CASE:
+            CaseLabel ();
+            CheckLabelWithoutStatement ();
+            break;
+
+        case TOK_DEFAULT:
+            DefaultLabel ();
+            CheckLabelWithoutStatement ();
+            break;
+
+        default:
+            /* Remember the current code position */
+            GetCodePos (&Start);
+            /* Actual statement */
+            ExprWithCheck (hie0, &Expr);
+            /* Load the result only if it is an lvalue and the type is
+             * marked as volatile. Otherwise the load is useless.
+             */
+            if (ED_IsLVal (&Expr) && IsQualVolatile (Expr.Type)) {
+                LoadExpr (CF_NONE, &Expr);
+            }
+            /* If the statement didn't generate code, and is not of type
+             * void, emit a warning.
+             */
+            GetCodePos (&End);
+            if (CodeRangeIsEmpty (&Start, &End) && !IsTypeVoid (Expr.Type)) {
+                Warning ("Statement has no effect");
+            }
+            CheckSemi (PendingToken);
     }
     return 0;
 }