Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-29 05:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 48

Issue #181: Member variable access in expressions; error reporting fix for the previous commit

Browse source
This commit is contained in:
Marc Zinnschlag 2012-06-16 13:06:23 +02:00
parent 6a89d76321
commit 6c5b21fa42
6 changed files with 70 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

37
components/compiler/exprparser.cpp
View file

@ -195,10 +195,31 @@ namespace Compiler
return parseArguments (arguments, scanner, mCode);
}
bool ExprParser::handleMemberAccess (const std::string& name)
{
mMemberOp = false;
std::string name2 = toLower (name);
std::string id = toLower (mExplicit);
char type = getContext().getMemberType (name2, id);
if (type!=' ')
{
Generator::fetchMember (mCode, mLiterals, type, name2, id);
mNextOperand = false;
mExplicit.clear();
mOperands.push_back (type=='f' ? 'f' : 'l');
return true;
}
return false;
}
ExprParser::ExprParser (ErrorHandler& errorHandler, Context& context, Locals& locals,
Literals& literals, bool argument)
: Parser (errorHandler, context), mLocals (locals), mLiterals (literals),
mNextOperand (true), mFirst (true), mArgument (argument)
mNextOperand (true), mFirst (true), mArgument (argument), mRefOp (false), mMemberOp (false)
{}
bool ExprParser::parseInt (int value, const TokenLoc& loc, Scanner& scanner)
@ -251,7 +272,12 @@ namespace Compiler
Scanner& scanner)
{
if (!mExplicit.empty())
{
if (mMemberOp && handleMemberAccess (name))
return true;
return Parser::parseName (name, loc, scanner);
}
mFirst = false;
@ -281,7 +307,7 @@ namespace Compiler
return true;
}
if (mExplicit.empty() && getContext().isId (name))
if (mExplicit.empty() && getContext().isId (name2))
{
mExplicit = name;
return true;
@ -497,6 +523,12 @@ namespace Compiler
return true;
}
if (!mMemberOp && code==Scanner::S_member)
{
mMemberOp = true;
return true;
}
return Parser::parseSpecial (code, loc, scanner);
}
@ -609,6 +641,7 @@ namespace Compiler
mFirst = true;
mExplicit.clear();
mRefOp = false;
mMemberOp = false;
Parser::reset();
}