mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 20:49:56 +00:00
Code Issues Releases Wiki Activity

Ignore the rest of the line after else (bug #3006)

Browse source
This commit is contained in:
Capostrophic 2018-09-19 22:44:09 +03:00
parent eefbda0ddf
commit cbce1a1b7c
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@
Bug #2969: Scripted items can stack
Bug #2987: Editor: some chance and AI data fields can overflow
Bug #3006: 'else if' operator breaks script compilation
Bug #3282: Unintended behaviour when assigning F3 and Windows keys
Bug #3623: Fix HiDPI on Windows
Bug #3733: Normal maps are inverted on mirrored UVs

22
components/compiler/controlparser.cpp
View file

@ -179,6 +179,14 @@ namespace Compiler
scanner.scan (mLineParser);
return true;
}
else if (mState==IfElseJunkState)
{
getErrorHandler().warning ("Ignoring extra text after else", loc);
SkipParser skip (getErrorHandler(), getContext());
scanner.scan (skip);
mState = IfElseBodyState;
return true;
}
return Parser::parseName (name, loc, scanner);
}
@ -207,8 +215,7 @@ namespace Compiler
return true;
}
}
else if (mState==IfBodyState || mState==IfElseifBodyState || mState==IfElseBodyState ||
mState==IfElseJunkState)
else if (mState==IfBodyState || mState==IfElseifBodyState || mState==IfElseBodyState)
{
if (parseIfBody (keyword, loc, scanner))
return true;
@ -218,6 +225,14 @@ namespace Compiler
if ( parseWhileBody (keyword, loc, scanner))
return true;
}
else if (mState==IfElseJunkState)
{
getErrorHandler().warning ("Ignoring extra text after else", loc);
SkipParser skip (getErrorHandler(), getContext());
scanner.scan (skip);
mState = IfElseBodyState;
return true;
}
return Parser::parseKeyword (keyword, loc, scanner);
}
@ -250,8 +265,9 @@ namespace Compiler
default: ;
}
}
else if (code==Scanner::S_open && mState==IfElseJunkState)
else if (mState==IfElseJunkState)
{
getErrorHandler().warning ("Ignoring extra text after else", loc);
SkipParser skip (getErrorHandler(), getContext());
scanner.scan (skip);
mState = IfElseBodyState;