bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed a escape char const problem

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@3235 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2004-10-09 14:32:27 +00:00
parent 21ff65dddc
commit 0e0183020d
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/cc65/scanner.c
View File

@@ -250,9 +250,8 @@ static void SetTok (int tok)
static int ParseChar (void) static int ParseChar (void)
/* Parse a character. Converts escape chars into character codes. */ /* Parse a character. Converts escape chars into character codes. */
{ {
int I;
unsigned Val;
int C; int C;
int HadError;
/* Check for escape chars */ /* Check for escape chars */
if (CurC == '\\') { if (CurC == '\\') {
@@ -294,21 +293,24 @@ static int ParseChar (void)
case 'x': case 'x':
case 'X': case 'X':
/* Hex character constant */ /* Hex character constant */
NextChar (); if (!IsXDigit (NextC)) {
if (!IsXDigit (CurC)) {
Error ("\\x used with no following hex digits"); Error ("\\x used with no following hex digits");
C = ' '; C = ' ';
} } else {
I = 0; HadError = 0;
C = 0; C = 0;
while (IsXDigit (CurC)) { while (IsXDigit (NextC)) {
if (++I <= 2) { if ((C << 4) >= 256) {
C = (C << 4) | HexVal (CurC); if (!HadError) {
} else if (I == 3) { Error ("Hex character constant out of range");
Error ("Too many digits in hex character constant"); HadError = 1;
}
} else {
C = (C << 4) | HexVal (NextC);
} }
NextChar (); NextChar ();
} }
}
break; break;
case '0': case '0':
case '1': case '1':
@@ -318,17 +320,19 @@ static int ParseChar (void)
case '5': case '5':
case '6': case '6':
case '7': case '7':
/* Octal constant ### FIXME: Eat all available octal chars! */ /* Octal constant */
I = 0; HadError = 0;
Val = CurC - '0'; C = HexVal (CurC);
while (IsODigit (NextC) && ++I <= 3) { while (IsODigit (NextC)) {
NextChar (); if ((C << 3) >= 256) {
Val = (Val << 3) | (CurC - '0'); if (!HadError) {
Error ("Octal character constant out of range");
HadError = 1;
} }
C = (int) Val; } else {
if (Val >= 256) { C = (C << 3) | HexVal (NextC);
Error ("Character constant out of range: %u", Val); }
C = ' '; NextChar ();
} }
break; break;
default: default: