6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-07-03 06:29:36 +00:00
Code Issues Projects Releases Wiki Activity

Use "Assertion failed" as default message for .assert if no message was

Browse Source 
given.


git-svn-id: svn://svn.cc65.org/cc65/trunk@3474 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2005-04-20 09:28:26 +00:00
parent 8eadae74bf
commit 9cd1ef08cc
1 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ca65/pseudo.c
View File

@ -6,7 +6,7 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998-2004 Ullrich von Bassewitz */ /* (C) 1998-2005, Ullrich von Bassewitz */
/* Römerstraße 52 */ /* Römerstraße 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
@ -385,7 +385,7 @@ static void DoAssert (void)
}; };
int Action; int Action;
long Val; unsigned Msg;
/* First we have the expression that has to evaluated */ /* First we have the expression that has to evaluated */
ExprNode* Expr = Expression (); ExprNode* Expr = Expression ();
@ -414,7 +414,14 @@ static void DoAssert (void)
Error ("Illegal assert action specifier"); Error ("Illegal assert action specifier");
} }
NextTok (); NextTok ();
ConsumeComma ();
/* We can have an optional message. If no message is present, use
* "Assertion failed".
*/
if (Tok == TOK_COMMA) {
/* Skip the comma */
NextTok ();
/* Read the message */ /* Read the message */
if (Tok != TOK_STRCON) { if (Tok != TOK_STRCON) {
@ -422,11 +429,21 @@ static void DoAssert (void)
return; return;
} }
/* Remember the assertion */ /* Translate the message into a string id. We can then skip the input
AddAssertion (Expr, Action, GetStringId (SVal)); * string.
*/
/* Skip the message */ Msg = GetStringId (SVal);
NextTok (); NextTok ();
} else {
/* Use "Assertion failed" */
Msg = GetStringId ("Assertion failed");
}
/* Remember the assertion */
AddAssertion (Expr, Action, Msg);
} }