Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Treat commas in scripts as whitespace

Browse source
This commit is contained in:
Evil Eye 2021-11-13 14:06:21 +01:00
parent 9a00984561
commit bee94e2afc
12 changed files with 36 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/compiler/lineparser.cpp
View file

@ -136,7 +136,7 @@ namespace Compiler
return false;
}
if (mState==MessageState || mState==MessageCommaState)
if (mState==MessageState)
{
GetArgumentsFromMessageFormat processor;
processor.process(name);
@ -155,7 +155,7 @@ namespace Compiler
return true;
}
if (mState==MessageButtonState || mState==MessageButtonCommaState)
if (mState==MessageButtonState)
{
Generator::pushString (mCode, mLiterals, name);
mState = MessageButtonState;
@ -198,7 +198,7 @@ namespace Compiler
bool LineParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
{
if (mState==MessageState || mState==MessageCommaState)
if (mState==MessageState)
{
if (const Extensions *extensions = getContext().getExtensions())
{
@ -446,12 +446,6 @@ namespace Compiler
if (code==Scanner::S_newline && (mState==EndState || mState==BeginState))
return false;
if (code==Scanner::S_comma && mState==MessageState)
{
mState = MessageCommaState;
return true;
}
if (code==Scanner::S_ref && mState==SetPotentialMemberVarState)
{
getErrorHandler().warning ("Stray explicit reference", loc);
@ -479,12 +473,6 @@ namespace Compiler
return false;
}
if (code==Scanner::S_comma && mState==MessageButtonState)
{
mState = MessageButtonCommaState;
return true;
}
if (code==Scanner::S_member && mState==SetPotentialMemberVarState)
{
mState = SetMemberVarState;