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

Pausing petscii string options for #include and #embed

This commit is contained in:
drmortalwombat 2024-02-17 17:43:24 +01:00
parent 020ab117a4
commit 264a80d88e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
oscar64/Scanner.cpp
View File

@ -581,7 +581,12 @@ void Scanner::NextPreToken(void)
} }
else if (mToken == TK_PREP_INCLUDE) else if (mToken == TK_PREP_INCLUDE)
{ {
// Make sure include file names are not petsciid
uint64 op = mCompilerOptions;
mCompilerOptions &= ~COPT_PETSCII;
NextRawToken(); NextRawToken();
mCompilerOptions = op;
if (mToken == TK_STRING) if (mToken == TK_STRING)
{ {
if (!mPreprocessor->OpenSource("Including", (const char *)mTokenString, true)) if (!mPreprocessor->OpenSource("Including", (const char *)mTokenString, true))
@ -876,6 +881,10 @@ void Scanner::NextPreToken(void)
SourceFileMode mode = SFM_BINARY; SourceFileMode mode = SFM_BINARY;
SourceFileDecoder decoder = SFD_NONE; SourceFileDecoder decoder = SFD_NONE;
uint64 op = mCompilerOptions;
mCompilerOptions &= ~COPT_PETSCII;
NextRawToken();
NextRawToken(); NextRawToken();
if (mToken == TK_INTEGER) if (mToken == TK_INTEGER)
{ {
@ -933,6 +942,8 @@ void Scanner::NextPreToken(void)
if (!mPreprocessor->EmbedData("Embedding", (const char*)mTokenString, false, skip, limit, mode, decoder)) if (!mPreprocessor->EmbedData("Embedding", (const char*)mTokenString, false, skip, limit, mode, decoder))
mErrors->Error(mLocation, EERR_FILE_NOT_FOUND, "Could not open source file", (const char*)mTokenString); mErrors->Error(mLocation, EERR_FILE_NOT_FOUND, "Could not open source file", (const char*)mTokenString);
} }
mCompilerOptions = op;
} }
else if (mToken == TK_IDENT) else if (mToken == TK_IDENT)
{ {