mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-21 09:39:56 +00:00
Code Issues Projects Releases Wiki Activity

fixed round brackets parsing bug

Browse Source
This commit is contained in:
Marc Zinnschlag 2010-06-30 14:08:59 +02:00
parent ed92ffcf89
commit 73f9436ed9
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/compiler/exprparser.cpp
View File

@ -3,6 +3,7 @@
#include <stdexcept>
#include <cassert>
#include <algorithm>
#include "generator.hpp"
#include "scanner.hpp"
@ -51,6 +52,11 @@ namespace Compiler
return mOperators[mOperators.size()-1];
}
bool ExprParser::isOpen() const
{
return std::find (mOperators.begin(), mOperators.end(), '(')!=mOperators.end();
}
void ExprParser::popOperator()
{
assert (!mOperators.empty());
@ -293,8 +299,15 @@ namespace Compiler
if (code==Scanner::S_close && !mNextOperand)
{
close();
return true;
if (isOpen())
{
close();
return true;
}
mTokenLoc = loc;
scanner.putbackSpecial (code, loc);
return false;
}
if (!mNextOperand)

2
components/compiler/exprparser.hpp
View File

@ -30,6 +30,8 @@ namespace Compiler
char getOperator() const;
bool isOpen() const;
void popOperator();
void popOperand();