teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

ignore conditions after an else (only works if condition is put in parentheses)

Browse source
This commit is contained in:
Marc Zinnschlag 2014-02-15 12:45:50 +01:00
parent e17af4231a
commit fd665a1994
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
components/compiler/controlparser.cpp
View file

@ -8,6 +8,7 @@
#include "scanner.hpp" #include "scanner.hpp"
#include "generator.hpp" #include "generator.hpp"
#include "errorhandler.hpp" #include "errorhandler.hpp"
#include "skipparser.hpp"
namespace Compiler namespace Compiler
{ {
@ -71,7 +72,7 @@ namespace Compiler
} }
else if (keyword==Scanner::K_else) else if (keyword==Scanner::K_else)
{ {
mState = IfElseBodyState; /// \todo should be IfElseEndState; add an option for that mState = IfElseJunkState; /// \todo should be IfElseEndState; add an option for that
} }
return true; return true;
@ -207,7 +208,8 @@ namespace Compiler
return true; return true;
} }
} }
else if (mState==IfBodyState || mState==IfElseifBodyState || mState==IfElseBodyState) else if (mState==IfBodyState || mState==IfElseifBodyState || mState==IfElseBodyState ||
mState==IfElseJunkState)
{ {
if (parseIfBody (keyword, loc, scanner)) if (parseIfBody (keyword, loc, scanner))
return true; return true;
@ -230,6 +232,7 @@ namespace Compiler
case IfEndState: mState = IfBodyState; return true; case IfEndState: mState = IfBodyState; return true;
case IfElseifEndState: mState = IfElseifBodyState; return true; case IfElseifEndState: mState = IfElseifBodyState; return true;
case IfElseEndState: mState = IfElseBodyState; return true; case IfElseEndState: mState = IfElseBodyState; return true;
case IfElseJunkState: mState = IfElseBodyState; return true;
case WhileEndState: mState = WhileBodyState; return true; case WhileEndState: mState = WhileBodyState; return true;
@ -247,7 +250,13 @@ namespace Compiler
default: ; default: ;
} }
}
else if (code==Scanner::S_open && mState==IfElseJunkState)
{
SkipParser skip (getErrorHandler(), getContext());
scanner.scan (skip);
mState = IfElseBodyState;
return true;
} }
return Parser::parseSpecial (code, loc, scanner); return Parser::parseSpecial (code, loc, scanner);

3
components/compiler/controlparser.hpp
View file

@ -26,7 +26,8 @@ namespace Compiler
IfElseEndState, IfElseBodyState, IfElseEndState, IfElseBodyState,
IfEndifState, IfEndifState,
WhileEndState, WhileBodyState, WhileEndState, WhileBodyState,
WhileEndwhileState WhileEndwhileState,
IfElseJunkState
}; };
typedef std::vector<Interpreter::Type_Code> Codes; typedef std::vector<Interpreter::Type_Code> Codes;