From d7b0e54494517cedc5596ba7b20e820f1567227d Mon Sep 17 00:00:00 2001 From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com> Date: Sun, 8 May 2022 21:44:28 +0200 Subject: [PATCH] Fix define with single line comment --- oscar64/Scanner.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/oscar64/Scanner.cpp b/oscar64/Scanner.cpp index b5cd62d..be161c0 100644 --- a/oscar64/Scanner.cpp +++ b/oscar64/Scanner.cpp @@ -533,10 +533,14 @@ void Scanner::NextToken(void) mErrors->Error(mLocation, EERR_INVALID_PREPROCESSOR, "')' expected in defined parameter list"); } - macro->SetString(mLine + mOffset); - int slen = strlen(mLine + mOffset); + int slen = mOffset; + while (mLine[slen] && mLine[slen] != '/' && mLine[slen + 1] != '/') + slen++; + macro->SetString(mLine + mOffset, slen - mOffset); mDefines->Insert(macro); - mOffset += slen; + mOffset = slen; + while (mLine[mOffset]) + mOffset++; } } else if (mToken == TK_PREP_UNDEF)