From 8cd7b15c8b3546af94ba8dabe3bdd5d5c65246a2 Mon Sep 17 00:00:00 2001 From: cuz Date: Tue, 24 Jul 2001 20:19:03 +0000 Subject: [PATCH] Squashed one more bug in the switch statement git-svn-id: svn://svn.cc65.org/cc65/trunk@816 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/cc65/stmt.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/cc65/stmt.c b/src/cc65/stmt.c index 39ac9278b..3fd066eda 100644 --- a/src/cc65/stmt.c +++ b/src/cc65/stmt.c @@ -329,6 +329,9 @@ static void CascadeSwitch (ExprDesc* Expr) long Val; /* Case label value */ + /* Get the unqualified type of the switch expression */ + type ExprType = UnqualifiedType (Expr->Type[0]); + /* Create a loop so we may break out, init labels */ ExitLab = GetLocalLabel (); AddLoop (oursp, 0, ExitLab, 0, 0); @@ -353,24 +356,24 @@ static void CascadeSwitch (ExprDesc* Expr) if (CodeLab == 0) { CodeLab = GetLocalLabel (); } - g_jump (CodeLab); + g_jump (CodeLab); } /* If we have a cascade label, emit it */ if (NextLab) { - g_defcodelabel (NextLab); - NextLab = 0; + g_defcodelabel (NextLab); + NextLab = 0; } while (CurTok.Tok == TOK_CASE || CurTok.Tok == TOK_DEFAULT) { - /* Parse the selector */ - if (CurTok.Tok == TOK_CASE) { + /* Parse the selector */ + if (CurTok.Tok == TOK_CASE) { - /* Count labels */ - ++lcount; + /* Count labels */ + ++lcount; - /* Skip the "case" token */ + /* Skip the "case" token */ NextToken (); /* Read the selector expression */ @@ -381,7 +384,7 @@ static void CascadeSwitch (ExprDesc* Expr) /* Check the range of the expression */ Val = lval.ConstVal; - switch (*Expr->Type) { + switch (ExprType) { case T_SCHAR: /* Signed char */ @@ -409,11 +412,11 @@ static void CascadeSwitch (ExprDesc* Expr) break; default: - Internal ("Invalid type: %02X", *Expr->Type & 0xFF); + Internal ("Invalid type: %04X", ExprType); } /* Emit a compare */ - g_cmp (Flags, Val); + g_cmp (Flags, Val); /* If another case follows after the colon (which is * currently pending and cannot be skipped since otherwise @@ -471,7 +474,7 @@ static void CascadeSwitch (ExprDesc* Expr) if (CurTok.Tok != TOK_RCURLY) { HaveBreak = Statement (0); } - } + } /* Check if we have any labels */ if (lcount == 0 && !HaveDefault) { -- 2.39.5