empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

47
src/ca65/pseudo.c
View file

@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (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 */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@ -384,8 +384,8 @@ static void DoAssert (void)
"ERROR" "ERROR"
}; };
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,19 +414,36 @@ static void DoAssert (void)
Error ("Illegal assert action specifier"); Error ("Illegal assert action specifier");
} }
NextTok (); NextTok ();
ConsumeComma ();
/* Read the message */ /* We can have an optional message. If no message is present, use
if (Tok != TOK_STRCON) { * "Assertion failed".
ErrorSkip ("String constant expected"); */
return; if (Tok == TOK_COMMA) {
/* Skip the comma */
NextTok ();
/* Read the message */
if (Tok != TOK_STRCON) {
ErrorSkip ("String constant expected");
return;
}
/* Translate the message into a string id. We can then skip the input
* string.
*/
Msg = GetStringId (SVal);
NextTok ();
} else {
/* Use "Assertion failed" */
Msg = GetStringId ("Assertion failed");
} }
/* Remember the assertion */ /* Remember the assertion */
AddAssertion (Expr, Action, GetStringId (SVal)); AddAssertion (Expr, Action, Msg);
/* Skip the message */
NextTok ();
} }