libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-05 00:01:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: LINGO: Eliminate Lingo::varCreate

Browse Source 
This function just complicates things.
This commit is contained in:
djsrv 2021-06-15 15:28:57 -04:00 committed by D.J. Servilla
parent e44ff48492
commit a4df3c3d8e
4 changed files with 7 additions and 34 deletions

8
engines/director/lingo/lingo-bytecode.cpp

@ -535,7 +535,9 @@ void LC::cb_globalassign() {
// Lingo lets you declare globals inside a method.
// This doesn't define them in the script list, but you can still
// read and write to them???
g_lingo->varCreate(name, true);
if (!g_lingo->_globalvars.contains(name)) {
g_lingo->_globalvars[name] = Datum();
}
g_lingo->varAssign(target, source, true);
}
@ -979,8 +981,8 @@ ScriptContext *Lingo::compileLingoV4(Common::SeekableReadStreamEndian &stream, L
if (0 <= index && index < (int16)archive->names.size()) {
const char *name = archive->names[index].c_str();
debugC(5, kDebugLoading, "%d: %s", i, name);
if (!_globalvars.contains(name)) {
_globalvars[name] = Datum();
if (!g_lingo->_globalvars.contains(name)) {
g_lingo->_globalvars[name] = Datum();
} else {
warning("Global %d (%s) already defined", i, name);
}

2
engines/director/lingo/lingo-code.cpp

@ -263,7 +263,7 @@ void Lingo::pushContext(const Symbol funcSym, bool allowRetVal, Datum defaultRet
for (int i = symNArgs - 1; i >= 0; i--) {
Common::String name = (*funcSym.argNames)[i];
if (!localvars->contains(name)) {
g_lingo->varCreate(name, false, localvars);
(*localvars)[name] = Datum();
Datum arg(name);
arg.type = VAR;
Datum value = g_lingo->pop();

30
engines/director/lingo/lingo-codegen.cpp

@ -270,39 +270,11 @@ void Lingo::registerMethodVar(const Common::String &name, VarType type) {
if (type == kVarProperty || type == kVarInstance) {
g_lingo->_assemblyContext->_properties[name] = Datum();
} else if (type == kVarGlobal) {
g_lingo->varCreate(name, true);
g_lingo->_globalvars[name] = Datum();
}
}
}
void Lingo::varCreate(const Common::String &name, bool global, DatumHash *localvars) {
if (localvars == nullptr) {
localvars = _localvars;
}
if (localvars && localvars->contains(name)) {
if (global)
warning("varCreate: variable %s is local, not global", name.c_str());
return;
} else if (_currentMe.type == OBJECT && _currentMe.u.obj->hasProp(name)) {
if (global)
warning("varCreate: variable %s is instance or property, not global", name.c_str());
return;
} else if (_globalvars.contains(name)) {
if (!global)
warning("varCreate: variable %s is global, not local", name.c_str());
return;
}
if (global) {
_globalvars[name] = Datum();
_globalvars[name].type = INT;
_globalvars[name].u.i = 0;
} else {
(*localvars)[name] = Datum();
}
}
void Lingo::codeFactory(Common::String &name) {
// FIXME: The factory's context should not be tied to the LingoArchive
// but bytecode needs it to resolve names

1
engines/director/lingo/lingo.h

@ -375,7 +375,6 @@ public:
int codeString(const char *s);
void processIf(int toplabel, int endlabel);
void registerMethodVar(const Common::String &name, VarType type);
void varCreate(const Common::String &name, bool global, DatumHash *localvars = nullptr);
LingoArchive *_assemblyArchive;
ScriptContext *_assemblyContext;