6502/PLASMA
1
0
Fork 0
mirror of https://github.com/dschmenk/PLASMA.git synced 2025-01-01 06:32:07 +00:00
Code Issues Projects Releases Wiki Activity

Add literal hex chars to strings - thanks Martin Haye!

Browse Source
This commit is contained in:
dschmenk 2016-01-29 13:53:37 -08:00
parent 6205c12145
commit 3c29dcb7e2
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/samplesrc/test.pla
View File

@ -137,5 +137,5 @@ putln
puti(mystruc)
putln
puts(@constr); puti(constval); putln
puts("Hello from in-line string!\n")
puts("Hello from in-line string!\$7F\n")
done

32
src/toolsrc/lex.c
View File

@ -75,6 +75,18 @@ void parse_error(char *errormsg)
fprintf(stderr, "^\nError: %s\n", errormsg);
exit(1);
}
int hexdigit(char ch)
{
ch = toupper(ch);
if (ch >= '0' && ch <= '9')
return ch - '0';
else if (ch >= 'A' && ch <= 'F')
return ch - 'A' + 10;
else
return -1;
}
t_token scan(void)
{
prevtoken = scantoken;
@ -152,12 +164,8 @@ t_token scan(void)
constval = 0;
while (scanpos++)
{
if (*scanpos >= '0' && *scanpos <= '9')
constval = constval * 16 + *scanpos - '0';
else if (*scanpos >= 'A' && *scanpos <= 'F')
constval = constval * 16 + *scanpos - 'A' + 10;
else if (*scanpos >= 'a' && *scanpos <= 'f')
constval = constval * 16 + *scanpos - 'a' + 10;
if (hexdigit(*scanpos) >= 0)
constval = constval * 16 + hexdigit(*scanpos);
else
break;
}
@ -216,6 +224,7 @@ t_token scan(void)
else if (scanpos[0] == '\"')
{
char *scanshift;
int scanoffset;
/*
* String constant.
*/
@ -225,6 +234,7 @@ t_token scan(void)
{
if (*scanpos == '\\')
{
scanoffset = 1;
switch (scanpos[1])
{
case 'n':
@ -248,12 +258,20 @@ t_token scan(void)
case '0':
*scanpos = '\0';
break;
case '$':
if (hexdigit(scanpos[2]) < 0 || hexdigit(scanpos[3]) < 0) {
parse_error("Bad string constant");
return (-1);
}
*scanpos = hexdigit(scanpos[2]) * 16 + hexdigit(scanpos[3]);
scanoffset = 3;
break;
default:
parse_error("Bad string constant");
return (-1);
}
for (scanshift = scanpos + 1; *scanshift; scanshift++)
scanshift[0] = scanshift[1];
scanshift[0] = scanshift[scanoffset];
}
scanpos++;
}