mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-11-04 00:26:45 +00:00
Code Issues Releases Wiki Activity

Issue #181: assignment to member variables

Browse source
This commit is contained in:
Marc Zinnschlag 2012-06-16 14:29:55 +02:00
parent 10b27e582b
commit fe85de5ea7
3 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
components/compiler/lineparser.cpp
View file

@ -113,12 +113,13 @@ namespace Compiler
if (mState==SetState)
{
std::string name2 = toLower (name);
mName = name2;
// local variable?
char type = mLocals.getType (name2);
if (type!=' ')
{
mName = name2;
mType = type;
mState = SetLocalVarState;
return true;
}
@ -126,12 +127,27 @@ namespace Compiler
type = getContext().getGlobalType (name2);
if (type!=' ')
{
mName = name2;
mType = type;
mState = SetGlobalVarState;
return true;
}
mState = SetPotentialMemberVarState;
return true;
}
if (mState==SetMemberVarState)
{
mMemberName = toLower (name);
char type = getContext().getMemberType (mMemberName, mName);
if (type!=' ')
{
mState = SetMemberVarState2;
mType = type;
return true;
}
getErrorHandler().error ("unknown variable", loc);
SkipParser skip (getErrorHandler(), getContext());
scanner.scan (skip);
@ -338,6 +354,19 @@ namespace Compiler
mState = EndState;
return true;
}
else if (mState==SetMemberVarState2 && keyword==Scanner::K_to)
{
mExprParser.reset();
scanner.scan (mExprParser);
std::vector<Interpreter::Type_Code> code;
char type = mExprParser.append (code);
Generator::assignToMember (mCode, mLiterals, mType, mMemberName, mName, code, type);
mState = EndState;
return true;
}
if (mAllowExpression)
{
@ -392,6 +421,12 @@ namespace Compiler
return true;
}
if (code==Scanner::S_member && mState==SetPotentialMemberVarState)
{
mState = SetMemberVarState;
return true;
}
if (mAllowExpression && mState==BeginState &&
(code==Scanner::S_open || code==Scanner::S_minus))
{

4
components/compiler/lineparser.hpp
View file

@ -21,7 +21,8 @@ namespace Compiler
{
BeginState,
ShortState, LongState, FloatState,
SetState, SetLocalVarState, SetGlobalVarState,
SetState, SetLocalVarState, SetGlobalVarState, SetPotentialMemberVarState,
SetMemberVarState, SetMemberVarState2,
MessageState, MessageCommaState, MessageButtonState, MessageButtonCommaState,
EndState,
PotentialExplicitState, ExplicitState, MemberState
@ -32,6 +33,7 @@ namespace Compiler
std::vector<Interpreter::Type_Code>& mCode;
State mState;
std::string mName;
std::string mMemberName;
int mButtons;
std::string mExplicit;
char mType;

4
components/interpreter/localopcodes.hpp
View file

@ -252,9 +252,9 @@ namespace Interpreter
virtual void execute (Runtime& runtime)
{
Type_Integer index = runtime[0].mInteger;
Type_Float data = runtime[0].mFloat;
Type_Integer index = runtime[1].mInteger;
std::string id = runtime.getStringLiteral (index);
Type_Float data = runtime[1].mFloat;
index = runtime[2].mInteger;
std::string variable = runtime.getStringLiteral (index);