mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

allow elseif without matching if (grrrrr)

Browse Source
This commit is contained in:
Marc Zinnschlag 2014-02-02 14:24:58 +01:00
parent 858dc80292
commit cd9b137129
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/compiler/controlparser.cpp
View File

@ -7,6 +7,7 @@
#include "scanner.hpp" #include "scanner.hpp"
#include "generator.hpp" #include "generator.hpp"
#include "errorhandler.hpp"
namespace Compiler namespace Compiler
{ {
@ -186,8 +187,11 @@ namespace Compiler
{ {
if (mState==StartState) if (mState==StartState)
{ {
if (keyword==Scanner::K_if) if (keyword==Scanner::K_if || keyword==Scanner::K_elseif)
{ {
if (keyword==Scanner::K_elseif)
getErrorHandler().warning ("elseif without matching if", loc);
mExprParser.reset(); mExprParser.reset();
scanner.scan (mExprParser); scanner.scan (mExprParser);

2
components/compiler/scriptparser.cpp
View File

@ -32,7 +32,7 @@ namespace Compiler
bool ScriptParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner) bool ScriptParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
{ {
if (keyword==Scanner::K_while || keyword==Scanner::K_if) if (keyword==Scanner::K_while || keyword==Scanner::K_if || keyword==Scanner::K_elseif)
{ {
mControlParser.reset(); mControlParser.reset();
if (mControlParser.parseKeyword (keyword, loc, scanner)) if (mControlParser.parseKeyword (keyword, loc, scanner))