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

Script: Check for functions before keywords 

This unifies the lookup for local variables and functions. Its slightly
awkward that global functions can overload if and Par now, but local
variables already could.
liquid_container
Günther Brammer 2016-04-29 23:32:25 +02:00
parent 30f7457d89
commit 7792acdff0
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/script/C4AulParse.cpp
View File

@ -2108,15 +2108,9 @@ void C4AulParse::Parse_Expression(int iParentPrio)
Shift();
}
// check for variable (local)
else if (Host && Host->GetPropList() == Fn->Parent && Host->LocalNamed.GetItemNr(Idtf) != -1)
else if (GetPropertyByS(Fn->Parent, Idtf, val))
{
// insert variable by id
AddBCC(AB_LOCALN, (intptr_t) Strings.RegString(Idtf));
Shift();
}
else if ((!Host || Host->GetPropList() != Fn->Parent) && GetPropertyByS(Fn->Parent, Idtf, val))
{
if (FoundFn = val.getFunction())
if ((FoundFn = val.getFunction()))
{
if (Config.Developer.ExtraWarnings && !FoundFn->GetPublic())
Warn("using deprecated function %s", Idtf);
@ -2220,15 +2214,6 @@ void C4AulParse::Parse_Expression(int iParentPrio)
if (TokenType == ATT_BOPEN)
Parse_Params(C4AUL_MAX_Par, NULL);
}
else if ((FoundFn = Fn->Parent->GetFunc(Idtf)))
{
if (Config.Developer.ExtraWarnings && !FoundFn->GetPublic())
Warn("using deprecated function %s", Idtf);
Shift();
Parse_Params(FoundFn->GetParCount(), FoundFn->GetName(), FoundFn);
AddBCC(AB_FUNC, (intptr_t) FoundFn);
}
// -> func not found
// check for global variables (static) or constants (static const)
// the global namespace has the lowest priority so that local
// functions and variables can overload it