[Scummvm-git-logs] scummvm master -> e79e3632d1f684395e1d7b1c0db3fff3c8278c12
moralrecordings
code at moral.net.au
Sun May 31 07:14:20 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e79e3632d1 DIRECTOR: LINGO: Improve Symbol memory management
Commit: e79e3632d1f684395e1d7b1c0db3fff3c8278c12
https://github.com/scummvm/scummvm/commit/e79e3632d1f684395e1d7b1c0db3fff3c8278c12
Author: Scott Percival (code at moral.net.au)
Date: 2020-05-31T15:09:07+08:00
Commit Message:
DIRECTOR: LINGO: Improve Symbol memory management
Changed paths:
engines/director/lingo/lingo-builtins.cpp
engines/director/lingo/lingo-bytecode.cpp
engines/director/lingo/lingo-code.cpp
engines/director/lingo/lingo-code.h
engines/director/lingo/lingo-codegen.cpp
engines/director/lingo/lingo-lex.cpp
engines/director/lingo/lingo-lex.l
engines/director/lingo/lingo.cpp
engines/director/lingo/lingo.h
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index aba7d541c2..24d4023f1b 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -280,25 +280,28 @@ void Lingo::initBuiltIns() {
if (blt->version > _vm->getVersion())
continue;
- Symbol *sym = new Symbol;
+ Symbol sym;
- sym->name = blt->name;
- sym->type = blt->type;
- sym->nargs = blt->minArgs;
- sym->maxArgs = blt->maxArgs;
- sym->parens = blt->parens;
- sym->u.bltin = blt->func;
+ sym.name = new Common::String(blt->name);
+ sym.type = blt->type;
+ sym.nargs = blt->minArgs;
+ sym.maxArgs = blt->maxArgs;
+ sym.parens = blt->parens;
+ sym.u.bltin = blt->func;
_builtins[blt->name] = sym;
- _functions[(void *)sym->u.s] = new FuncDesc(blt->name, "");
+ _functions[(void *)sym.u.s] = new FuncDesc(blt->name, "");
}
// Set predefined methods
for (const char **b = predefinedMethods; *b; b++) {
- Symbol *s = g_lingo->lookupVar(*b, true, true);
- s->type = SYMBOL;
- s->u.s = new Common::String(*b);
+ Common::String name(*b);
+ Datum target(name);
+ target.type = VAR;
+ Datum source(name);
+ source.type = SYMBOL;
+ g_lingo->varAssign(target, source, true, true);
}
}
@@ -1624,7 +1627,7 @@ Common::String Lingo::genMenuHandler(int *commandId, Common::String &command) {
(*commandId)++;
name = Common::String::format("scummvmMenu%d", *commandId);
- } while (getHandler(name) != NULL);
+ } while (getHandler(name).type != VOID);
return Common::String::format("on %s\n %s\nend %s\n\n", name.c_str(), command.c_str(), name.c_str());
}
@@ -2114,7 +2117,7 @@ void LB::b_factory(int nargs) {
// This is intentionally empty
}
-void Lingo::factoryCall(Common::String &name, int nargs) {
+void Lingo::factoryCall(const Common::String &name, int nargs) {
Common::String s("factoryCall: ");
s += name;
diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index efc47d37d0..45e7042bf7 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -293,9 +293,9 @@ void LC::cb_localcall() {
Datum nargs = g_lingo->pop();
if ((nargs.type == ARGC) || (nargs.type == ARGCNORET)) {
- Symbol *sym = g_lingo->_currentScriptContext->functions[functionId];
+ Symbol sym = g_lingo->_currentScriptContext->functions[functionId];
if (debugChannelSet(3, kDebugLingoExec))
- g_lingo->printSTUBWithArglist(sym->name.c_str(), nargs.u.i, "localcall:");
+ g_lingo->printSTUBWithArglist(sym.name->c_str(), nargs.u.i, "localcall:");
LC::call(sym, nargs.u.i);
@@ -434,23 +434,10 @@ void LC::cb_stackdrop() {
void LC::cb_globalpush() {
int nameId = g_lingo->readInt();
Common::String name = g_lingo->getName(nameId);
- Datum result;
- result.type = VOID;
-
- Symbol *s = g_lingo->lookupVar(name.c_str(), false);
- if (!s) {
- warning("cb_globalpush: variable %s not found", name.c_str());
- g_lingo->push(result);
- return;
- } else if (s && !s->global) {
- warning("cb_globalpush: variable %s is local, not global", name.c_str());
- }
-
- Datum target;
+ Datum target(name);
target.type = VAR;
- target.u.sym = s;
debugC(3, kDebugLingoExec, "cb_globalpush: pushing %s to stack", name.c_str());
- result = g_lingo->varFetch(target);
+ Datum result = g_lingo->varFetch(target, true);
g_lingo->push(result);
}
@@ -458,24 +445,14 @@ void LC::cb_globalpush() {
void LC::cb_globalassign() {
int nameId = g_lingo->readInt();
Common::String name = g_lingo->getName(nameId);
-
- Symbol *s = g_lingo->lookupVar(name.c_str(), false);
- if (!s) {
- // 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???
- s = g_lingo->lookupVar(name.c_str(), true, true);
- }
- if (s && !s->global) {
- warning("cb_globalassign: variable %s is local, not global", name.c_str());
- }
-
- Datum target;
+ Datum target(name);
target.type = VAR;
- target.u.sym = s;
debugC(3, kDebugLingoExec, "cb_globalassign: assigning to %s", name.c_str());
Datum source = g_lingo->pop();
- g_lingo->varAssign(target, source);
+ // 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->varAssign(target, source, true, true);
}
void LC::cb_objectfieldassign() {
@@ -540,23 +517,10 @@ void LC::cb_thepush2() {
void LC::cb_varpush() {
int nameId = g_lingo->readInt();
Common::String name = g_lingo->getName(nameId);
- Datum result;
- result.type = VOID;
-
- Symbol *s = g_lingo->lookupVar(name.c_str(), false);
- if (!s) {
- warning("cb_varpush: variable %s not found", name.c_str());
- g_lingo->push(result);
- return;
- } else if (s && s->global) {
- warning("cb_varpush: variable %s is global, not local", name.c_str());
- }
-
- Datum target;
+ Datum target(name);
target.type = VAR;
- target.u.sym = s;
debugC(3, kDebugLingoExec, "cb_varpush: pushing %s to stack", name.c_str());
- result = g_lingo->varFetch(target);
+ Datum result = g_lingo->varFetch(target, false);
g_lingo->push(result);
}
@@ -564,22 +528,12 @@ void LC::cb_varpush() {
void LC::cb_varassign() {
int nameId = g_lingo->readInt();
Common::String name = g_lingo->getName(nameId);
-
- Symbol *s = g_lingo->lookupVar(name.c_str(), false);
- if (!s) {
- warning("cb_varassign: variable %s not found", name.c_str());
- g_lingo->pop();
- return;
- } else if (s && s->global) {
- warning("cb_varassign: variable %s is global, not local", name.c_str());
- }
-
- Datum target;
+ Datum target(name);
target.type = VAR;
- target.u.sym = s;
debugC(3, kDebugLingoExec, "cb_varassign: assigning to %s", name.c_str());
Datum source = g_lingo->pop();
- g_lingo->varAssign(target, source);
+ // Local variables should be initialised by the script
+ g_lingo->varAssign(target, source, false, false);
}
@@ -809,7 +763,13 @@ void Lingo::addCodeV4(Common::SeekableSubReadStreamEndian &stream, ScriptType ty
if (index < _archives[_archiveIndex].names.size()) {
const char *name = _archives[_archiveIndex].names[index].c_str();
debugC(5, kDebugLoading, "%d: %s", i, name);
- g_lingo->lookupVar(name, true, true);
+ if (!_globalvars.contains(name)) {
+ _globalvars[name] = Symbol();
+ _globalvars[name].name = new Common::String(name);
+ _globalvars[name].global = true;
+ } else {
+ warning("Global %d (%s) already defined", i, name);
+ }
} else {
warning("Global %d has unknown name id %d, skipping define", i, index);
}
@@ -1238,17 +1198,19 @@ void Lingo::addCodeV4(Common::SeekableSubReadStreamEndian &stream, ScriptType ty
}
// Attach to handlers
- Symbol *sym = NULL;
+ Symbol sym;
if (nameIndex < _archives[_archiveIndex].names.size()) {
debugC(5, kDebugLoading, "Function %d binding: %s()", i, _archives[_archiveIndex].names[nameIndex].c_str());
- sym = g_lingo->define(_archives[_archiveIndex].names[nameIndex], argCount, _currentScript);
+ sym = g_lingo->define(_archives[_archiveIndex].names[nameIndex], argCount, _currentScript, argNames, varNames);
} else {
warning("Function has unknown name id %d, skipping define", nameIndex);
- sym = new Symbol;
- sym->type = HANDLER;
- sym->u.defn = _currentScript;
- sym->nargs = argCount;
- sym->maxArgs = argCount;
+ sym.name = new Common::String();
+ sym.type = HANDLER;
+ sym.u.defn = _currentScript;
+ sym.nargs = argCount;
+ sym.maxArgs = argCount;
+ sym.argNames = argNames;
+ sym.varNames = varNames;
}
if (!skipdump && ConfMan.getBool("dump_scripts")) {
@@ -1266,10 +1228,6 @@ void Lingo::addCodeV4(Common::SeekableSubReadStreamEndian &stream, ScriptType ty
out.writeString(Common::String::format("<end code>\n\n"));
}
- sym->argNames = argNames;
- sym->varNames = varNames;
- sym->ctx = _currentScriptContext;
- sym->archiveIndex = _archiveIndex;
_currentScriptContext->functions.push_back(sym);
}
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 85ad346c2d..0e28967594 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -221,13 +221,13 @@ void LC::c_printtop(void) {
warning(g_lingo->_floatPrecisionFormat.c_str(), d.u.f);
break;
case VAR:
- if (!d.u.sym) {
+ if (!d.u.s) {
warning("Inconsistent stack: var, val: %d", d.u.i);
} else {
- if (!d.u.sym->name.empty())
- warning("var: %s", d.u.sym->name.c_str());
+ if (!d.u.s->empty())
+ warning("var: %s", d.u.s->c_str());
else
- warning("Nameless var. val: %d", d.u.sym->u.i);
+ warning("Nameless var");
}
break;
case STRING:
@@ -362,25 +362,27 @@ void LC::c_varpush() {
warning("c_varpush: ANCESTOR");
}
- if (g_lingo->getHandler(name) != NULL) {
+ // Looking for the cast member constants
+ if (g_director->getVersion() < 4) { // TODO: There could be a flag 'Allow Outdated Lingo' in Movie Info in D4
+ int val = castNumToNum(name.c_str());
+
+ if (val != -1) {
+ d.type = INT;
+ d.u.i = val;
+ g_lingo->push(d);
+ return;
+ }
+ }
+
+ if (g_lingo->getHandler(name).type != VOID) {
d.type = HANDLER;
d.u.s = new Common::String(name);
g_lingo->push(d);
return;
}
- d.u.sym = g_lingo->lookupVar(name.c_str());
- if (d.u.sym->type == CASTREF) {
- d.type = INT;
- int val = d.u.sym->u.i;
-
- delete d.u.sym;
-
- d.u.i = val;
- } else {
- d.type = VAR;
- }
-
+ d.type = VAR;
+ d.u.s = new Common::String(name);
g_lingo->push(d);
}
@@ -396,19 +398,6 @@ void LC::c_assign() {
g_lingo->varAssign(d1, d2);
}
-bool LC::verify(Symbol *s) {
- if (s->type != INT && s->type != VOID && s->type != FLOAT && s->type != STRING && s->type != POINT && s->type != SYMBOL && s->type != ARRAY && s->type != PARRAY) {
- warning("attempt to evaluate non-variable '%s'", s->name.c_str());
-
- return false;
- }
-
- if (s->type == VOID)
- warning("Variable used before assigning a value '%s'", s->name.c_str());
-
- return true;
-}
-
void LC::c_eval() {
LC::c_varpush();
@@ -426,9 +415,6 @@ void LC::c_eval() {
return;
}
- if (!LC::verify(d.u.sym))
- return;
-
d = g_lingo->varFetch(d);
g_lingo->push(d);
@@ -1183,15 +1169,15 @@ void LC::c_whencode() {
int entity = g_lingo->_currentEntityId;
g_lingo->_currentEntityId = 0;
- Symbol *sym = g_lingo->define(eventname, start, 0, NULL, end, false); // Redefine, but not remove code
+ Symbol sym = g_lingo->define(eventname, start, 0, NULL, end, false); // Redefine, but not remove code
g_lingo->_currentEntityId = entity;
if (debugChannelSet(1, kDebugLingoExec)) {
uint pc = 0;
- while (pc < sym->u.defn->size()) {
+ while (pc < sym.u.defn->size()) {
uint spc = pc;
- Common::String instr = g_lingo->decodeInstruction(sym->u.defn, pc, &pc);
+ Common::String instr = g_lingo->decodeInstruction(sym.u.defn, pc, &pc);
debugC(1, kDebugLingoExec, "[%5d] %s", spc, instr.c_str());
}
}
@@ -1268,37 +1254,40 @@ void LC::c_call() {
LC::call(name, nargs);
}
-void LC::call(Common::String name, int nargs) {
+void LC::call(const Common::String &name, int nargs) {
if (debugChannelSet(3, kDebugLingoExec))
g_lingo->printSTUBWithArglist(name.c_str(), nargs, "call:");
- Symbol *sym = g_lingo->getHandler(name);
+ Symbol sym = g_lingo->getHandler(name);
if (!g_lingo->_eventHandlerTypeIds.contains(name)) {
- Symbol *s = g_lingo->lookupVar(name.c_str(), false);
- if (s && s->type == OBJECT) {
- debugC(3, kDebugLingoExec, "Dereferencing object reference: %s to %s", name.c_str(), s->u.s->c_str());
- name = *s->u.s;
- sym = g_lingo->getHandler(name);
+ if ((*g_lingo->_localvars).contains(name)) {
+ Datum eventName(name);
+ eventName.type = VAR;
+ Datum d = g_lingo->varFetch(eventName);
+ if (d.type == OBJECT) {
+ debugC(3, kDebugLingoExec, "Dereferencing object reference: %s to %s", name.c_str(), d.u.s->c_str());
+ sym = g_lingo->getHandler(*d.u.s);
+ }
}
}
call(sym, nargs);
}
-void LC::call(Symbol *sym, int nargs) {
+void LC::call(const Symbol &sym, int nargs) {
bool dropArgs = false;
- if (sym == NULL) {
+ if (sym.type == VOID) {
warning("Call to undefined handler. Dropping %d stack items", nargs);
dropArgs = true;
} else {
- if ((sym->type == BLTIN || sym->type == FBLTIN || sym->type == RBLTIN)
- && sym->nargs != -1 && sym->nargs != nargs && sym->maxArgs != nargs) {
- if (sym->nargs == sym->maxArgs)
- warning("Incorrect number of arguments to handler '%s', expecting %d. Dropping %d stack items", sym->name.c_str(), sym->nargs, nargs);
+ if ((sym.type == BLTIN || sym.type == FBLTIN || sym.type == RBLTIN)
+ && sym.nargs != -1 && sym.nargs != nargs && sym.maxArgs != nargs) {
+ if (sym.nargs == sym.maxArgs)
+ warning("Incorrect number of arguments to handler '%s', expecting %d. Dropping %d stack items", sym.name->c_str(), sym.nargs, nargs);
else
- warning("Incorrect number of arguments to handler '%s', expecting %d or %d. Dropping %d stack items", sym->name.c_str(), sym->nargs, sym->maxArgs, nargs);
+ warning("Incorrect number of arguments to handler '%s', expecting %d or %d. Dropping %d stack items", sym.name->c_str(), sym.nargs, sym.maxArgs, nargs);
dropArgs = true;
}
@@ -1314,36 +1303,36 @@ void LC::call(Symbol *sym, int nargs) {
return;
}
- if (sym->nargs != -1 && sym->maxArgs < nargs) {
+ if (sym.nargs != -1 && sym.maxArgs < nargs) {
warning("Incorrect number of arguments for function %s (%d, expected %d to %d). Dropping extra %d",
- sym->name.c_str(), nargs, sym->nargs, sym->maxArgs, nargs - sym->nargs);
- for (int i = 0; i < nargs - sym->maxArgs; i++)
+ sym.name->c_str(), nargs, sym.nargs, sym.maxArgs, nargs - sym.nargs);
+ for (int i = 0; i < nargs - sym.maxArgs; i++)
g_lingo->pop();
}
- if (sym->type == BLTIN || sym->type == FBLTIN || sym->type == RBLTIN) {
- if (sym->u.bltin == LB::b_factory) {
- g_lingo->factoryCall(sym->name, nargs);
+ if (sym.type == BLTIN || sym.type == FBLTIN || sym.type == RBLTIN) {
+ if (sym.u.bltin == LB::b_factory) {
+ g_lingo->factoryCall(*sym.name, nargs);
} else {
int stackSize = g_lingo->_stack.size() - nargs;
- (*sym->u.bltin)(nargs);
+ (*sym.u.bltin)(nargs);
int stackNewSize = g_lingo->_stack.size();
- if (sym->type == FBLTIN || sym->type == RBLTIN) {
+ if (sym.type == FBLTIN || sym.type == RBLTIN) {
if (stackNewSize - stackSize != 1)
- warning("built-in function %s did not return value", sym->name.c_str());
+ warning("built-in function %s did not return value", sym.name->c_str());
} else {
if (stackNewSize - stackSize != 0)
- warning("built-in procedure %s returned extra %d values", sym->name.c_str(), stackNewSize - stackSize);
+ warning("built-in procedure %s returned extra %d values", sym.name->c_str(), stackNewSize - stackSize);
}
}
return;
}
- for (int i = nargs; i < sym->nargs; i++) {
+ for (int i = nargs; i < sym.nargs; i++) {
Datum d;
d.u.s = NULL;
@@ -1354,7 +1343,6 @@ void LC::call(Symbol *sym, int nargs) {
debugC(5, kDebugLingoExec, "Pushing frame %d", g_lingo->_callstack.size() + 1);
CFrame *fp = new CFrame;
- fp->sp = sym;
fp->retpc = g_lingo->_pc;
fp->retscript = g_lingo->_currentScript;
fp->retctx = g_lingo->_currentScriptContext;
@@ -1363,55 +1351,55 @@ void LC::call(Symbol *sym, int nargs) {
// Create new set of local variables
g_lingo->_localvars = new SymbolHash;
- if (sym->argNames) {
-
- if ((int)sym->argNames->size() < sym->nargs) {
- int dropSize = sym->nargs - sym->argNames->size();
- warning("%d arg names defined for %d args! Dropping the last %d values", sym->argNames->size(), sym->nargs, dropSize);
+ if (sym.argNames) {
+ int symNArgs = sym.nargs;
+ if ((int)sym.argNames->size() < symNArgs) {
+ int dropSize = symNArgs - sym.argNames->size();
+ warning("%d arg names defined for %d args! Dropping the last %d values", sym.argNames->size(), symNArgs, dropSize);
for (int i = 0; i < dropSize; i++) {
g_lingo->pop();
- sym->nargs -= 1;
+ symNArgs -= 1;
}
- } else if ((int)sym->argNames->size() > sym->nargs) {
- warning("%d arg names defined for %d args! Ignoring the last %d names", sym->argNames->size(), sym->nargs, sym->argNames->size() - sym->nargs);
+ } else if ((int)sym.argNames->size() > symNArgs) {
+ warning("%d arg names defined for %d args! Ignoring the last %d names", sym.argNames->size(), symNArgs, sym.argNames->size() - symNArgs);
}
- for (int i = sym->nargs - 1; i >= 0; i--) {
- Common::String name = (*sym->argNames)[i];
+ for (int i = symNArgs - 1; i >= 0; i--) {
+ Common::String name = (*sym.argNames)[i];
if (!g_lingo->_localvars->contains(name)) {
- Datum arg;
+ Datum arg(name);
arg.type = VAR;
- arg.u.sym = g_lingo->lookupVar(name.c_str(), true, false);
Datum value = g_lingo->pop();
- g_lingo->varAssign(arg, value);
+ g_lingo->varAssign(arg, value, true);
} else {
warning("Argument %s already defined", name.c_str());
}
}
}
- if (sym->varNames) {
- for (Common::Array<Common::String>::iterator it = sym->varNames->begin(); it != sym->varNames->end(); ++it) {
+ if (sym.varNames) {
+ for (Common::Array<Common::String>::iterator it = sym.varNames->begin(); it != sym.varNames->end(); ++it) {
Common::String name = *it;
if (!g_lingo->_localvars->contains(name)) {
- g_lingo->lookupVar(name.c_str(), true, false);
+ (*g_lingo->_localvars)[name] = Symbol();
+ (*g_lingo->_localvars)[name].name = new Common::String(name);
} else {
warning("Variable %s already defined", name.c_str());
}
}
}
+ fp->sp = sym;
+
g_lingo->_callstack.push_back(fp);
if (debugChannelSet(5, kDebugLingoExec)) {
g_lingo->printCallStack(0);
}
- g_lingo->_currentScript = sym->u.defn;
- if (sym->ctx) {
- g_lingo->_currentScriptContext = sym->ctx;
- }
- if (sym->archiveIndex) {
- g_lingo->_archiveIndex = sym->archiveIndex;
+ g_lingo->_currentScript = sym.u.defn;
+ if (sym.ctx) {
+ g_lingo->_currentScriptContext = sym.ctx;
}
+ g_lingo->_archiveIndex = sym.archiveIndex;
g_lingo->_pc = 0;
}
@@ -1454,13 +1442,11 @@ void LC::c_procret() {
void LC::c_global() {
Common::String name(g_lingo->readString());
- Symbol *s = g_lingo->lookupVar(name.c_str(), false);
- if (s && !s->global) {
- warning("Local variable %s declared as global", name.c_str());
+ if (!g_lingo->_globalvars.contains(name)) {
+ g_lingo->_globalvars[name] = Symbol();
+ g_lingo->_globalvars[name].name = new Common::String(name);
+ g_lingo->_globalvars[name].global = true;
}
-
- s = g_lingo->lookupVar(name.c_str(), true, true);
- s->global = true;
}
void LC::c_property() {
diff --git a/engines/director/lingo/lingo-code.h b/engines/director/lingo/lingo-code.h
index 2e954211b9..8d14a219d7 100644
--- a/engines/director/lingo/lingo-code.h
+++ b/engines/director/lingo/lingo-code.h
@@ -78,7 +78,7 @@ namespace LC {
void c_arraypush();
void c_proparraypush();
void c_assign();
- bool verify(Symbol *s);
+ bool verify(const Symbol &s);
void c_eval();
void c_setImmediate();
@@ -115,8 +115,8 @@ namespace LC {
void c_jumpifz();
void c_call();
- void call(Symbol *, int nargs);
- void call(Common::String name, int nargs);
+ void call(const Symbol &sym, int nargs);
+ void call(const Common::String &name, int nargs);
void c_procret();
diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index d42c3e3632..f49fccc6ed 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -110,9 +110,9 @@ void Lingo::printCallStack(uint pc) {
if (i < (int)g_lingo->_callstack.size() - 1)
framePc = g_lingo->_callstack[i + 1]->retpc;
- if (frame->sp) {
+ if (frame->sp.type != VOID) {
debugC(5, kDebugLingoExec, "#%d %s:%d", i + 1,
- g_lingo->_callstack[i]->sp->name.c_str(),
+ g_lingo->_callstack[i]->sp.name->c_str(),
framePc
);
} else {
@@ -210,120 +210,53 @@ Common::String Lingo::decodeInstruction(ScriptData *sd, uint pc, uint *newPc) {
return res;
}
-Symbol *Lingo::lookupVar(const char *name, bool create, bool putInGlobalList) {
- Symbol *sym = nullptr;
-
- // Looking for the cast member constants
- if (_vm->getVersion() < 4) { // TODO: There could be a flag 'Allow Outdated Lingo' in Movie Info in D4
- int val = castNumToNum(name);
-
- if (val != -1) {
- if (!create)
- error("Cast reference used in wrong context: %s", name);
-
- sym = new Symbol;
-
- sym->type = CASTREF;
- sym->u.i = val;
-
- return sym;
- }
- }
-
- if (!_localvars || !_localvars->contains(name)) { // Create variable if it was not defined
- // Check if it is a global symbol
- if (_globalvars.contains(name))
- return _globalvars[name];
-
- if (!create)
- return NULL;
-
- sym = new Symbol;
- sym->name = name;
- sym->type = VOID;
- sym->u.i = 0;
-
- if (!putInGlobalList) {
- if (_localvars)
- (*_localvars)[name] = sym;
-
- } else {
- sym->global = true;
- _globalvars[name] = sym;
- }
- } else {
- sym = (*_localvars)[name];
-
- if (sym->global)
- sym = _globalvars[name];
- }
-
- return sym;
-}
-
void Lingo::cleanLocalVars() {
// Clean up current scope local variables and clean up memory
debugC(3, kDebugLingoExec, "cleanLocalVars: have %d vars", _localvars->size());
- for (SymbolHash::const_iterator h = _localvars->begin(); h != _localvars->end(); ++h) {
- if (!h->_value->global) {
- delete h->_value;
- }
- }
-
+ g_lingo->_localvars->clear();
delete g_lingo->_localvars;
- g_lingo->_localvars = 0;
+ g_lingo->_localvars = nullptr;
}
-Symbol *Lingo::define(Common::String &name, int nargs, ScriptData *code) {
- Symbol *sym = getHandler(name);
- if (sym == NULL) { // Create variable if it was not defined
- sym = new Symbol;
-
- sym->name = name;
- sym->type = HANDLER;
-
- if (!_eventHandlerTypeIds.contains(name)) {
- _archives[_archiveIndex].functionHandlers[name] = sym;
- } else {
- _archives[_archiveIndex].eventHandlers[ENTITY_INDEX(_eventHandlerTypeIds[name.c_str()], _currentEntityId)] = sym;
- }
- } else {
- // we don't want to be here. The getHandler call should have used the EntityId and the result
- // should have been unique!
- warning("Redefining handler '%s'", name.c_str());
-
- // Do not attempt to remove code from built-ins
- sym->reset();
- sym->refCount = new int;
- *sym->refCount = 1;
- sym->type = HANDLER;
- }
-
- sym->u.defn = code;
- sym->nargs = nargs;
- sym->maxArgs = nargs;
+Symbol Lingo::define(Common::String &name, int nargs, ScriptData *code, Common::Array<Common::String> *argNames, Common::Array<Common::String> *varNames) {
+ Symbol sym;
+ sym.name = new Common::String(name);
+ sym.type = HANDLER;
+ sym.u.defn = code;
+ sym.nargs = nargs;
+ sym.maxArgs = nargs;
// TODO: Assign these properties from here
- sym->argNames = NULL;
- sym->varNames = NULL;
- sym->ctx = NULL;
- sym->archiveIndex = _archiveIndex;
+ sym.argNames = argNames;
+ sym.varNames = varNames;
+ sym.ctx = _currentScriptContext;
+ sym.archiveIndex = _archiveIndex;
if (debugChannelSet(1, kDebugLingoCompile)) {
uint pc = 0;
- while (pc < sym->u.defn->size()) {
+ while (pc < sym.u.defn->size()) {
uint spc = pc;
- Common::String instr = g_lingo->decodeInstruction(sym->u.defn, pc, &pc);
+ Common::String instr = g_lingo->decodeInstruction(sym.u.defn, pc, &pc);
debugC(1, kDebugLingoCompile, "[%5d] %s", spc, instr.c_str());
}
debugC(1, kDebugLingoCompile, "<end define code>");
}
+ Symbol existing = getHandler(name);
+ if (existing.type != VOID)
+ warning("Redefining handler '%s'", name.c_str());
+
+ if (!_eventHandlerTypeIds.contains(name)) {
+ _archives[_archiveIndex].functionHandlers[name] = sym;
+ } else {
+ _archives[_archiveIndex].eventHandlers[ENTITY_INDEX(_eventHandlerTypeIds[name.c_str()], _currentEntityId)] = sym;
+ }
+
return sym;
}
-Symbol *Lingo::define(Common::String &name, int start, int nargs, Common::String *prefix, int end, bool removeCode) {
+Symbol Lingo::define(Common::String &name, int start, int nargs, Common::String *prefix, int end, bool removeCode) {
if (prefix)
name = *prefix + "-" + name;
@@ -335,7 +268,7 @@ Symbol *Lingo::define(Common::String &name, int start, int nargs, Common::String
end = _currentScript->size();
ScriptData *code = new ScriptData(&(*_currentScript)[start], end - start);
- Symbol *sym = define(name, nargs, code);
+ Symbol sym = define(name, nargs, code);
// Now remove all defined code from the _currentScript
if (removeCode)
@@ -521,44 +454,63 @@ int Lingo::castIdFetch(Datum &var) {
return id;
}
-void Lingo::varAssign(Datum &var, Datum &value) {
+void Lingo::varAssign(Datum &var, Datum &value, bool create, bool global) {
if (var.type != VAR && var.type != REFERENCE) {
warning("varAssign: assignment to non-variable");
return;
}
if (var.type == VAR) {
- Symbol *sym = var.u.sym;
+ Symbol *sym = nullptr;
+ Common::String name = *var.u.s;
+
+ if (_localvars && _localvars->contains(name)) {
+ sym = &(*_localvars)[name];
+ if (global)
+ warning("varAssign: variable %s is local, not global", name.c_str());
+ } else if (_globalvars.contains(name)) {
+ sym = &_globalvars[name];
+ if (!global)
+ warning("varAssign: variable %s is global, not local", name.c_str());
+ }
+
if (!sym) {
- warning("varAssign: symbol not defined");
- return;
+ if (create) {;
+ if (global) {
+ _globalvars[name] = Symbol();
+ sym = &_globalvars[name];
+ } else {
+ (*_localvars)[name] = Symbol();
+ sym = &(*_localvars)[name];
+ }
+ } else {
+ warning("varAssign: variable %s not defined", name.c_str());
+ return;
+ }
}
if (sym->type != INT && sym->type != VOID &&
sym->type != FLOAT && sym->type != STRING &&
sym->type != ARRAY && sym->type != PARRAY) {
- warning("varAssign: assignment to non-variable '%s'", sym->name.c_str());
+ warning("varAssign: assignment to non-variable '%s'", sym->name->c_str());
return;
}
sym->reset();
sym->refCount = value.refCount;
*sym->refCount += 1;
+ sym->name = new Common::String(name);
sym->type = value.type;
if (value.type == INT) {
sym->u.i = value.u.i;
} else if (value.type == FLOAT) {
sym->u.f = value.u.f;
- } else if (value.type == STRING) {
+ } else if (value.type == STRING || value.type == SYMBOL || value.type == OBJECT) {
sym->u.s = value.u.s;
} else if (value.type == POINT || value.type == ARRAY) {
sym->u.farr = value.u.farr;
} else if (value.type == PARRAY) {
sym->u.parr = value.u.parr;
- } else if (value.type == SYMBOL) {
- sym->u.s = value.u.s;
- } else if (value.type == OBJECT) {
- sym->u.s = value.u.s;
} else if (value.type == VOID) {
sym->u.i = 0;
} else {
@@ -588,7 +540,7 @@ void Lingo::varAssign(Datum &var, Datum &value) {
}
}
-Datum Lingo::varFetch(Datum &var) {
+Datum Lingo::varFetch(Datum &var, bool global) {
Datum result;
result.type = VOID;
if (var.type != VAR && var.type != REFERENCE) {
@@ -597,9 +549,21 @@ Datum Lingo::varFetch(Datum &var) {
}
if (var.type == VAR) {
- Symbol *sym = var.u.sym;
+ Symbol *sym = nullptr;
+ Common::String name = *var.u.s;
+
+ if (_localvars && _localvars->contains(name)) {
+ sym = &(*_localvars)[name];
+ if (global)
+ warning("varFetch: variable %s is local, not global", sym->name->c_str());
+ } else if (_globalvars.contains(name)) {
+ sym = &_globalvars[name];
+ if (!global)
+ warning("varFetch: variable %s is global, not local", sym->name->c_str());
+ }
+
if (!sym) {
- warning("varFetch: symbol not defined");
+ warning("varFetch: variable %s not found", name.c_str());
return result;
}
@@ -612,18 +576,14 @@ Datum Lingo::varFetch(Datum &var) {
result.u.i = sym->u.i;
else if (sym->type == FLOAT)
result.u.f = sym->u.f;
- else if (sym->type == STRING)
+ else if (sym->type == STRING || sym->type == SYMBOL || sym->type == OBJECT)
result.u.s = sym->u.s;
- else if (sym->type == POINT)
- result.u.farr = sym->u.farr;
- else if (sym->type == SYMBOL)
- result.u.s = var.u.sym->u.s;
- else if (sym->type == VOID)
- result.u.i = 0;
- else if (sym->type == ARRAY)
+ else if (sym->type == POINT || sym->type == ARRAY)
result.u.farr = sym->u.farr;
else if (sym->type == PARRAY)
result.u.parr = sym->u.parr;
+ else if (sym->type == VOID)
+ result.u.i = 0;
else {
warning("varFetch: unhandled type: %s", var.type2str());
result.type = VOID;
@@ -653,14 +613,14 @@ Datum Lingo::varFetch(Datum &var) {
void Lingo::codeFactory(Common::String &name) {
_currentFactory = name;
- Symbol *sym = new Symbol;
+ Symbol sym;
- sym->name = name;
- sym->type = BLTIN;
- sym->nargs = -1;
- sym->maxArgs = 0;
- sym->parens = true;
- sym->u.bltin = LB::b_factory;
+ sym.name = new Common::String(name);
+ sym.type = BLTIN;
+ sym.nargs = -1;
+ sym.maxArgs = 0;
+ sym.parens = true;
+ sym.u.bltin = LB::b_factory;
_archives[_archiveIndex].eventHandlers[ENTITY_INDEX(_eventHandlerTypeIds[name.c_str()], _currentEntityId)] = sym;
}
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index a3d94077ec..ce3cd88d5f 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -1,6 +1,6 @@
-#line 2 "engines/director/lingo/lingo-lex.cpp"
+#line 1 "engines/director/lingo/lingo-lex.cpp"
-#line 4 "engines/director/lingo/lingo-lex.cpp"
+#line 3 "engines/director/lingo/lingo-lex.cpp"
#define YY_INT_ALIGNED short int
@@ -8,8 +8,8 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_SUBMINOR_VERSION 4
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -47,7 +47,6 @@ typedef int16_t flex_int16_t;
typedef uint16_t flex_uint16_t;
typedef int32_t flex_int32_t;
typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
#else
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
@@ -55,7 +54,6 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -86,63 +84,61 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else /* ! __cplusplus */
+#ifndef SIZE_MAX
+#define SIZE_MAX (~(size_t)0)
+#endif
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
+#endif /* ! C99 */
-#define YY_USE_CONST
+#endif /* ! FLEXINT_H */
-#endif /* defined (__STDC__) */
-#endif /* ! __cplusplus */
+/* begin standard C++ headers. */
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
#define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
#else
-#define yyconst
+#define yynoreturn
#endif
/* Returned upon end-of-file. */
#define YY_NULL 0
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index. If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
+/* Promotes a possibly negative, possibly signed char to an
+ * integer in range [0..255] for use as an array index.
*/
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
/* Enter a start condition. This macro really ought to take a parameter,
* but we do it the disgusting crufty way forced on us by the ()-less
* definition of BEGIN.
*/
#define BEGIN (yy_start) = 1 + 2 *
-
/* Translate the current start state into a value that can be later handed
* to BEGIN to return to the state. The YYSTATE alias is for lex
* compatibility.
*/
#define YY_START (((yy_start) - 1) / 2)
#define YYSTATE YY_START
-
/* Action number for EOF rule of a given start state. */
#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin )
-
+#define YY_NEW_FILE yyrestart( yyin )
#define YY_END_OF_BUFFER_CHAR 0
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -159,15 +155,16 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
typedef size_t yy_size_t;
#endif
-extern yy_size_t yyleng;
+extern int yyleng;
extern FILE *yyin, *yyout;
#define EOB_ACT_CONTINUE_SCAN 0
#define EOB_ACT_END_OF_FILE 1
#define EOB_ACT_LAST_MATCH 2
-
+
#define YY_LESS_LINENO(n)
+ #define YY_LINENO_REWIND_TO(ptr)
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
@@ -182,7 +179,6 @@ extern FILE *yyin, *yyout;
YY_DO_BEFORE_ACTION; /* set up yytext again */ \
} \
while ( 0 )
-
#define unput(c) yyunput( c, (yytext_ptr) )
#ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -197,12 +193,12 @@ struct yy_buffer_state
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
- yy_size_t yy_buf_size;
+ int yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- yy_size_t yy_n_chars;
+ int yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -225,7 +221,7 @@ struct yy_buffer_state
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
-
+
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
@@ -253,7 +249,7 @@ struct yy_buffer_state
/* Stack of input buffers. */
static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
/* We provide macros for accessing buffer states in case in the
* future we want to put the buffer states in a more general
@@ -264,7 +260,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
? (yy_buffer_stack)[(yy_buffer_stack_top)] \
: NULL)
-
/* Same as previous macro, but useful when we know that the buffer stack is not
* NULL or when we need an lvalue. For internal use only.
*/
@@ -272,11 +267,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when yytext is formed. */
static char yy_hold_char;
-static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
-yy_size_t yyleng;
+static int yy_n_chars; /* number of characters read into yy_ch_buf */
+int yyleng;
/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
+static char *yy_c_buf_p = NULL;
static int yy_init = 0; /* whether we need to initialize */
static int yy_start = 0; /* start state number */
@@ -285,85 +280,81 @@ static int yy_start = 0; /* start state number */
*/
static int yy_did_buffer_switch_on_eof;
-void yyrestart (FILE *input_file );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size );
-void yy_delete_buffer (YY_BUFFER_STATE b );
-void yy_flush_buffer (YY_BUFFER_STATE b );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file );
+void yyrestart ( FILE *input_file );
+void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size );
+void yy_delete_buffer ( YY_BUFFER_STATE b );
+void yy_flush_buffer ( YY_BUFFER_STATE b );
+void yypush_buffer_state ( YY_BUFFER_STATE new_buffer );
+void yypop_buffer_state ( void );
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+static void yyensure_buffer_stack ( void );
+static void yy_load_buffer_state ( void );
+static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file );
+#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len );
+YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size );
+YY_BUFFER_STATE yy_scan_string ( const char *yy_str );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len );
-void *yyalloc (yy_size_t );
-void *yyrealloc (void *,yy_size_t );
-void yyfree (void * );
+void *yyalloc ( yy_size_t );
+void *yyrealloc ( void *, yy_size_t );
+void yyfree ( void * );
#define yy_new_buffer yy_create_buffer
-
#define yy_set_interactive(is_interactive) \
{ \
if ( ! YY_CURRENT_BUFFER ){ \
yyensure_buffer_stack (); \
YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer(yyin,YY_BUF_SIZE ); \
+ yy_create_buffer( yyin, YY_BUF_SIZE ); \
} \
YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
}
-
#define yy_set_bol(at_bol) \
{ \
if ( ! YY_CURRENT_BUFFER ){\
yyensure_buffer_stack (); \
YY_CURRENT_BUFFER_LVALUE = \
- yy_create_buffer(yyin,YY_BUF_SIZE ); \
+ yy_create_buffer( yyin, YY_BUF_SIZE ); \
} \
YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
}
-
#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
/* Begin user sect3 */
-#define yywrap(n) 1
+#define yywrap() (/*CONSTCOND*/1)
#define YY_SKIP_YYWRAP
+typedef flex_uint8_t YY_CHAR;
-typedef unsigned char YY_CHAR;
-
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+FILE *yyin = NULL, *yyout = NULL;
typedef int yy_state_type;
extern int yylineno;
-
int yylineno = 1;
extern char *yytext;
+#ifdef yytext_ptr
+#undef yytext_ptr
+#endif
#define yytext_ptr yytext
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[] );
+static yy_state_type yy_get_previous_state ( void );
+static yy_state_type yy_try_NUL_trans ( yy_state_type current_state );
+static int yy_get_next_buffer ( void );
+static void yynoreturn yy_fatal_error ( const char* msg );
/* Done after the current pattern has been matched and before the
* corresponding action - sets up yytext.
*/
#define YY_DO_BEFORE_ACTION \
(yytext_ptr) = yy_bp; \
- yyleng = (yy_size_t) (yy_cp - yy_bp); \
+ yyleng = (int) (yy_cp - yy_bp); \
(yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-
#define YY_NUM_RULES 70
#define YY_END_OF_BUFFER 71
/* This struct is not used in this scanner,
@@ -373,7 +364,7 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[300] =
+static const flex_int16_t yy_accept[300] =
{ 0,
0, 0, 71, 69, 1, 67, 67, 69, 69, 66,
66, 65, 66, 62, 66, 63, 63, 63, 63, 63,
@@ -410,7 +401,7 @@ static yyconst flex_int16_t yy_accept[300] =
} ;
-static yyconst flex_int32_t yy_ec[256] =
+static const YY_CHAR yy_ec[256] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 1, 4, 1, 1, 1, 1, 1, 1, 1,
@@ -442,7 +433,7 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[60] =
+static const YY_CHAR yy_meta[60] =
{ 0,
1, 2, 3, 3, 1, 1, 1, 1, 1, 4,
1, 1, 1, 5, 5, 5, 5, 5, 5, 5,
@@ -452,7 +443,7 @@ static yyconst flex_int32_t yy_meta[60] =
5, 5, 5, 5, 5, 5, 5, 5, 5
} ;
-static yyconst flex_int16_t yy_base[314] =
+static const flex_int16_t yy_base[314] =
{ 0,
0, 58, 595, 664, 59, 664, 664, 588, 0, 664,
584, 55, 54, 664, 579, 49, 51, 49, 45, 55,
@@ -491,7 +482,7 @@ static yyconst flex_int16_t yy_base[314] =
647, 652, 657
} ;
-static yyconst flex_int16_t yy_def[314] =
+static const flex_int16_t yy_def[314] =
{ 0,
299, 1, 299, 299, 299, 299, 299, 300, 301, 299,
299, 299, 299, 299, 299, 302, 302, 302, 302, 302,
@@ -530,7 +521,7 @@ static yyconst flex_int16_t yy_def[314] =
299, 299, 299
} ;
-static yyconst flex_int16_t yy_nxt[724] =
+static const flex_int16_t yy_nxt[724] =
{ 0,
4, 5, 6, 7, 8, 9, 10, 11, 4, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
@@ -614,7 +605,7 @@ static yyconst flex_int16_t yy_nxt[724] =
299, 299, 299
} ;
-static yyconst flex_int16_t yy_chk[724] =
+static const flex_int16_t yy_chk[724] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -810,7 +801,8 @@ static int varCheck(int token, const char *name) {
return token;
}
-#line 814 "engines/director/lingo/lingo-lex.cpp"
+#line 804 "engines/director/lingo/lingo-lex.cpp"
+#line 805 "engines/director/lingo/lingo-lex.cpp"
#define INITIAL 0
@@ -826,36 +818,36 @@ static int varCheck(int token, const char *name) {
#define YY_EXTRA_TYPE void *
#endif
-static int yy_init_globals (void );
+static int yy_init_globals ( void );
/* Accessor methods to globals.
These are made visible to non-reentrant scanners for convenience. */
-int yylex_destroy (void );
+int yylex_destroy ( void );
-int yyget_debug (void );
+int yyget_debug ( void );
-void yyset_debug (int debug_flag );
+void yyset_debug ( int debug_flag );
-YY_EXTRA_TYPE yyget_extra (void );
+YY_EXTRA_TYPE yyget_extra ( void );
-void yyset_extra (YY_EXTRA_TYPE user_defined );
+void yyset_extra ( YY_EXTRA_TYPE user_defined );
-FILE *yyget_in (void );
+FILE *yyget_in ( void );
-void yyset_in (FILE * in_str );
+void yyset_in ( FILE * _in_str );
-FILE *yyget_out (void );
+FILE *yyget_out ( void );
-void yyset_out (FILE * out_str );
+void yyset_out ( FILE * _out_str );
-yy_size_t yyget_leng (void );
+ int yyget_leng ( void );
-char *yyget_text (void );
+char *yyget_text ( void );
-int yyget_lineno (void );
+int yyget_lineno ( void );
-void yyset_lineno (int line_number );
+void yyset_lineno ( int _line_number );
/* Macros after this point can all be overridden by user definitions in
* section 1.
@@ -863,35 +855,43 @@ void yyset_lineno (int line_number );
#ifndef YY_SKIP_YYWRAP
#ifdef __cplusplus
-extern "C" int yywrap (void );
+extern "C" int yywrap ( void );
#else
-extern int yywrap (void );
+extern int yywrap ( void );
#endif
#endif
- static void yyunput (int c,char *buf_ptr );
+#ifndef YY_NO_UNPUT
+ static void yyunput ( int c, char *buf_ptr );
+
+#endif
+
#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy ( char *, const char *, int );
#endif
#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen ( const char * );
#endif
#ifndef YY_NO_INPUT
-
#ifdef __cplusplus
-static int yyinput (void );
+static int yyinput ( void );
#else
-static int input (void );
+static int input ( void );
#endif
#endif
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -899,7 +899,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -910,7 +910,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- yy_size_t n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -923,7 +923,7 @@ static int input (void );
else \
{ \
errno=0; \
- while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+ while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
{ \
if( errno != EINTR) \
{ \
@@ -978,7 +978,7 @@ extern int yylex (void);
/* Code executed at the end of each rule. */
#ifndef YY_BREAK
-#define YY_BREAK break;
+#define YY_BREAK /*LINTED*/break;
#endif
#define YY_RULE_SETUP \
@@ -991,15 +991,10 @@ extern int yylex (void);
*/
YY_DECL
{
- register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
- register int yy_act;
+ yy_state_type yy_current_state;
+ char *yy_cp, *yy_bp;
+ int yy_act;
-#line 115 "engines/director/lingo/lingo-lex.l"
-
-
-#line 1002 "engines/director/lingo/lingo-lex.cpp"
-
if ( !(yy_init) )
{
(yy_init) = 1;
@@ -1020,13 +1015,19 @@ YY_DECL
if ( ! YY_CURRENT_BUFFER ) {
yyensure_buffer_stack ();
YY_CURRENT_BUFFER_LVALUE =
- yy_create_buffer(yyin,YY_BUF_SIZE );
+ yy_create_buffer( yyin, YY_BUF_SIZE );
}
- yy_load_buffer_state( );
+ yy_load_buffer_state( );
}
- while ( 1 ) /* loops until end-of-file is reached */
+ {
+#line 115 "engines/director/lingo/lingo-lex.l"
+
+
+#line 1028 "engines/director/lingo/lingo-lex.cpp"
+
+ while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
yy_cp = (yy_c_buf_p);
@@ -1043,7 +1044,7 @@ YY_DECL
yy_match:
do
{
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -1053,9 +1054,9 @@ yy_match:
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 300 )
- yy_c = yy_meta[(unsigned int) yy_c];
+ yy_c = yy_meta[yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
++yy_cp;
}
while ( yy_current_state != 299 );
@@ -1521,8 +1522,8 @@ YY_RULE_SETUP
}
if (g_lingo->_builtins.contains(ptr)) {
- if (g_lingo->_builtins[ptr]->type == FBLTIN &&
- g_lingo->_builtins[ptr]->nargs == 1 && g_lingo->_builtins[ptr]->maxArgs == 1) {
+ if (g_lingo->_builtins[ptr].type == FBLTIN &&
+ g_lingo->_builtins[ptr].nargs == 1 && g_lingo->_builtins[ptr].maxArgs == 1) {
yylval.s = new Common::String(ptr);
return THEFBLTIN;
}
@@ -1621,10 +1622,10 @@ YY_RULE_SETUP
return ID;
if (g_lingo->_builtins.contains(yytext)) {
- int type = g_lingo->_builtins[yytext]->type;
- if ((type == BLTIN || type == FBLTIN || type == RBLTIN) && g_lingo->_builtins[yytext]->parens == false) {
+ int type = g_lingo->_builtins[yytext].type;
+ if ((type == BLTIN || type == FBLTIN || type == RBLTIN) && g_lingo->_builtins[yytext].parens == false) {
if (type == RBLTIN) {
- if (g_lingo->_builtins[yytext]->nargs != 1 || g_lingo->_builtins[yytext]->maxArgs != 1) {
+ if (g_lingo->_builtins[yytext].nargs != 1 || g_lingo->_builtins[yytext].maxArgs != 1) {
warning("Incorrectly set RBLTIN %s", yytext);
return LEXERROR;
}
@@ -1754,7 +1755,7 @@ case YY_STATE_EOF(INITIAL):
{
(yy_did_buffer_switch_on_eof) = 0;
- if ( yywrap( ) )
+ if ( yywrap( ) )
{
/* Note: because we've taken care in
* yy_get_next_buffer() to have set up
@@ -1807,6 +1808,7 @@ case YY_STATE_EOF(INITIAL):
"fatal flex scanner internal error--no action found" );
} /* end of action switch */
} /* end of scanning one token */
+ } /* end of user's declarations */
} /* end of yylex */
/* yy_get_next_buffer - try to read in a new buffer
@@ -1818,9 +1820,9 @@ case YY_STATE_EOF(INITIAL):
*/
static int yy_get_next_buffer (void)
{
- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
- register char *source = (yytext_ptr);
- register int number_to_move, i;
+ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+ char *source = (yytext_ptr);
+ int number_to_move, i;
int ret_val;
if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1849,7 +1851,7 @@ static int yy_get_next_buffer (void)
/* Try to read more data. */
/* First move last chars to start of buffer. */
- number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+ number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
for ( i = 0; i < number_to_move; ++i )
*(dest++) = *(source++);
@@ -1862,21 +1864,21 @@ static int yy_get_next_buffer (void)
else
{
- yy_size_t num_to_read =
+ int num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+ YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
- yy_size_t new_size = b->yy_buf_size * 2;
+ int new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1885,11 +1887,12 @@ static int yy_get_next_buffer (void)
b->yy_ch_buf = (char *)
/* Include room in for 2 EOB chars. */
- yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
+ yyrealloc( (void *) b->yy_ch_buf,
+ (yy_size_t) (b->yy_buf_size + 2) );
}
else
/* Can't grow it, we don't own it. */
- b->yy_ch_buf = 0;
+ b->yy_ch_buf = NULL;
if ( ! b->yy_ch_buf )
YY_FATAL_ERROR(
@@ -1917,7 +1920,7 @@ static int yy_get_next_buffer (void)
if ( number_to_move == YY_MORE_ADJ )
{
ret_val = EOB_ACT_END_OF_FILE;
- yyrestart(yyin );
+ yyrestart( yyin );
}
else
@@ -1931,12 +1934,15 @@ static int yy_get_next_buffer (void)
else
ret_val = EOB_ACT_CONTINUE_SCAN;
- if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+ if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
/* Extend the array by 50%, plus the number we really need. */
- yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size );
+ int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+ YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
+ (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size );
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+ /* "- 2" to take care of EOB's */
+ YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
}
(yy_n_chars) += number_to_move;
@@ -1952,15 +1958,15 @@ static int yy_get_next_buffer (void)
static yy_state_type yy_get_previous_state (void)
{
- register yy_state_type yy_current_state;
- register char *yy_cp;
+ yy_state_type yy_current_state;
+ char *yy_cp;
yy_current_state = (yy_start);
yy_current_state += YY_AT_BOL();
for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
{
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -1970,9 +1976,9 @@ static int yy_get_next_buffer (void)
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 300 )
- yy_c = yy_meta[(unsigned int) yy_c];
+ yy_c = yy_meta[yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
}
return yy_current_state;
@@ -1985,10 +1991,10 @@ static int yy_get_next_buffer (void)
*/
static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
{
- register int yy_is_jam;
- register char *yy_cp = (yy_c_buf_p);
+ int yy_is_jam;
+ char *yy_cp = (yy_c_buf_p);
- register YY_CHAR yy_c = 1;
+ YY_CHAR yy_c = 1;
if ( yy_accept[yy_current_state] )
{
(yy_last_accepting_state) = yy_current_state;
@@ -1998,17 +2004,19 @@ static int yy_get_next_buffer (void)
{
yy_current_state = (int) yy_def[yy_current_state];
if ( yy_current_state >= 300 )
- yy_c = yy_meta[(unsigned int) yy_c];
+ yy_c = yy_meta[yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
yy_is_jam = (yy_current_state == 299);
- return yy_is_jam ? 0 : yy_current_state;
+ return yy_is_jam ? 0 : yy_current_state;
}
- static void yyunput (int c, register char * yy_bp )
+#ifndef YY_NO_UNPUT
+
+ static void yyunput (int c, char * yy_bp )
{
- register char *yy_cp;
+ char *yy_cp;
yy_cp = (yy_c_buf_p);
@@ -2018,10 +2026,10 @@ static int yy_get_next_buffer (void)
if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
{ /* need to shift things up to make room */
/* +2 for EOB chars. */
- register yy_size_t number_to_move = (yy_n_chars) + 2;
- register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+ int number_to_move = (yy_n_chars) + 2;
+ char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
- register char *source =
+ char *source =
&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
@@ -2030,7 +2038,7 @@ static int yy_get_next_buffer (void)
yy_cp += (int) (dest - source);
yy_bp += (int) (dest - source);
YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+ (yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
YY_FATAL_ERROR( "flex scanner push-back overflow" );
@@ -2043,6 +2051,8 @@ static int yy_get_next_buffer (void)
(yy_c_buf_p) = yy_cp;
}
+#endif
+
#ifndef YY_NO_INPUT
#ifdef __cplusplus
static int yyinput (void)
@@ -2067,7 +2077,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
- yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+ int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -2084,13 +2094,13 @@ static int yy_get_next_buffer (void)
*/
/* Reset buffer status. */
- yyrestart(yyin );
+ yyrestart( yyin );
/*FALLTHROUGH*/
case EOB_ACT_END_OF_FILE:
{
- if ( yywrap( ) )
+ if ( yywrap( ) )
return 0;
if ( ! (yy_did_buffer_switch_on_eof) )
@@ -2130,11 +2140,11 @@ static int yy_get_next_buffer (void)
if ( ! YY_CURRENT_BUFFER ){
yyensure_buffer_stack ();
YY_CURRENT_BUFFER_LVALUE =
- yy_create_buffer(yyin,YY_BUF_SIZE );
+ yy_create_buffer( yyin, YY_BUF_SIZE );
}
- yy_init_buffer(YY_CURRENT_BUFFER,input_file );
- yy_load_buffer_state( );
+ yy_init_buffer( YY_CURRENT_BUFFER, input_file );
+ yy_load_buffer_state( );
}
/** Switch to a different input buffer.
@@ -2162,7 +2172,7 @@ static int yy_get_next_buffer (void)
}
YY_CURRENT_BUFFER_LVALUE = new_buffer;
- yy_load_buffer_state( );
+ yy_load_buffer_state( );
/* We don't actually know whether we did this switch during
* EOF (yywrap()) processing, but the only time this flag
@@ -2190,7 +2200,7 @@ static void yy_load_buffer_state (void)
{
YY_BUFFER_STATE b;
- b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
+ b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -2199,13 +2209,13 @@ static void yy_load_buffer_state (void)
/* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters.
*/
- b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 );
+ b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) );
if ( ! b->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
b->yy_is_our_buffer = 1;
- yy_init_buffer(b,file );
+ yy_init_buffer( b, file );
return b;
}
@@ -2224,9 +2234,9 @@ static void yy_load_buffer_state (void)
YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
if ( b->yy_is_our_buffer )
- yyfree((void *) b->yy_ch_buf );
+ yyfree( (void *) b->yy_ch_buf );
- yyfree((void *) b );
+ yyfree( (void *) b );
}
/* Initializes or reinitializes a buffer.
@@ -2238,7 +2248,7 @@ static void yy_load_buffer_state (void)
{
int oerrno = errno;
- yy_flush_buffer(b );
+ yy_flush_buffer( b );
b->yy_input_file = file;
b->yy_fill_buffer = 1;
@@ -2281,7 +2291,7 @@ static void yy_load_buffer_state (void)
b->yy_buffer_status = YY_BUFFER_NEW;
if ( b == YY_CURRENT_BUFFER )
- yy_load_buffer_state( );
+ yy_load_buffer_state( );
}
/** Pushes the new state onto the stack. The new state becomes
@@ -2312,7 +2322,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
YY_CURRENT_BUFFER_LVALUE = new_buffer;
/* copied from yy_switch_to_buffer. */
- yy_load_buffer_state( );
+ yy_load_buffer_state( );
(yy_did_buffer_switch_on_eof) = 1;
}
@@ -2331,7 +2341,7 @@ void yypop_buffer_state (void)
--(yy_buffer_stack_top);
if (YY_CURRENT_BUFFER) {
- yy_load_buffer_state( );
+ yy_load_buffer_state( );
(yy_did_buffer_switch_on_eof) = 1;
}
}
@@ -2349,15 +2359,15 @@ static void yyensure_buffer_stack (void)
* scanner will even need a stack. We use 2 instead of 1 to avoid an
* immediate realloc on the next call.
*/
- num_to_alloc = 1;
+ num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
(num_to_alloc * sizeof(struct yy_buffer_state*)
);
if ( ! (yy_buffer_stack) )
YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
+
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
+
(yy_buffer_stack_max) = num_to_alloc;
(yy_buffer_stack_top) = 0;
return;
@@ -2366,7 +2376,7 @@ static void yyensure_buffer_stack (void)
if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
/* Increase the buffer to prepare for a possible push. */
- int grow_size = 8 /* arbitrary grow size */;
+ yy_size_t grow_size = 8 /* arbitrary grow size */;
num_to_alloc = (yy_buffer_stack_max) + grow_size;
(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
@@ -2386,7 +2396,7 @@ static void yyensure_buffer_stack (void)
* @param base the character buffer
* @param size the size in bytes of the character buffer
*
- * @return the newly allocated buffer state object.
+ * @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
{
@@ -2396,23 +2406,23 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR )
/* They forgot to leave room for the EOB's. */
- return 0;
+ return NULL;
- b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
+ b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
- b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
+ b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */
b->yy_buf_pos = b->yy_ch_buf = base;
b->yy_is_our_buffer = 0;
- b->yy_input_file = 0;
+ b->yy_input_file = NULL;
b->yy_n_chars = b->yy_buf_size;
b->yy_is_interactive = 0;
b->yy_at_bol = 1;
b->yy_fill_buffer = 0;
b->yy_buffer_status = YY_BUFFER_NEW;
- yy_switch_to_buffer(b );
+ yy_switch_to_buffer( b );
return b;
}
@@ -2425,28 +2435,29 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
* @note If you want to scan bytes that may contain NUL values, then use
* yy_scan_bytes() instead.
*/
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+YY_BUFFER_STATE yy_scan_string (const char * yystr )
{
- return yy_scan_bytes(yystr,strlen(yystr) );
+ return yy_scan_bytes( yystr, (int) strlen(yystr) );
}
/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
* scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
*
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
+YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
- yy_size_t n, i;
+ yy_size_t n;
+ int i;
/* Get memory for full buffer, including space for trailing EOB's. */
- n = _yybytes_len + 2;
- buf = (char *) yyalloc(n );
+ n = (yy_size_t) (_yybytes_len + 2);
+ buf = (char *) yyalloc( n );
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
@@ -2455,7 +2466,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
- b = yy_scan_buffer(buf,n );
+ b = yy_scan_buffer( buf, n );
if ( ! b )
YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
@@ -2471,9 +2482,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len
#define YY_EXIT_FAILURE 2
#endif
-static void yy_fatal_error (yyconst char* msg )
+static void yynoreturn yy_fatal_error (const char* msg )
{
- (void) fprintf( stderr, "%s\n", msg );
+ fprintf( stderr, "%s\n", msg );
exit( YY_EXIT_FAILURE );
}
@@ -2501,7 +2512,7 @@ static void yy_fatal_error (yyconst char* msg )
*/
int yyget_lineno (void)
{
-
+
return yylineno;
}
@@ -2524,7 +2535,7 @@ FILE *yyget_out (void)
/** Get the length of the current token.
*
*/
-yy_size_t yyget_leng (void)
+int yyget_leng (void)
{
return yyleng;
}
@@ -2539,29 +2550,29 @@ char *yyget_text (void)
}
/** Set the current line number.
- * @param line_number
+ * @param _line_number line number
*
*/
-void yyset_lineno (int line_number )
+void yyset_lineno (int _line_number )
{
- yylineno = line_number;
+ yylineno = _line_number;
}
/** Set the input stream. This does not discard the current
* input buffer.
- * @param in_str A readable stream.
+ * @param _in_str A readable stream.
*
* @see yy_switch_to_buffer
*/
-void yyset_in (FILE * in_str )
+void yyset_in (FILE * _in_str )
{
- yyin = in_str ;
+ yyin = _in_str ;
}
-void yyset_out (FILE * out_str )
+void yyset_out (FILE * _out_str )
{
- yyout = out_str ;
+ yyout = _out_str ;
}
int yyget_debug (void)
@@ -2569,9 +2580,9 @@ int yyget_debug (void)
return yy_flex_debug;
}
-void yyset_debug (int bdebug )
+void yyset_debug (int _bdebug )
{
- yy_flex_debug = bdebug ;
+ yy_flex_debug = _bdebug ;
}
static int yy_init_globals (void)
@@ -2580,10 +2591,10 @@ static int yy_init_globals (void)
* This function is called from yylex_destroy(), so don't allocate here.
*/
- (yy_buffer_stack) = 0;
+ (yy_buffer_stack) = NULL;
(yy_buffer_stack_top) = 0;
(yy_buffer_stack_max) = 0;
- (yy_c_buf_p) = (char *) 0;
+ (yy_c_buf_p) = NULL;
(yy_init) = 0;
(yy_start) = 0;
@@ -2592,8 +2603,8 @@ static int yy_init_globals (void)
yyin = stdin;
yyout = stdout;
#else
- yyin = (FILE *) 0;
- yyout = (FILE *) 0;
+ yyin = NULL;
+ yyout = NULL;
#endif
/* For future reference: Set errno on error, since we are called by
@@ -2608,7 +2619,7 @@ int yylex_destroy (void)
/* Pop the buffer stack, destroying each element. */
while(YY_CURRENT_BUFFER){
- yy_delete_buffer(YY_CURRENT_BUFFER );
+ yy_delete_buffer( YY_CURRENT_BUFFER );
YY_CURRENT_BUFFER_LVALUE = NULL;
yypop_buffer_state();
}
@@ -2629,18 +2640,19 @@ int yylex_destroy (void)
*/
#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+static void yy_flex_strncpy (char* s1, const char * s2, int n )
{
- register int i;
+
+ int i;
for ( i = 0; i < n; ++i )
s1[i] = s2[i];
}
#endif
#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
+static int yy_flex_strlen (const char * s )
{
- register int n;
+ int n;
for ( n = 0; s[n]; ++n )
;
@@ -2650,11 +2662,12 @@ static int yy_flex_strlen (yyconst char * s )
void *yyalloc (yy_size_t size )
{
- return (void *) malloc( size );
+ return malloc(size);
}
void *yyrealloc (void * ptr, yy_size_t size )
{
+
/* The cast to (char *) in the following accommodates both
* implementations that use char* generic pointers, and those
* that use void* generic pointers. It works with the latter
@@ -2662,12 +2675,12 @@ void *yyrealloc (void * ptr, yy_size_t size )
* any pointer type to void*, and deal with argument conversions
* as though doing an assignment.
*/
- return (void *) realloc( (char *) ptr, size );
+ return realloc(ptr, size);
}
void yyfree (void * ptr )
{
- free( (char *) ptr ); /* see yyrealloc() for (char *) cast */
+ free( (char *) ptr ); /* see yyrealloc() for (char *) cast */
}
#define YYTABLES_NAME "yytables"
@@ -2675,7 +2688,6 @@ void yyfree (void * ptr )
#line 437 "engines/director/lingo/lingo-lex.l"
-
extern int yydebug;
void lex_unput(int c) {
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 34ca40d314..b6f410469e 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -364,8 +364,8 @@ the{spc}+[[:alpha:]]+ {
}
if (g_lingo->_builtins.contains(ptr)) {
- if (g_lingo->_builtins[ptr]->type == FBLTIN &&
- g_lingo->_builtins[ptr]->nargs == 1 && g_lingo->_builtins[ptr]->maxArgs == 1) {
+ if (g_lingo->_builtins[ptr].type == FBLTIN &&
+ g_lingo->_builtins[ptr].nargs == 1 && g_lingo->_builtins[ptr].maxArgs == 1) {
yylval.s = new Common::String(ptr);
return THEFBLTIN;
}
@@ -410,10 +410,10 @@ word { count(); return varCheck(tWORD, "word"); }
return ID;
if (g_lingo->_builtins.contains(yytext)) {
- int type = g_lingo->_builtins[yytext]->type;
- if ((type == BLTIN || type == FBLTIN || type == RBLTIN) && g_lingo->_builtins[yytext]->parens == false) {
+ int type = g_lingo->_builtins[yytext].type;
+ if ((type == BLTIN || type == FBLTIN || type == RBLTIN) && g_lingo->_builtins[yytext].parens == false) {
if (type == RBLTIN) {
- if (g_lingo->_builtins[yytext]->nargs != 1 || g_lingo->_builtins[yytext]->maxArgs != 1) {
+ if (g_lingo->_builtins[yytext].nargs != 1 || g_lingo->_builtins[yytext].maxArgs != 1) {
warning("Incorrectly set RBLTIN %s", yytext);
return LEXERROR;
}
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index c0fe343207..8fda963e3e 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -38,6 +38,7 @@ namespace Director {
Lingo *g_lingo;
Symbol::Symbol() {
+ name = nullptr;
type = VOID;
u.s = nullptr;
refCount = new int;
@@ -53,6 +54,7 @@ Symbol::Symbol() {
}
Symbol::Symbol(const Symbol &s) {
+ name = s.name;
type = s.type;
u.s = s.u.s;
refCount = s.refCount;
@@ -70,6 +72,7 @@ Symbol::Symbol(const Symbol &s) {
Symbol& Symbol::operator=(const Symbol &s) {
if (this != &s) {
reset();
+ name = s.name;
type = s.type;
u.s = s.u.s;
refCount = s.refCount;
@@ -89,6 +92,8 @@ Symbol& Symbol::operator=(const Symbol &s) {
void Symbol::reset() {
*refCount -= 1;
if (*refCount <= 0) {
+ if (name)
+ delete name;
switch (type) {
case HANDLER:
delete u.defn;
@@ -117,6 +122,10 @@ void Symbol::reset() {
default:
break;
}
+ if (argNames)
+ delete argNames;
+ if (varNames)
+ delete varNames;
delete refCount;
}
}
@@ -183,13 +192,6 @@ Lingo::Lingo(DirectorEngine *vm) : _vm(vm) {
Lingo::~Lingo() {
cleanupBuiltins();
-
- if (_localvars)
- for (SymbolHash::iterator it = _localvars->begin(); it != _localvars->end(); ++it)
- delete it->_value;
-
- for (SymbolHash::iterator it = _globalvars.begin(); it != _globalvars.end(); ++it)
- delete it->_value;
}
ScriptContext *Lingo::getScriptContext(ScriptType type, uint16 id) {
@@ -211,7 +213,8 @@ Common::String Lingo::getName(uint16 id) {
return result;
}
-Symbol *Lingo::getHandler(Common::String &name) {
+Symbol Lingo::getHandler(const Common::String &name) {
+ Symbol result;
if (!_eventHandlerTypeIds.contains(name)) {
// local scripts
if (_archives[0].functionHandlers.contains(name))
@@ -224,7 +227,7 @@ Symbol *Lingo::getHandler(Common::String &name) {
if (_builtins.contains(name))
return _builtins[name];
- return NULL;
+ return result;
}
uint32 entityIndex = ENTITY_INDEX(_eventHandlerTypeIds[name], _currentEntityId);
@@ -232,7 +235,7 @@ Symbol *Lingo::getHandler(Common::String &name) {
if (_archives[0].eventHandlers.contains(entityIndex))
return _archives[0].eventHandlers[entityIndex];
- return NULL;
+ return result;
}
const char *Lingo::findNextDefinition(const char *s) {
@@ -284,17 +287,18 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) {
}
_currentScriptContext = new ScriptContext;
+ _currentScript = new ScriptData;
_currentScriptType = type;
_currentEntityId = id;
_archives[_archiveIndex].scriptContexts[type][id] = _currentScriptContext;
// FIXME: unpack into seperate functions
_currentScriptFunction = 0;
- _currentScriptContext->functions.push_back(new Symbol);
- _currentScript = new ScriptData;
- _currentScriptContext->functions[_currentScriptFunction]->type = HANDLER;
- _currentScriptContext->functions[_currentScriptFunction]->u.defn = _currentScript;
- _currentScriptContext->functions[_currentScriptFunction]->ctx = _currentScriptContext;
+ Symbol currentFunc;
+ currentFunc.type = HANDLER;
+ currentFunc.u.defn = _currentScript;
+ currentFunc.ctx = _currentScriptContext;
+ _currentScriptContext->functions.push_back(currentFunc);
_linenumber = _colnumber = 1;
_hadError = false;
@@ -384,7 +388,7 @@ void Lingo::executeScript(ScriptType type, uint16 id, uint16 function) {
debugC(1, kDebugLingoExec, "Executing script type: %s, id: %d, function: %d", scriptType2str(type), id, function);
_currentScriptContext = sc;
- _currentScript = _currentScriptContext->functions[function]->u.defn;
+ _currentScript = _currentScriptContext->functions[function].u.defn;
_pc = 0;
_localvars = new SymbolHash;
@@ -405,17 +409,23 @@ void Lingo::executeHandler(Common::String name) {
}
void Lingo::restartLingo() {
- warning("STUB: restartLingo()");
-
- for (int i = 0; i <= kMaxScriptType; i++) {
- for (ScriptContextHash::iterator it = _archives[_archiveIndex].scriptContexts[i].begin(); it != _archives[_archiveIndex].scriptContexts[i].end(); ++it) {
- for (size_t j = 0; j < it->_value->functions.size(); j++) {
- delete it->_value->functions[j];
+ debugC(3, kDebugLingoExec, "Resetting Lingo!");
+
+ for (int a = 0; a < 2; a++) {
+ LingoArchive *arch = &_archives[a];
+ for (int i = 0; i <= kMaxScriptType; i++) {
+ for (ScriptContextHash::iterator it = arch->scriptContexts[i].begin(); it != arch->scriptContexts[i].end(); ++it) {
+ it->_value->functions.clear();
+ delete it->_value;
}
- delete it->_value;
+
+ arch->scriptContexts[i].clear();
}
- _archives[_archiveIndex].scriptContexts[i].clear();
+ arch->names.clear();
+ arch->eventHandlers.clear();
+ arch->functionHandlers.clear();
+
}
// TODO
@@ -584,7 +594,7 @@ Common::String Datum::asString(bool printonly) {
s = "#void";
break;
case VAR:
- s = Common::String::format("var: #%s", u.sym->name.c_str());
+ s = Common::String::format("var: #%s", u.s->c_str());
break;
case REFERENCE:
{
@@ -669,7 +679,7 @@ const char *Datum::type2str(bool isk) {
int Datum::compareTo(Datum &d, bool ignoreCase) {
if (type == SYMBOL && d.type == SYMBOL) {
// TODO: Implement union comparisons
- return ignoreCase ? u.sym->name.compareToIgnoreCase(d.u.sym->name) : u.sym->name.compareTo(d.u.sym->name);
+ return ignoreCase ? u.s->compareToIgnoreCase(*d.u.s) : u.s->compareTo(*d.u.s);
}
int alignType = g_lingo->getAlignedType(*this, d);
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 781f0bc4b3..beb2296b92 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -68,7 +68,7 @@ struct FuncDesc {
typedef Common::HashMap<void *, FuncDesc *> FuncHash;
struct Symbol { /* symbol table entry */
- Common::String name;
+ Common::String *name;
int type;
union {
int i; /* VAR */
@@ -106,8 +106,7 @@ struct Datum { /* interpreter stack type */
union {
int i; /* INT, ARGC, ARGCNORET */
double f; /* FLOAT */
- Common::String *s; /* STRING */
- Symbol *sym;
+ Common::String *s; /* STRING, VAR, OBJECT */
DatumArray *farr; /* ARRAY, POINT, RECT */
PropertyArray *parr; /* PARRAY */
} u;
@@ -115,7 +114,7 @@ struct Datum { /* interpreter stack type */
int *refCount;
Datum() {
- u.sym = NULL;
+ u.s = nullptr;
type = VOID;
refCount = new int;
*refCount = 1;
@@ -158,6 +157,8 @@ struct Datum { /* interpreter stack type */
*refCount -= 1;
if (*refCount <= 0) {
switch (type) {
+ case VAR:
+ // fallthrough
case STRING:
delete u.s;
break;
@@ -171,8 +172,6 @@ struct Datum { /* interpreter stack type */
case PARRAY:
delete u.parr;
break;
- case VAR:
- // fallthrough
case REFERENCE:
// fallthrough
case INT:
@@ -216,20 +215,20 @@ struct Builtin {
};
struct ScriptContext {
- Common::Array<Symbol *> functions;
+ Common::Array<Symbol> functions;
Common::Array<Datum> constants;
};
typedef Common::HashMap<int32, ScriptContext *> ScriptContextHash;
typedef Common::Array<Datum> StackData;
-typedef Common::HashMap<Common::String, Symbol *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> SymbolHash;
+typedef Common::HashMap<Common::String, Symbol, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> SymbolHash;
typedef Common::HashMap<Common::String, Builtin *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> BuiltinHash;
typedef Common::HashMap<Common::String, TheEntity *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> TheEntityHash;
typedef Common::HashMap<Common::String, TheEntityField *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> TheEntityFieldHash;
struct CFrame { /* proc/func call stack frame */
- Symbol *sp; /* symbol table entry */
+ Symbol sp; /* symbol table entry */
int retpc; /* where to resume after return */
ScriptData *retscript; /* which script to resume after return */
ScriptContext *retctx; /* which script context to use after return */
@@ -255,7 +254,7 @@ struct LingoEvent {
struct LingoArchive {
ScriptContextHash scriptContexts[kMaxScriptType + 1];
Common::Array<Common::String> names;
- Common::HashMap<uint32, Symbol *> eventHandlers;
+ Common::HashMap<uint32, Symbol> eventHandlers;
SymbolHash functionHandlers;
};
@@ -311,7 +310,7 @@ public:
ScriptContext *getScriptContext(ScriptType type, uint16 id);
Common::String getName(uint16 id);
ScriptType event2script(LEvent ev);
- Symbol *getHandler(Common::String &name);
+ Symbol getHandler(const Common::String &name);
void processEvent(LEvent event);
void processEvents();
@@ -321,14 +320,13 @@ public:
void execute(uint pc);
void pushContext();
void popContext();
- Symbol *lookupVar(const char *name, bool create = true, bool putInGlobalList = false);
void cleanLocalVars();
- Symbol *define(Common::String &s, int nargs, ScriptData *code);
- Symbol *define(Common::String &s, int start, int nargs, Common::String *prefix = NULL, int end = -1, bool removeCode = true);
+ Symbol define(Common::String &s, int nargs, ScriptData *code, Common::Array<Common::String> *argNames = nullptr, Common::Array<Common::String> *varNames = nullptr);
+ Symbol define(Common::String &s, int start, int nargs, Common::String *prefix = NULL, int end = -1, bool removeCode = true);
void processIf(int toplabel, int endlabel);
int castIdFetch(Datum &var);
- void varAssign(Datum &var, Datum &value);
- Datum varFetch(Datum &var);
+ void varAssign(Datum &var, Datum &value, bool create = false, bool global = false);
+ Datum varFetch(Datum &var, bool global = false);
int getAlignedType(Datum &d1, Datum &d2);
@@ -374,7 +372,7 @@ public:
void dropStack(int nargs);
void drop(uint num);
- void factoryCall(Common::String &name, int nargs);
+ void factoryCall(const Common::String &name, int nargs);
void func_mci(const Common::String &name);
void func_mciwait(const Common::String &name);
More information about the Scummvm-git-logs
mailing list