marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace all usages of the old local variables list with properties

liquid_container
Günther Brammer 2016-04-29 23:34:54 +02:00
parent 7792acdff0
commit 9741af42fd
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/script/C4AulParse.cpp
View File

@ -1357,11 +1357,6 @@ void C4AulParse::Parse_Function()
// get next token, must be func name
Check(ATT_IDTF, "function name");
// check: symbol already in use?
if (!is_global)
{
if (Host->LocalNamed.GetItemNr(Idtf) != -1)
throw C4AulParseError(this, "function definition: name already in use (local variable)");
}
if (is_global || !Host->GetPropList())
{
if (Host != pOrgScript)
@ -1379,6 +1374,9 @@ void C4AulParse::Parse_Function()
Parent = Host->GetPropList();
Fn = 0;
C4AulFunc * f = Parent->GetFunc(Idtf);
// check: symbol already in use?
if (!f && Strings.FindString(Idtf) && Parent->HasProperty(Strings.FindString(Idtf)))
throw C4AulParseError(this, "function definition: name already in use (local variable)");
while (f)
{
if (f->SFunc() && f->SFunc()->pOrgScript == pOrgScript && f->Parent == Parent)
@ -2521,6 +2519,7 @@ void C4AulParse::Parse_Local()
while (1)
{
Check(ATT_IDTF, "variable name");
C4RefCntPointer<C4String> key = ::Strings.RegString(Idtf);
if (Type == PREPARSER)
{
// get desired variable name
@ -2528,19 +2527,15 @@ void C4AulParse::Parse_Local()
if (Host->GetPropList() && Host->GetPropList()->GetFunc(Idtf))
throw C4AulParseError(this, "variable definition: name already in use");
// insert variable
Host->LocalNamed.AddName(Idtf);
Host->GetPropList()->SetPropertyByS(key, C4VNull);
}
char Name[C4AUL_MAX_Identifier] = ""; // current identifier
SCopy(Idtf, Name);
Shift();
if (TokenType == ATT_SET)
{
if (!Host->GetPropList())
throw C4AulParseError(this, "local variables can only be initialized on proplists");
Shift();
C4RefCntPointer<C4String> key = ::Strings.RegString(Name);
assert(Host->GetPropList()->IsStatic());
Parse_ConstExpression(Host->GetPropList()->IsStatic(), key);
Parse_ConstExpression(Host->GetPropList(), key);
}
if (TokenType == ATT_SCOLON)
return;
@ -2623,9 +2618,8 @@ C4Value C4AulParse::Parse_ConstExpression(C4PropListStatic * parent, C4String *
r.SetBool(false);
else if (SEqual(Idtf, C4AUL_Nil))
r.Set0();
else if (Host && Host->LocalNamed.GetItemNr(Idtf) != -1)
Host->GetPropList()->GetPropertyByS(::Strings.FindString(Idtf), &r);
else if (!Engine->GetGlobalConstant(Idtf, &r))
else if (!((Host && GetPropertyByS(Host->GetPropList(), Idtf, r)) ||
Engine->GetGlobalConstant(Idtf, &r)))
if (Type == PARSER)
UnexpectedToken("constant value");
Shift();
@ -2845,9 +2839,6 @@ bool C4ScriptHost::Parse()
// definition appends
if (GetPropList() && GetPropList()->GetDef() && (*s)->GetPropList() && (*s)->GetPropList()->GetDef())
GetPropList()->GetDef()->IncludeDefinition((*s)->GetPropList()->GetDef());
// copy local var definitions
for (int ivar = 0; ivar < (*s)->LocalNamed.iSize; ivar ++)
LocalNamed.AddName((*s)->LocalNamed.pNames[ivar]);
}
// parse

2
src/script/C4ScriptHost.cpp
View File

@ -34,7 +34,6 @@ C4ScriptHost::C4ScriptHost():
Script = NULL;
stringTable = 0;
SourceScripts.push_back(this);
LocalNamed.Reset();
// prepare include list
IncludesResolved = false;
Resolving=false;
@ -51,7 +50,6 @@ void C4ScriptHost::Clear()
{
C4ComponentHost::Clear();
Script.Clear();
LocalNamed.Reset();
LocalValues.Clear();
SourceScripts.clear();
SourceScripts.push_back(this);

1
src/script/C4ScriptHost.h
View File

@ -79,7 +79,6 @@ protected:
StdStrBuf Script; // script
C4LangStringTable *stringTable;
C4ValueMapNames LocalNamed;
C4Set<C4Property> LocalValues;
C4AulScriptState State; // script state
friend class C4AulParse;