frederik
/
oscar64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix over eager pre processor tokenizer

This commit is contained in:
drmortalwombat 2024-05-19 17:16:14 +02:00
parent 86e0cbf9c2
commit 4c0e737508
2 changed files with 106 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
oscar64/Scanner.cpp
View File

@ -504,7 +504,11 @@ void Scanner::NextPreToken(void)
{
for (;;)
{
NextRawToken();
if (mPrepCondFalse > 0 || mPrepCondExit)
NextSkipRawToken();
else
NextRawToken();
if (mToken == TK_PREP_ENDIF)
{
if (mPrepCondFalse > 0)
@ -1097,6 +1101,106 @@ void Scanner::NextPreToken(void)
}
}
void Scanner::NextSkipRawToken(void)
{
while (mToken != TK_EOF)
{
mToken = TK_ERROR;
if (mOffset > 1 || !IsWhitespace(mTokenChar))
mStartOfLine = false;
while (IsWhitespace(mTokenChar))
{
if (mTokenChar == '\n')
{
mToken = TK_EOL;
NextChar();
return;
}
if (!NextChar())
{
mToken = TK_EOF;
return;
}
}
mLocation = mPreprocessor->mLocation;
mLocation.mColumn = mOffset;
if (mTokenChar == '#')
{
if (mOffset == 1 || mStartOfLine)
{
int n = 0;
char tkprep[128];
tkprep[0] = 0;
while (NextChar() && IsAlpha(mTokenChar))
{
if (n < 127)
tkprep[n++] = mTokenChar;
}
tkprep[n] = 0;
if (!strcmp(tkprep, "define"))
mToken = TK_PREP_DEFINE;
else if (!strcmp(tkprep, "undef"))
mToken = TK_PREP_UNDEF;
else if (!strcmp(tkprep, "include"))
mToken = TK_PREP_INCLUDE;
else if (!strcmp(tkprep, "if"))
mToken = TK_PREP_IF;
else if (!strcmp(tkprep, "ifdef"))
mToken = TK_PREP_IFDEF;
else if (!strcmp(tkprep, "ifndef"))
mToken = TK_PREP_IFNDEF;
else if (!strcmp(tkprep, "elif"))
mToken = TK_PREP_ELIF;
else if (!strcmp(tkprep, "else"))
mToken = TK_PREP_ELSE;
else if (!strcmp(tkprep, "endif"))
mToken = TK_PREP_ENDIF;
else if (!strcmp(tkprep, "pragma"))
mToken = TK_PREP_PRAGMA;
else if (!strcmp(tkprep, "line"))
mToken = TK_PREP_LINE;
else if (!strcmp(tkprep, "assign"))
mToken = TK_PREP_ASSIGN;
else if (!strcmp(tkprep, "repeat"))
mToken = TK_PREP_REPEAT;
else if (!strcmp(tkprep, "until"))
mToken = TK_PREP_UNTIL;
else if (!strcmp(tkprep, "embed"))
mToken = TK_PREP_EMBED;
else if (!strcmp(tkprep, "for"))
mToken = TK_PREP_FOR;
else
{
mToken = TK_PREP_IDENT;
mTokenIdent = Ident::Unique(tkprep);
}
}
else
{
NextChar();
mToken = TK_HASH;
}
return;
}
while (mTokenChar != '\n')
{
if (!NextChar())
{
mToken = TK_EOF;
return;
}
}
}
}
void Scanner::NextRawToken(void)
{
if (mUngetToken)

1
oscar64/Scanner.h
View File

@ -280,6 +280,7 @@ public:
void AddMacro(const Ident* ident, const char* value);
void MarkSourceOnce(void);
protected:
void NextSkipRawToken(void);
void NextRawToken(void);
void NextPreToken(void);