[Scummvm-cvs-logs] SF.net SVN: scummvm: [31999] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Sun May 11 10:55:19 CEST 2008
Revision: 31999
http://scummvm.svn.sourceforge.net/scummvm/?rev=31999&view=rev
Author: peres001
Date: 2008-05-11 01:55:16 -0700 (Sun, 11 May 2008)
Log Message:
-----------
Cleanup of parsing code.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/parser.cpp
scummvm/trunk/engines/parallaction/parser.h
scummvm/trunk/engines/parallaction/parser_br.cpp
scummvm/trunk/engines/parallaction/parser_ns.cpp
Modified: scummvm/trunk/engines/parallaction/parser.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser.cpp 2008-05-11 08:36:53 UTC (rev 31998)
+++ scummvm/trunk/engines/parallaction/parser.cpp 2008-05-11 08:55:16 UTC (rev 31999)
@@ -213,7 +213,9 @@
void Parser::reset() {
_currentOpcodes = 0;
_currentStatements = 0;
- _script = 0;
+
+ _statements.clear();
+ _opcodes.clear();
}
void Parser::pushTables(OpcodeSet *opcodes, Table *statements) {
@@ -241,14 +243,5 @@
(*(*_currentOpcodes)[_lookup])();
}
-void Parser::bind(Script *script) {
- reset();
- _script = script;
-}
-void Parser::unbind() {
- reset();
-}
-
-
} // namespace Parallaction
Modified: scummvm/trunk/engines/parallaction/parser.h
===================================================================
--- scummvm/trunk/engines/parallaction/parser.h 2008-05-11 08:36:53 UTC (rev 31998)
+++ scummvm/trunk/engines/parallaction/parser.h 2008-05-11 08:55:16 UTC (rev 31999)
@@ -101,16 +101,11 @@
OpcodeSet *_currentOpcodes;
Table *_currentStatements;
- void bind(Script *script);
- void unbind();
+ void reset();
void pushTables(OpcodeSet *opcodes, Table* statements);
void popTables();
void parseStatement();
-protected:
- void reset();
-
- Script *_script;
};
#define DECLARE_UNQUALIFIED_ZONE_PARSER(sig) void locZoneParse_##sig()
@@ -128,6 +123,7 @@
protected:
Parallaction_ns* _vm;
+ Script *script;
Parser *parser;
Table *_zoneTypeNames;
@@ -143,11 +139,10 @@
Table *_locationZoneStmt;
Table *_locationAnimStmt;
- struct LocationParserContext {
+ struct ParserContext {
bool end;
const char *filename;
- Script *script;
ZonePtr z;
AnimationPtr a;
int nextToken;
@@ -160,7 +155,7 @@
char *bgName;
char *maskName;
char *pathName;
- } _locParseCtxt;
+ } ctxt;
void warning_unexpected();
@@ -205,25 +200,25 @@
DECLARE_UNQUALIFIED_COMMAND_PARSER(move);
DECLARE_UNQUALIFIED_COMMAND_PARSER(endcommands);
- virtual void parseGetData(Script &script, ZonePtr z);
- virtual void parseExamineData(Script &script, ZonePtr z);
- virtual void parseDoorData(Script &script, ZonePtr z);
- virtual void parseMergeData(Script &script, ZonePtr z);
- virtual void parseHearData(Script &script, ZonePtr z);
- virtual void parseSpeakData(Script &script, ZonePtr z);
+ virtual void parseGetData(ZonePtr z);
+ virtual void parseExamineData(ZonePtr z);
+ virtual void parseDoorData(ZonePtr z);
+ virtual void parseMergeData(ZonePtr z);
+ virtual void parseHearData(ZonePtr z);
+ virtual void parseSpeakData(ZonePtr z);
- char *parseComment(Script &script);
- char *parseDialogueString(Script &script);
- Dialogue *parseDialogue(Script &script);
+ char *parseComment();
+ char *parseDialogueString();
+ Dialogue *parseDialogue();
void resolveDialogueForwards(Dialogue *dialogue, uint numQuestions, Table &forwards);
- Answer *parseAnswer(Script &script);
- Question *parseQuestion(Script &script);
+ Answer *parseAnswer();
+ Question *parseQuestion();
- void parseZone(Script &script, ZoneList &list, char *name);
- void parseZoneTypeBlock(Script &script, ZonePtr z);
- void parseWalkNodes(Script& script, WalkNodeList &list);
- void parseAnimation(Script &script, AnimationList &list, char *name);
- void parseCommands(Script &script, CommandList&);
+ void parseZone(ZoneList &list, char *name);
+ void parseZoneTypeBlock(ZonePtr z);
+ void parseWalkNodes(WalkNodeList &list);
+ void parseAnimation(AnimationList &list, char *name);
+ void parseCommands(CommandList&);
void parseCommandFlags();
void saveCommandForward(const char *name, CommandPtr cmd);
void resolveCommandForwards();
@@ -330,16 +325,15 @@
OpcodeSet _instructionParsers;
Table *_instructionNames;
- struct {
+ struct ParserContext {
bool end;
AnimationPtr a;
InstructionPtr inst;
LocalVariable *locals;
- ProgramPtr program;
// BRA specific
InstructionPtr openIf;
- } _instParseCtxt;
+ } ctxt;
DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(defLocal);
DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(animation);
Modified: scummvm/trunk/engines/parallaction/parser_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_br.cpp 2008-05-11 08:36:53 UTC (rev 31998)
+++ scummvm/trunk/engines/parallaction/parser_br.cpp 2008-05-11 08:55:16 UTC (rev 31999)
@@ -300,7 +300,7 @@
debugC(7, kDebugParser, "LOCATION_PARSER(location) ");
strcpy(_vm->_location._name, _tokens[1]);
- _locParseCtxt.bgName = strdup(_tokens[1]);
+ ctxt.bgName = strdup(_tokens[1]);
bool flip = false;
int nextToken;
@@ -331,14 +331,14 @@
DECLARE_LOCATION_PARSER(zone) {
debugC(7, kDebugParser, "LOCATION_PARSER(zone) ");
- parseZone(*_locParseCtxt.script, _vm->_location._zones, _tokens[1]);
+ parseZone(_vm->_location._zones, _tokens[1]);
- _locParseCtxt.z->_index = _locParseCtxt.numZones++;
+ ctxt.z->_index = ctxt.numZones++;
if (_vm->getLocationFlags() & kFlagsVisited) {
- _locParseCtxt.z->_flags = _vm->_zoneFlags[_vm->_currentLocationIndex][_locParseCtxt.z->_index];
+ ctxt.z->_flags = _vm->_zoneFlags[_vm->_currentLocationIndex][ctxt.z->_index];
} else {
- _vm->_zoneFlags[_vm->_currentLocationIndex][_locParseCtxt.z->_index] = _locParseCtxt.z->_flags;
+ _vm->_zoneFlags[_vm->_currentLocationIndex][ctxt.z->_index] = ctxt.z->_flags;
}
}
@@ -347,14 +347,14 @@
DECLARE_LOCATION_PARSER(animation) {
debugC(7, kDebugParser, "LOCATION_PARSER(animation) ");
- parseAnimation(*_locParseCtxt.script, _vm->_location._animations, _tokens[1]);
+ parseAnimation(_vm->_location._animations, _tokens[1]);
- _locParseCtxt.a->_index = _locParseCtxt.numZones++;
+ ctxt.a->_index = ctxt.numZones++;
if (_vm->getLocationFlags() & kFlagsVisited) {
- _locParseCtxt.a->_flags = _vm->_zoneFlags[_vm->_currentLocationIndex][_locParseCtxt.a->_index];
+ ctxt.a->_flags = _vm->_zoneFlags[_vm->_currentLocationIndex][ctxt.a->_index];
} else {
- _vm->_zoneFlags[_vm->_currentLocationIndex][_locParseCtxt.a->_index] = _locParseCtxt.a->_flags;
+ _vm->_zoneFlags[_vm->_currentLocationIndex][ctxt.a->_index] = ctxt.a->_flags;
}
}
@@ -394,14 +394,14 @@
DECLARE_LOCATION_PARSER(comment) {
debugC(7, kDebugParser, "LOCATION_PARSER(comment) ");
- _vm->_location._comment = parseComment(*_locParseCtxt.script);
+ _vm->_location._comment = parseComment();
}
DECLARE_LOCATION_PARSER(endcomment) {
debugC(7, kDebugParser, "LOCATION_PARSER(endcomment) ");
- _vm->_location._endComment = parseComment(*_locParseCtxt.script);
+ _vm->_location._endComment = parseComment();
}
@@ -421,7 +421,7 @@
DECLARE_LOCATION_PARSER(redundant) {
debugC(7, kDebugParser, "LOCATION_PARSER(redundant) ");
- warning("redundant '%s' line found in script '%s'", _tokens[0], _locParseCtxt.filename);
+ warning("redundant '%s' line found in script '%s'", _tokens[0], ctxt.filename);
}
@@ -435,7 +435,7 @@
DECLARE_LOCATION_PARSER(ifchar) {
debugC(7, kDebugParser, "LOCATION_PARSER(ifchar) ");
- _locParseCtxt.script->skip("ENDIF");
+ script->skip("ENDIF");
}
@@ -449,7 +449,7 @@
DECLARE_LOCATION_PARSER(mask) {
debugC(7, kDebugParser, "LOCATION_PARSER(mask) ");
- _locParseCtxt.maskName = strdup(_tokens[1]);
+ ctxt.maskName = strdup(_tokens[1]);
_vm->_gfx->_backgroundInfo.layers[0] = atoi(_tokens[2]);
_vm->_gfx->_backgroundInfo.layers[1] = atoi(_tokens[3]);
_vm->_gfx->_backgroundInfo.layers[2] = atoi(_tokens[4]);
@@ -459,14 +459,14 @@
DECLARE_LOCATION_PARSER(path) {
debugC(7, kDebugParser, "LOCATION_PARSER(path) ");
- _locParseCtxt.pathName = strdup(_tokens[1]);
+ ctxt.pathName = strdup(_tokens[1]);
}
DECLARE_LOCATION_PARSER(escape) {
debugC(7, kDebugParser, "LOCATION_PARSER(escape) ");
- parseCommands(*_locParseCtxt.script, _vm->_location._escapeCommands);
+ parseCommands(_vm->_location._escapeCommands);
}
@@ -487,7 +487,7 @@
debugC(7, kDebugParser, "COMMAND_PARSER(ifchar) ");
if (!scumm_stricmp(_vm->_char.getName(), _tokens[1]))
- _locParseCtxt.script->skip("endif");
+ script->skip("endif");
}
@@ -503,22 +503,22 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._string = strdup(_tokens[1]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._string = strdup(_tokens[1]);
+ ctxt.nextToken++;
- if (_tokens[_locParseCtxt.nextToken][0] != '\0') {
- if (isdigit(_tokens[_locParseCtxt.nextToken][0]) || _tokens[_locParseCtxt.nextToken][0] == '-') {
- _locParseCtxt.cmd->u._startPos.x = atoi(_tokens[_locParseCtxt.nextToken]);
- _locParseCtxt.nextToken++;
- _locParseCtxt.cmd->u._startPos.y = atoi(_tokens[_locParseCtxt.nextToken]);
- _locParseCtxt.nextToken++;
+ if (_tokens[ctxt.nextToken][0] != '\0') {
+ if (isdigit(_tokens[ctxt.nextToken][0]) || _tokens[ctxt.nextToken][0] == '-') {
+ ctxt.cmd->u._startPos.x = atoi(_tokens[ctxt.nextToken]);
+ ctxt.nextToken++;
+ ctxt.cmd->u._startPos.y = atoi(_tokens[ctxt.nextToken]);
+ ctxt.nextToken++;
}
- if (isdigit(_tokens[_locParseCtxt.nextToken][0]) || _tokens[_locParseCtxt.nextToken][0] == '-') {
- _locParseCtxt.cmd->u._startPos2.x = atoi(_tokens[_locParseCtxt.nextToken]);
- _locParseCtxt.nextToken++;
- _locParseCtxt.cmd->u._startPos2.y = atoi(_tokens[_locParseCtxt.nextToken]);
- _locParseCtxt.nextToken++;
+ if (isdigit(_tokens[ctxt.nextToken][0]) || _tokens[ctxt.nextToken][0] == '-') {
+ ctxt.cmd->u._startPos2.x = atoi(_tokens[ctxt.nextToken]);
+ ctxt.nextToken++;
+ ctxt.cmd->u._startPos2.y = atoi(_tokens[ctxt.nextToken]);
+ ctxt.nextToken++;
}
}
@@ -532,8 +532,8 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._string = strdup(_tokens[1]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._string = strdup(_tokens[1]);
+ ctxt.nextToken++;
parseCommandFlags();
addCommand();
@@ -544,10 +544,10 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._lvalue = _vm->_countersNames->lookup(_tokens[1]);
- _locParseCtxt.nextToken++;
- _locParseCtxt.cmd->u._rvalue = atoi(_tokens[2]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._lvalue = _vm->_countersNames->lookup(_tokens[1]);
+ ctxt.nextToken++;
+ ctxt.cmd->u._rvalue = atoi(_tokens[2]);
+ ctxt.nextToken++;
parseCommandFlags();
addCommand();
@@ -560,26 +560,26 @@
createCommand(parser->_lookup);
uint counter = _vm->_countersNames->lookup(_tokens[1]);
- _locParseCtxt.nextToken++;
+ ctxt.nextToken++;
if (counter == Table::notFound) {
if (!scumm_stricmp("SFX", _tokens[1])) {
- _locParseCtxt.cmd->_id = CMD_TEST_SFX;
+ ctxt.cmd->_id = CMD_TEST_SFX;
} else {
error("unknown counter '%s' in test opcode", _tokens[1]);
}
} else {
- _locParseCtxt.cmd->u._lvalue = counter;
- _locParseCtxt.cmd->u._rvalue = atoi(_tokens[3]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._lvalue = counter;
+ ctxt.cmd->u._rvalue = atoi(_tokens[3]);
+ ctxt.nextToken++;
if (_tokens[2][0] == '>') {
- _locParseCtxt.cmd->_id = CMD_TEST_GT;
+ ctxt.cmd->_id = CMD_TEST_GT;
} else
if (_tokens[2][0] == '<') {
- _locParseCtxt.cmd->_id = CMD_TEST_LT;
+ ctxt.cmd->_id = CMD_TEST_LT;
}
- _locParseCtxt.nextToken++;
+ ctxt.nextToken++;
}
parseCommandFlags();
@@ -592,12 +592,12 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._musicCommand = _audioCommandsNames->lookup(_tokens[1]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._musicCommand = _audioCommandsNames->lookup(_tokens[1]);
+ ctxt.nextToken++;
if (_tokens[2][0] != '\0' && scumm_stricmp("flags", _tokens[2]) && scumm_stricmp("gflags", _tokens[2])) {
- _locParseCtxt.cmd->u._musicParm = atoi(_tokens[2]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._musicParm = atoi(_tokens[2]);
+ ctxt.nextToken++;
}
parseCommandFlags();
@@ -610,16 +610,16 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._zeta0 = atoi(_tokens[1]);
- _locParseCtxt.nextToken++;
- _locParseCtxt.cmd->u._zeta1 = atoi(_tokens[2]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._zeta0 = atoi(_tokens[1]);
+ ctxt.nextToken++;
+ ctxt.cmd->u._zeta1 = atoi(_tokens[2]);
+ ctxt.nextToken++;
if (_tokens[3][0] != '\0') {
- _locParseCtxt.cmd->u._zeta2 = atoi(_tokens[3]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._zeta2 = atoi(_tokens[3]);
+ ctxt.nextToken++;
} else {
- _locParseCtxt.cmd->u._zeta2 = 50;
+ ctxt.cmd->u._zeta2 = 50;
}
parseCommandFlags();
@@ -632,21 +632,21 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._object = 4 + atoi(_tokens[1]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._object = 4 + atoi(_tokens[1]);
+ ctxt.nextToken++;
if (!scumm_stricmp("dino", _tokens[2])) {
- _locParseCtxt.cmd->u._characterId = 1;
+ ctxt.cmd->u._characterId = 1;
} else
if (!scumm_stricmp("doug", _tokens[2])) {
- _locParseCtxt.cmd->u._characterId = 2;
+ ctxt.cmd->u._characterId = 2;
} else
if (!scumm_stricmp("donna", _tokens[2])) {
- _locParseCtxt.cmd->u._characterId = 3;
+ ctxt.cmd->u._characterId = 3;
} else
error("unknown recipient '%s' in give command", _tokens[2]);
- _locParseCtxt.nextToken++;
+ ctxt.nextToken++;
parseCommandFlags();
addCommand();
@@ -659,18 +659,18 @@
createCommand(parser->_lookup);
if (isdigit(_tokens[1][1])) {
- _locParseCtxt.cmd->u._zeta0 = atoi(_tokens[1]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._zeta0 = atoi(_tokens[1]);
+ ctxt.nextToken++;
} else {
- _locParseCtxt.cmd->u._zeta0 = -1;
+ ctxt.cmd->u._zeta0 = -1;
}
- _locParseCtxt.cmd->u._string = strdup(_tokens[_locParseCtxt.nextToken]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._string = strdup(_tokens[ctxt.nextToken]);
+ ctxt.nextToken++;
- if (_tokens[_locParseCtxt.nextToken][0] != '\0' && scumm_stricmp("flags", _tokens[_locParseCtxt.nextToken])) {
- _locParseCtxt.cmd->u._string2 = strdup(_tokens[_locParseCtxt.nextToken]);
- _locParseCtxt.nextToken++;
+ if (_tokens[ctxt.nextToken][0] != '\0' && scumm_stricmp("flags", _tokens[ctxt.nextToken])) {
+ ctxt.cmd->u._string2 = strdup(_tokens[ctxt.nextToken]);
+ ctxt.nextToken++;
}
@@ -684,8 +684,8 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._rvalue = atoi(_tokens[1]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._rvalue = atoi(_tokens[1]);
+ ctxt.nextToken++;
parseCommandFlags();
addCommand();
@@ -696,14 +696,14 @@
debugC(7, kDebugParser, "ZONE_PARSER(limits) ");
if (isalpha(_tokens[1][1])) {
- _locParseCtxt.z->_flags |= kFlagsAnimLinked;
- _locParseCtxt.z->_linkedAnim = _vm->findAnimation(_tokens[1]);
- _locParseCtxt.z->_linkedName = strdup(_tokens[1]);
+ ctxt.z->_flags |= kFlagsAnimLinked;
+ ctxt.z->_linkedAnim = _vm->findAnimation(_tokens[1]);
+ ctxt.z->_linkedName = strdup(_tokens[1]);
} else {
- _locParseCtxt.z->_left = atoi(_tokens[1]);
- _locParseCtxt.z->_top = atoi(_tokens[2]);
- _locParseCtxt.z->_right = atoi(_tokens[3]);
- _locParseCtxt.z->_bottom = atoi(_tokens[4]);
+ ctxt.z->_left = atoi(_tokens[1]);
+ ctxt.z->_top = atoi(_tokens[2]);
+ ctxt.z->_right = atoi(_tokens[3]);
+ ctxt.z->_bottom = atoi(_tokens[4]);
}
}
@@ -711,9 +711,9 @@
DECLARE_ZONE_PARSER(moveto) {
debugC(7, kDebugParser, "ZONE_PARSER(moveto) ");
- _locParseCtxt.z->_moveTo.x = atoi(_tokens[1]);
- _locParseCtxt.z->_moveTo.y = atoi(_tokens[2]);
-// _locParseCtxt.z->_moveTo.z = atoi(_tokens[3]);
+ ctxt.z->_moveTo.x = atoi(_tokens[1]);
+ ctxt.z->_moveTo.y = atoi(_tokens[2]);
+// ctxt.z->_moveTo.z = atoi(_tokens[3]);
}
@@ -721,14 +721,14 @@
debugC(7, kDebugParser, "ZONE_PARSER(type) ");
if (_tokens[2][0] != '\0') {
- _locParseCtxt.z->_type = (4 + _vm->_objectsNames->lookup(_tokens[2])) << 16;
+ ctxt.z->_type = (4 + _vm->_objectsNames->lookup(_tokens[2])) << 16;
}
int16 _si = _zoneTypeNames->lookup(_tokens[1]);
if (_si != Table::notFound) {
- _locParseCtxt.z->_type |= 1 << (_si - 1);
- parseZoneTypeBlock(*_locParseCtxt.script, _locParseCtxt.z);
+ ctxt.z->_type |= 1 << (_si - 1);
+ parseZoneTypeBlock(ctxt.z);
-// if (_locParseCtxt.z->_type & kZoneHear) {
+// if (ctxt.z->_type & kZoneHear) {
// _soundMan->sfxCommand(START...);
// }
}
@@ -740,26 +740,26 @@
DECLARE_ANIM_PARSER(file) {
debugC(7, kDebugParser, "ANIM_PARSER(file) ");
- _locParseCtxt.a->gfxobj = _vm->_gfx->loadAnim(_tokens[1]);
+ ctxt.a->gfxobj = _vm->_gfx->loadAnim(_tokens[1]);
}
DECLARE_ANIM_PARSER(position) {
debugC(7, kDebugParser, "ANIM_PARSER(position) ");
- _locParseCtxt.a->_left = atoi(_tokens[1]);
- _locParseCtxt.a->_top = atoi(_tokens[2]);
- _locParseCtxt.a->_z = atoi(_tokens[3]);
- _locParseCtxt.a->_frame = atoi(_tokens[4]);
+ ctxt.a->_left = atoi(_tokens[1]);
+ ctxt.a->_top = atoi(_tokens[2]);
+ ctxt.a->_z = atoi(_tokens[3]);
+ ctxt.a->_frame = atoi(_tokens[4]);
}
DECLARE_ANIM_PARSER(moveto) {
debugC(7, kDebugParser, "ANIM_PARSER(moveto) ");
- _locParseCtxt.a->_moveTo.x = atoi(_tokens[1]);
- _locParseCtxt.a->_moveTo.y = atoi(_tokens[2]);
-// _locParseCtxt.a->_moveTo.z = atoi(_tokens[3]);
+ ctxt.a->_moveTo.x = atoi(_tokens[1]);
+ ctxt.a->_moveTo.y = atoi(_tokens[2]);
+// ctxt.a->_moveTo.z = atoi(_tokens[3]);
}
@@ -767,15 +767,15 @@
debugC(7, kDebugParser, "ANIM_PARSER(endanimation) ");
- if (_locParseCtxt.a->gfxobj) {
- _locParseCtxt.a->_right = _locParseCtxt.a->width();
- _locParseCtxt.a->_bottom = _locParseCtxt.a->height();
+ if (ctxt.a->gfxobj) {
+ ctxt.a->_right = ctxt.a->width();
+ ctxt.a->_bottom = ctxt.a->height();
}
- _locParseCtxt.a->_oldPos.x = -1000;
- _locParseCtxt.a->_oldPos.y = -1000;
+ ctxt.a->_oldPos.x = -1000;
+ ctxt.a->_oldPos.y = -1000;
- _locParseCtxt.a->_flags |= 0x1000000;
+ ctxt.a->_flags |= 0x1000000;
parser->popTables();
}
@@ -792,8 +792,8 @@
DECLARE_INSTRUCTION_PARSER(zone) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(zone) ");
- _instParseCtxt.inst->_z = _vm->findZone(_tokens[1]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ ctxt.inst->_z = _vm->findZone(_tokens[1]);
+ ctxt.inst->_index = parser->_lookup;
}
@@ -802,12 +802,12 @@
debugC(7, kDebugParser, "INSTRUCTION_PARSER(color) ");
- parseRValue(_instParseCtxt.inst->_opB, _tokens[1]);
+ parseRValue(ctxt.inst->_opB, _tokens[1]);
- _instParseCtxt.inst->_colors[0] = atoi(_tokens[2]);
- _instParseCtxt.inst->_colors[1] = atoi(_tokens[3]);
- _instParseCtxt.inst->_colors[2] = atoi(_tokens[4]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ ctxt.inst->_colors[0] = atoi(_tokens[2]);
+ ctxt.inst->_colors[1] = atoi(_tokens[3]);
+ ctxt.inst->_colors[2] = atoi(_tokens[4]);
+ ctxt.inst->_index = parser->_lookup;
}
@@ -816,10 +816,10 @@
debugC(7, kDebugParser, "INSTRUCTION_PARSER(mask) ");
- parseRValue(_instParseCtxt.inst->_opA, _tokens[1]);
- parseRValue(_instParseCtxt.inst->_opB, _tokens[2]);
- parseRValue(_instParseCtxt.inst->_opC, _tokens[3]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ parseRValue(ctxt.inst->_opA, _tokens[1]);
+ parseRValue(ctxt.inst->_opB, _tokens[2]);
+ parseRValue(ctxt.inst->_opC, _tokens[3]);
+ ctxt.inst->_index = parser->_lookup;
}
@@ -827,8 +827,8 @@
DECLARE_INSTRUCTION_PARSER(print) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(print) ");
- parseRValue(_instParseCtxt.inst->_opB, _tokens[1]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ parseRValue(ctxt.inst->_opB, _tokens[1]);
+ ctxt.inst->_index = parser->_lookup;
}
@@ -839,19 +839,19 @@
int _si = 1;
if (isdigit(_tokens[1][1])) {
- _instParseCtxt.inst->_y = atoi(_tokens[1]);
+ ctxt.inst->_y = atoi(_tokens[1]);
_si = 2;
} else {
- _instParseCtxt.inst->_y = -1;
+ ctxt.inst->_y = -1;
}
- _instParseCtxt.inst->_text = strdup(_tokens[_si]);
+ ctxt.inst->_text = strdup(_tokens[_si]);
_si++;
if (_tokens[_si][0] != '\0' && scumm_stricmp("flags", _tokens[_si])) {
- _instParseCtxt.inst->_text2 = strdup(_tokens[_si]);
+ ctxt.inst->_text2 = strdup(_tokens[_si]);
}
- _instParseCtxt.inst->_index = parser->_lookup;
+ ctxt.inst->_index = parser->_lookup;
}
@@ -860,24 +860,24 @@
debugC(7, kDebugParser, "INSTRUCTION_PARSER(if_op) ");
- if (_instParseCtxt.openIf)
+ if (ctxt.openIf)
error("cannot nest 'if' blocks");
- parseLValue(_instParseCtxt.inst->_opA, _tokens[1]);
- parseRValue(_instParseCtxt.inst->_opB, _tokens[3]);
+ parseLValue(ctxt.inst->_opA, _tokens[1]);
+ parseRValue(ctxt.inst->_opB, _tokens[3]);
if (_tokens[2][0] == '=') {
- _instParseCtxt.inst->_index = INST_IFEQ;
+ ctxt.inst->_index = INST_IFEQ;
} else
if (_tokens[2][0] == '>') {
- _instParseCtxt.inst->_index = INST_IFGT;
+ ctxt.inst->_index = INST_IFGT;
} else
if (_tokens[2][0] == '<') {
- _instParseCtxt.inst->_index = INST_IFLT;
+ ctxt.inst->_index = INST_IFLT;
} else
error("unknown test operator '%s' in if-clause", _tokens[2]);
- _instParseCtxt.openIf = _instParseCtxt.inst;
+ ctxt.openIf = ctxt.inst;
}
@@ -885,12 +885,12 @@
DECLARE_INSTRUCTION_PARSER(endif) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(endif) ");
- if (!_instParseCtxt.openIf)
+ if (!ctxt.openIf)
error("unexpected 'endif'");
-// _instParseCtxt.openIf->_endif = _instParseCtxt.inst;
- _instParseCtxt.openIf = nullInstructionPtr;
- _instParseCtxt.inst->_index = parser->_lookup;
+// ctxt.openIf->_endif = ctxt.inst;
+ ctxt.openIf = nullInstructionPtr;
+ ctxt.inst->_index = parser->_lookup;
}
@@ -901,9 +901,9 @@
return;
}
- int index = _instParseCtxt.program->findLocal(str);
+ int index = program->findLocal(str);
if (index != -1) {
- v.setLocal(&_instParseCtxt.locals[index]);
+ v.setLocal(&ctxt.locals[index]);
return;
}
@@ -914,7 +914,7 @@
error("unknown animation '%s' in script", &str[2]);
}
} else
- a = AnimationPtr(_instParseCtxt.a);
+ a = AnimationPtr(ctxt.a);
if (str[0] == 'X') {
v.setField(&a->_left);
@@ -1126,19 +1126,19 @@
void LocationParser_br::parse(Script *script) {
- _locParseCtxt.numZones = 0;
- _locParseCtxt.bgName = 0;
- _locParseCtxt.maskName = 0;
- _locParseCtxt.pathName = 0;
+ ctxt.numZones = 0;
+ ctxt.bgName = 0;
+ ctxt.maskName = 0;
+ ctxt.pathName = 0;
LocationParser_ns::parse(script);
- _vm->_gfx->setBackground(kBackgroundLocation, _locParseCtxt.bgName, _locParseCtxt.maskName, _locParseCtxt.pathName);
+ _vm->_gfx->setBackground(kBackgroundLocation, ctxt.bgName, ctxt.maskName, ctxt.pathName);
_vm->_pathBuffer = &_vm->_gfx->_backgroundInfo.path;
- free(_locParseCtxt.bgName);
- free(_locParseCtxt.maskName);
- free(_locParseCtxt.pathName);
+ free(ctxt.bgName);
+ free(ctxt.maskName);
+ free(ctxt.pathName);
}
Modified: scummvm/trunk/engines/parallaction/parser_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_ns.cpp 2008-05-11 08:36:53 UTC (rev 31998)
+++ scummvm/trunk/engines/parallaction/parser_ns.cpp 2008-05-11 08:55:16 UTC (rev 31999)
@@ -189,21 +189,21 @@
void LocationParser_ns::warning_unexpected() {
- debugC(1, kDebugParser, "unexpected keyword '%s' in line %i", _tokens[0], _locParseCtxt.script->getLine());
+ debugC(1, kDebugParser, "unexpected keyword '%s' in line %i", _tokens[0], script->getLine());
}
DECLARE_ANIM_PARSER(script) {
debugC(7, kDebugParser, "ANIM_PARSER(script) ");
- _locParseCtxt.a->_scriptName = strdup(_tokens[1]);
+ ctxt.a->_scriptName = strdup(_tokens[1]);
}
DECLARE_ANIM_PARSER(commands) {
debugC(7, kDebugParser, "ANIM_PARSER(commands) ");
- parseCommands(*_locParseCtxt.script, _locParseCtxt.a->_commands);
+ parseCommands(ctxt.a->_commands);
}
@@ -211,20 +211,20 @@
debugC(7, kDebugParser, "ANIM_PARSER(type) ");
if (_tokens[2][0] != '\0') {
- _locParseCtxt.a->_type = ((4 + _vm->_objectsNames->lookup(_tokens[2])) << 16) & 0xFFFF0000;
+ ctxt.a->_type = ((4 + _vm->_objectsNames->lookup(_tokens[2])) << 16) & 0xFFFF0000;
}
int16 _si = _zoneTypeNames->lookup(_tokens[1]);
if (_si != Table::notFound) {
- _locParseCtxt.a->_type |= 1 << (_si-1);
- if (((_locParseCtxt.a->_type & 0xFFFF) != kZoneNone) && ((_locParseCtxt.a->_type & 0xFFFF) != kZoneCommand)) {
- parseZoneTypeBlock(*_locParseCtxt.script, _locParseCtxt.a);
+ ctxt.a->_type |= 1 << (_si-1);
+ if (((ctxt.a->_type & 0xFFFF) != kZoneNone) && ((ctxt.a->_type & 0xFFFF) != kZoneCommand)) {
+ parseZoneTypeBlock(ctxt.a);
}
}
- _locParseCtxt.a->_oldPos.x = -1000;
- _locParseCtxt.a->_oldPos.y = -1000;
+ ctxt.a->_oldPos.x = -1000;
+ ctxt.a->_oldPos.y = -1000;
- _locParseCtxt.a->_flags |= 0x1000000;
+ ctxt.a->_flags |= 0x1000000;
parser->popTables();
}
@@ -233,7 +233,7 @@
DECLARE_ANIM_PARSER(label) {
debugC(7, kDebugParser, "ANIM_PARSER(label) ");
- _locParseCtxt.a->_label = _vm->_gfx->renderFloatingLabel(_vm->_labelFont, _tokens[1]);
+ ctxt.a->_label = _vm->_gfx->renderFloatingLabel(_vm->_labelFont, _tokens[1]);
}
@@ -245,7 +245,7 @@
do {
byte _al = _zoneFlagNames->lookup(_tokens[_si]);
_si++;
- _locParseCtxt.a->_flags |= 1 << (_al - 1);
+ ctxt.a->_flags |= 1 << (_al - 1);
} while (!scumm_stricmp(_tokens[_si++], "|"));
}
@@ -260,24 +260,24 @@
strcat(vC8, "tras");
}
}
- _locParseCtxt.a->gfxobj = _vm->_gfx->loadAnim(vC8);
+ ctxt.a->gfxobj = _vm->_gfx->loadAnim(vC8);
}
DECLARE_ANIM_PARSER(position) {
debugC(7, kDebugParser, "ANIM_PARSER(position) ");
- _locParseCtxt.a->_left = atoi(_tokens[1]);
- _locParseCtxt.a->_top = atoi(_tokens[2]);
- _locParseCtxt.a->_z = atoi(_tokens[3]);
+ ctxt.a->_left = atoi(_tokens[1]);
+ ctxt.a->_top = atoi(_tokens[2]);
+ ctxt.a->_z = atoi(_tokens[3]);
}
DECLARE_ANIM_PARSER(moveto) {
debugC(7, kDebugParser, "ANIM_PARSER(moveto) ");
- _locParseCtxt.a->_moveTo.x = atoi(_tokens[1]);
- _locParseCtxt.a->_moveTo.y = atoi(_tokens[2]);
+ ctxt.a->_moveTo.x = atoi(_tokens[1]);
+ ctxt.a->_moveTo.y = atoi(_tokens[2]);
}
@@ -285,15 +285,15 @@
debugC(7, kDebugParser, "ANIM_PARSER(endanimation) ");
- _locParseCtxt.a->_oldPos.x = -1000;
- _locParseCtxt.a->_oldPos.y = -1000;
+ ctxt.a->_oldPos.x = -1000;
+ ctxt.a->_oldPos.y = -1000;
- _locParseCtxt.a->_flags |= 0x1000000;
+ ctxt.a->_flags |= 0x1000000;
parser->popTables();
}
-void LocationParser_ns::parseAnimation(Script& script, AnimationList &list, char *name) {
+void LocationParser_ns::parseAnimation(AnimationList &list, char *name) {
debugC(5, kDebugParser, "parseAnimation(name: %s)", name);
AnimationPtr a(new Animation);
@@ -302,9 +302,7 @@
list.push_front(AnimationPtr(a));
- _locParseCtxt.a = a;
- _locParseCtxt.script = &script;
-
+ ctxt.a = a;
parser->pushTables(&_locationAnimParsers, _locationAnimStmt);
}
@@ -316,15 +314,15 @@
if (_tokens[0][1] == '.') {
_tokens[0][1] = '\0';
- _instParseCtxt.a = _vm->findAnimation(&_tokens[0][2]);
+ ctxt.a = _vm->findAnimation(&_tokens[0][2]);
} else
if (_tokens[1][1] == '.') {
_tokens[1][1] = '\0';
- _instParseCtxt.a = _vm->findAnimation(&_tokens[1][2]);
+ ctxt.a = _vm->findAnimation(&_tokens[1][2]);
} else
- _instParseCtxt.a = program->_anim;
+ ctxt.a = program->_anim;
- _instParseCtxt.inst = inst;
+ ctxt.inst = inst;
parser->parseStatement();
@@ -338,21 +336,18 @@
this->script = script;
this->program = program;
- _instParseCtxt.openIf = nullInstructionPtr;
- _instParseCtxt.end = false;
- _instParseCtxt.program = program;
- _instParseCtxt.locals = program->_locals;
+ ctxt.openIf = nullInstructionPtr;
+ ctxt.end = false;
+ ctxt.locals = program->_locals;
- parser->bind(script);
+ parser->reset();
parser->pushTables(&_instructionParsers, _instructionNames);
do {
parseInstruction();
- } while (!_instParseCtxt.end);
+ } while (!ctxt.end);
parser->popTables();
- parser->unbind();
program->_ip = program->_instructions.begin();
-
}
void Parallaction_ns::loadProgram(AnimationPtr a, const char *filename) {
@@ -376,70 +371,70 @@
DECLARE_INSTRUCTION_PARSER(animation) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(animation) ");
- if (!scumm_stricmp(_tokens[1], _instParseCtxt.a->_name)) {
- _instParseCtxt.inst->_a = _instParseCtxt.a;
+ if (!scumm_stricmp(_tokens[1], ctxt.a->_name)) {
+ ctxt.inst->_a = ctxt.a;
} else {
- _instParseCtxt.inst->_a = _vm->findAnimation(_tokens[1]);
+ ctxt.inst->_a = _vm->findAnimation(_tokens[1]);
}
- _instParseCtxt.inst->_index = parser->_lookup;
+ ctxt.inst->_index = parser->_lookup;
}
DECLARE_INSTRUCTION_PARSER(loop) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(loop) ");
- parseRValue(_instParseCtxt.inst->_opB, _tokens[1]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ parseRValue(ctxt.inst->_opB, _tokens[1]);
+ ctxt.inst->_index = parser->_lookup;
}
DECLARE_INSTRUCTION_PARSER(x) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(x) ");
- parseLValue(_instParseCtxt.inst->_opA, "X");
- parseRValue(_instParseCtxt.inst->_opB, _tokens[1]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ parseLValue(ctxt.inst->_opA, "X");
+ parseRValue(ctxt.inst->_opB, _tokens[1]);
+ ctxt.inst->_index = parser->_lookup;
}
DECLARE_INSTRUCTION_PARSER(y) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(y) ");
- parseLValue(_instParseCtxt.inst->_opA, "Y");
- parseRValue(_instParseCtxt.inst->_opB, _tokens[1]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ parseLValue(ctxt.inst->_opA, "Y");
+ parseRValue(ctxt.inst->_opB, _tokens[1]);
+ ctxt.inst->_index = parser->_lookup;
}
DECLARE_INSTRUCTION_PARSER(z) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(z) ");
- parseLValue(_instParseCtxt.inst->_opA, "Z");
- parseRValue(_instParseCtxt.inst->_opB, _tokens[1]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ parseLValue(ctxt.inst->_opA, "Z");
+ parseRValue(ctxt.inst->_opB, _tokens[1]);
+ ctxt.inst->_index = parser->_lookup;
}
DECLARE_INSTRUCTION_PARSER(f) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(f) ");
- parseLValue(_instParseCtxt.inst->_opA, "F");
- parseRValue(_instParseCtxt.inst->_opB, _tokens[1]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ parseLValue(ctxt.inst->_opA, "F");
+ parseRValue(ctxt.inst->_opB, _tokens[1]);
+ ctxt.inst->_index = parser->_lookup;
}
DECLARE_INSTRUCTION_PARSER(inc) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(inc) ");
- parseLValue(_instParseCtxt.inst->_opA, _tokens[1]);
- parseRValue(_instParseCtxt.inst->_opB, _tokens[2]);
+ parseLValue(ctxt.inst->_opA, _tokens[1]);
+ parseRValue(ctxt.inst->_opB, _tokens[2]);
if (!scumm_stricmp(_tokens[3], "mod")) {
- _instParseCtxt.inst->_flags |= kInstMod;
+ ctxt.inst->_flags |= kInstMod;
}
- _instParseCtxt.inst->_index = parser->_lookup;
+ ctxt.inst->_index = parser->_lookup;
}
@@ -451,40 +446,40 @@
// script was commented out on Dos version. This workaround enables the engine
// to dynamically add a local variable when it is encountered the first time in
// the script, so should fix any other occurrence as well.
- if (_instParseCtxt.program->findLocal(_tokens[1]) == -1) {
- _instParseCtxt.program->addLocal(_tokens[1]);
+ if (program->findLocal(_tokens[1]) == -1) {
+ program->addLocal(_tokens[1]);
}
- parseLValue(_instParseCtxt.inst->_opA, _tokens[1]);
- parseRValue(_instParseCtxt.inst->_opB, _tokens[2]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ parseLValue(ctxt.inst->_opA, _tokens[1]);
+ parseRValue(ctxt.inst->_opB, _tokens[2]);
+ ctxt.inst->_index = parser->_lookup;
}
DECLARE_INSTRUCTION_PARSER(move) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(move) ");
- parseRValue(_instParseCtxt.inst->_opA, _tokens[1]);
- parseRValue(_instParseCtxt.inst->_opB, _tokens[2]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ parseRValue(ctxt.inst->_opA, _tokens[1]);
+ parseRValue(ctxt.inst->_opB, _tokens[2]);
+ ctxt.inst->_index = parser->_lookup;
}
DECLARE_INSTRUCTION_PARSER(put) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(put) ");
- if (!scumm_stricmp(_tokens[1], _instParseCtxt.a->_name)) {
- _instParseCtxt.inst->_a = _instParseCtxt.a;
+ if (!scumm_stricmp(_tokens[1], ctxt.a->_name)) {
+ ctxt.inst->_a = ctxt.a;
} else {
- _instParseCtxt.inst->_a = _vm->findAnimation(_tokens[1]);
+ ctxt.inst->_a = _vm->findAnimation(_tokens[1]);
}
- parseRValue(_instParseCtxt.inst->_opA, _tokens[2]);
- parseRValue(_instParseCtxt.inst->_opB, _tokens[3]);
+ parseRValue(ctxt.inst->_opA, _tokens[2]);
+ parseRValue(ctxt.inst->_opB, _tokens[3]);
if (!scumm_stricmp(_tokens[4], "masked")) {
- _instParseCtxt.inst->_flags |= kInstMaskedPut;
+ ctxt.inst->_flags |= kInstMaskedPut;
}
- _instParseCtxt.inst->_index = parser->_lookup;
+ ctxt.inst->_index = parser->_lookup;
}
@@ -494,22 +489,22 @@
int index = _vm->_callableNames->lookup(_tokens[1]);
if (index == Table::notFound)
error("unknown callable '%s'", _tokens[1]);
- _instParseCtxt.inst->_immediate = index - 1;
- _instParseCtxt.inst->_index = parser->_lookup;
+ ctxt.inst->_immediate = index - 1;
+ ctxt.inst->_index = parser->_lookup;
}
DECLARE_INSTRUCTION_PARSER(sound) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(sound) ");
- _instParseCtxt.inst->_z = _vm->findZone(_tokens[1]);
- _instParseCtxt.inst->_index = parser->_lookup;
+ ctxt.inst->_z = _vm->findZone(_tokens[1]);
+ ctxt.inst->_index = parser->_lookup;
}
DECLARE_INSTRUCTION_PARSER(null) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(null) ");
- _instParseCtxt.inst->_index = parser->_lookup;
+ ctxt.inst->_index = parser->_lookup;
}
@@ -520,22 +515,22 @@
int16 index;
if (_tokens[3][0] != '\0') {
- index = _instParseCtxt.program->addLocal(_tokens[0], val, atoi(_tokens[3]), atoi(_tokens[4]));
+ index = program->addLocal(_tokens[0], val, atoi(_tokens[3]), atoi(_tokens[4]));
} else {
- index = _instParseCtxt.program->addLocal(_tokens[0], val);
+ index = program->addLocal(_tokens[0], val);
}
- _instParseCtxt.inst->_opA.setLocal(&_instParseCtxt.locals[index]);
- _instParseCtxt.inst->_opB.setImmediate(_instParseCtxt.locals[index]._value);
+ ctxt.inst->_opA.setLocal(&ctxt.locals[index]);
+ ctxt.inst->_opB.setImmediate(ctxt.locals[index]._value);
- _instParseCtxt.inst->_index = INST_SET;
+ ctxt.inst->_index = INST_SET;
}
DECLARE_INSTRUCTION_PARSER(endscript) {
debugC(7, kDebugParser, "INSTRUCTION_PARSER(endscript) ");
- _instParseCtxt.end = true;
- _instParseCtxt.inst->_index = parser->_lookup;
+ ctxt.end = true;
+ ctxt.inst->_index = parser->_lookup;
}
@@ -547,9 +542,9 @@
return;
}
- int index = _instParseCtxt.program->findLocal(str);
+ int index = program->findLocal(str);
if (index != -1) {
- v.setLocal(&_instParseCtxt.locals[index]);
+ v.setLocal(&ctxt.locals[index]);
return;
}
@@ -557,7 +552,7 @@
if (str[1] == '.') {
a = _vm->findAnimation(&str[2]);
} else {
- a = _instParseCtxt.a;
+ a = ctxt.a;
}
if (str[0] == 'X') {
@@ -577,9 +572,9 @@
void ProgramParser_ns::parseLValue(ScriptVar &v, const char *str) {
- int index = _instParseCtxt.program->findLocal(str);
+ int index = program->findLocal(str);
if (index != -1) {
- v.setLocal(&_instParseCtxt.locals[index]);
+ v.setLocal(&ctxt.locals[index]);
return;
}
@@ -587,7 +582,7 @@
if (str[1] == '.') {
a = _vm->findAnimation(&str[2]);
} else {
- a = _instParseCtxt.a;
+ a = ctxt.a;
}
if (str[0] == 'X') {
@@ -613,19 +608,19 @@
if (_vm->_globalTable->lookup(_tokens[1]) == Table::notFound) {
do {
- char _al = _vm->_localFlagNames->lookup(_tokens[_locParseCtxt.nextToken]);
- _locParseCtxt.nextToken++;
- _locParseCtxt.cmd->u._flags |= 1 << (_al - 1);
- } while (!scumm_stricmp(_tokens[_locParseCtxt.nextToken++], "|"));
- _locParseCtxt.nextToken--;
+ char _al = _vm->_localFlagNames->lookup(_tokens[ctxt.nextToken]);
+ ctxt.nextToken++;
+ ctxt.cmd->u._flags |= 1 << (_al - 1);
+ } while (!scumm_stricmp(_tokens[ctxt.nextToken++], "|"));
+ ctxt.nextToken--;
} else {
- _locParseCtxt.cmd->u._flags |= kFlagsGlobal;
+ ctxt.cmd->u._flags |= kFlagsGlobal;
do {
char _al = _vm->_globalTable->lookup(_tokens[1]);
- _locParseCtxt.nextToken++;
- _locParseCtxt.cmd->u._flags |= 1 << (_al - 1);
- } while (!scumm_stricmp(_tokens[_locParseCtxt.nextToken++], "|"));
- _locParseCtxt.nextToken--;
+ ctxt.nextToken++;
+ ctxt.cmd->u._flags |= 1 << (_al - 1);
+ } while (!scumm_stricmp(_tokens[ctxt.nextToken++], "|"));
+ ctxt.nextToken--;
}
parseCommandFlags();
@@ -638,11 +633,11 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._zone = _vm->findZone(_tokens[_locParseCtxt.nextToken]);
- if (!_locParseCtxt.cmd->u._zone) {
- saveCommandForward(_tokens[_locParseCtxt.nextToken], _locParseCtxt.cmd);
+ ctxt.cmd->u._zone = _vm->findZone(_tokens[ctxt.nextToken]);
+ if (!ctxt.cmd->u._zone) {
+ saveCommandForward(_tokens[ctxt.nextToken], ctxt.cmd);
}
- _locParseCtxt.nextToken++;
+ ctxt.nextToken++;
parseCommandFlags();
addCommand();
@@ -654,8 +649,8 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._string = strdup(_tokens[_locParseCtxt.nextToken]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._string = strdup(_tokens[ctxt.nextToken]);
+ ctxt.nextToken++;
parseCommandFlags();
addCommand();
@@ -667,8 +662,8 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._object = 4 + _vm->_objectsNames->lookup(_tokens[_locParseCtxt.nextToken]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._object = 4 + _vm->_objectsNames->lookup(_tokens[ctxt.nextToken]);
+ ctxt.nextToken++;
parseCommandFlags();
addCommand();
@@ -680,8 +675,8 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._callable = _vm->_callableNames->lookup(_tokens[_locParseCtxt.nextToken]) - 1;
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._callable = _vm->_callableNames->lookup(_tokens[ctxt.nextToken]) - 1;
+ ctxt.nextToken++;
parseCommandFlags();
addCommand();
@@ -701,10 +696,10 @@
createCommand(parser->_lookup);
- _locParseCtxt.cmd->u._move.x = atoi(_tokens[_locParseCtxt.nextToken]);
- _locParseCtxt.nextToken++;
- _locParseCtxt.cmd->u._move.y = atoi(_tokens[_locParseCtxt.nextToken]);
- _locParseCtxt.nextToken++;
+ ctxt.cmd->u._move.x = atoi(_tokens[ctxt.nextToken]);
+ ctxt.nextToken++;
+ ctxt.cmd->u._move.y = atoi(_tokens[ctxt.nextToken]);
+ ctxt.nextToken++;
parseCommandFlags();
addCommand();
@@ -716,13 +711,13 @@
parser->popTables();
// temporary trick to handle dialogue commands
- _locParseCtxt.endcommands = true;
+ ctxt.endcommands = true;
}
void LocationParser_ns::parseCommandFlags() {
- int _si = _locParseCtxt.nextToken;
- CommandPtr cmd = _locParseCtxt.cmd;
+ int _si = ctxt.nextToken;
+ CommandPtr cmd = ctxt.cmd;
if (!scumm_stricmp(_tokens[_si], "flags")) {
_si++;
@@ -777,19 +772,19 @@
}
- _si = _locParseCtxt.nextToken;
+ _si = ctxt.nextToken;
}
void LocationParser_ns::addCommand() {
- _locParseCtxt.list->push_front(_locParseCtxt.cmd); // NOTE: command lists are written backwards in scripts
+ ctxt.list->push_front(ctxt.cmd); // NOTE: command lists are written backwards in scripts
}
void LocationParser_ns::createCommand(uint id) {
- _locParseCtxt.nextToken = 1;
- _locParseCtxt.cmd = CommandPtr(new Command);
- _locParseCtxt.cmd->_id = id;
+ ctxt.nextToken = 1;
+ ctxt.cmd = CommandPtr(new Command);
+ ctxt.cmd->_id = id;
}
@@ -812,17 +807,16 @@
_numForwardedCommands = 0;
}
-void LocationParser_ns::parseCommands(Script &script, CommandList& list) {
+void LocationParser_ns::parseCommands(CommandList& list) {
debugC(5, kDebugParser, "parseCommands()");
- _locParseCtxt.list = &list;
- _locParseCtxt.endcommands = false;
- _locParseCtxt.script = &script;
+ ctxt.list = &list;
+ ctxt.endcommands = false;
parser->pushTables(&_commandParsers, _commandsNames);
}
-Dialogue *LocationParser_ns::parseDialogue(Script &script) {
+Dialogue *LocationParser_ns::parseDialogue() {
debugC(7, kDebugParser, "parseDialogue()");
uint16 numQuestions = 0;
@@ -832,16 +826,16 @@
Table forwards(20);
- script.readLineToken(true);
+ script->readLineToken(true);
while (scumm_stricmp(_tokens[0], "enddialogue")) {
if (scumm_stricmp(_tokens[0], "Question")) continue;
forwards.addData(_tokens[1]);
- dialogue->_questions[numQuestions++] = parseQuestion(script);
+ dialogue->_questions[numQuestions++] = parseQuestion();
- script.readLineToken(true);
+ script->readLineToken(true);
}
resolveDialogueForwards(dialogue, numQuestions, forwards);
@@ -851,28 +845,28 @@
return dialogue;
}
-Question *LocationParser_ns::parseQuestion(Script &script) {
+Question *LocationParser_ns::parseQuestion() {
Question *question = new Question;
assert(question);
- question->_text = parseDialogueString(script);
+ question->_text = parseDialogueString();
- script.readLineToken(true);
+ script->readLineToken(true);
question->_mood = atoi(_tokens[0]);
uint16 numAnswers = 0;
- script.readLineToken(true);
+ script->readLineToken(true);
while (scumm_stricmp(_tokens[0], "endquestion")) { // parse answers
- question->_answers[numAnswers] = parseAnswer(script);
+ question->_answers[numAnswers] = parseAnswer();
numAnswers++;
}
return question;
}
-Answer *LocationParser_ns::parseAnswer(Script &script) {
+Answer *LocationParser_ns::parseAnswer() {
Answer *answer = new Answer;
assert(answer);
@@ -907,23 +901,23 @@
}
- answer->_text = parseDialogueString(script);
+ answer->_text = parseDialogueString();
- script.readLineToken(true);
+ script->readLineToken(true);
answer->_mood = atoi(_tokens[0]);
- answer->_following._name = parseDialogueString(script);
+ answer->_following._name = parseDialogueString();
- script.readLineToken(true);
+ script->readLineToken(true);
if (!scumm_stricmp(_tokens[0], "commands")) {
- parseCommands(script, answer->_commands);
- _locParseCtxt.endcommands = false;
+ parseCommands(answer->_commands);
+ ctxt.endcommands = false;
do {
- script.readLineToken(true);
+ script->readLineToken(true);
parser->parseStatement();
- } while (!_locParseCtxt.endcommands);
+ } while (!ctxt.endcommands);
- script.readLineToken(true);
+ script->readLineToken(true);
}
return answer;
@@ -952,13 +946,13 @@
}
-char *LocationParser_ns::parseDialogueString(Script &script) {
+char *LocationParser_ns::parseDialogueString() {
char vC8[200];
char *vD0 = NULL;
do {
- vD0 = script.readLine(vC8, 200);
+ vD0 = script->readLine(vC8, 200);
if (vD0 == 0) return NULL;
vD0 = Common::ltrim(vD0);
@@ -974,7 +968,7 @@
DECLARE_LOCATION_PARSER(endlocation) {
debugC(7, kDebugParser, "LOCATION_PARSER(endlocation) ");
- _locParseCtxt.end = true;
+ ctxt.end = true;
}
@@ -1016,21 +1010,21 @@
DECLARE_LOCATION_PARSER(nodes) {
debugC(7, kDebugParser, "LOCATION_PARSER(nodes) ");
- parseWalkNodes(*_locParseCtxt.script, _vm->_location._walkNodes);
+ parseWalkNodes(_vm->_location._walkNodes);
}
DECLARE_LOCATION_PARSER(zone) {
debugC(7, kDebugParser, "LOCATION_PARSER(zone) ");
- parseZone(*_locParseCtxt.script, _vm->_location._zones, _tokens[1]);
+ parseZone(_vm->_location._zones, _tokens[1]);
}
DECLARE_LOCATION_PARSER(animation) {
debugC(7, kDebugParser, "LOCATION_PARSER(animation) ");
- parseAnimation(*_locParseCtxt.script, _vm->_location._animations, _tokens[1]);
+ parseAnimation(_vm->_location._animations, _tokens[1]);
}
@@ -1048,14 +1042,14 @@
DECLARE_LOCATION_PARSER(commands) {
debugC(7, kDebugParser, "LOCATION_PARSER(commands) ");
- parseCommands(*_locParseCtxt.script, _vm->_location._commands);
+ parseCommands(_vm->_location._commands);
}
DECLARE_LOCATION_PARSER(acommands) {
debugC(7, kDebugParser, "LOCATION_PARSER(acommands) ");
- parseCommands(*_locParseCtxt.script, _vm->_location._aCommands);
+ parseCommands(_vm->_location._aCommands);
}
@@ -1082,14 +1076,14 @@
DECLARE_LOCATION_PARSER(comment) {
debugC(7, kDebugParser, "LOCATION_PARSER(comment) ");
- _vm->_location._comment = parseComment(*_locParseCtxt.script);
+ _vm->_location._comment = parseComment();
}
DECLARE_LOCATION_PARSER(endcomment) {
debugC(7, kDebugParser, "LOCATION_PARSER(endcomment) ");
- _vm->_location._endComment = parseComment(*_locParseCtxt.script);
+ _vm->_location._endComment = parseComment();
}
@@ -1114,26 +1108,25 @@
_numForwardedCommands = 0;
- _locParseCtxt.end = false;
- _locParseCtxt.script = script;
- _locParseCtxt.filename = 0;//filename;
+ ctxt.end = false;
+ this->script = script;
+ ctxt.filename = 0;//filename;
- parser->bind(script);
+ parser->reset();
parser->pushTables(&_locationParsers, _locationStmt);
do {
script->readLineToken(true);
parser->parseStatement();
- } while (!_locParseCtxt.end);
+ } while (!ctxt.end);
parser->popTables();
- parser->unbind();
resolveCommandForwards();
}
-void LocationParser_ns::parseWalkNodes(Script& script, WalkNodeList &list) {
+void LocationParser_ns::parseWalkNodes(WalkNodeList &list) {
debugC(5, kDebugParser, "parseWalkNodes()");
- script.readLineToken(true);
+ script->readLineToken(true);
while (scumm_stricmp(_tokens[0], "ENDNODES")) {
if (!scumm_stricmp(_tokens[0], "COORD")) {
@@ -1146,7 +1139,7 @@
list.push_front(v4);
}
- script.readLineToken(true);
+ script->readLineToken(true);
}
debugC(5, kDebugParser, "parseWalkNodes() done");
@@ -1296,14 +1289,14 @@
// a comment can appear both at location and Zone levels
// comments are displayed into rectangles on the screen
//
-char *LocationParser_ns::parseComment(Script &script) {
+char *LocationParser_ns::parseComment() {
char _tmp_comment[1000] = "\0";
char *v194;
do {
char v190[400];
- v194 = script.readLine(v190, 400);
+ v194 = script->readLine(v190, 400);
v194[strlen(v194)-1] = '\0';
if (!scumm_stricmp(v194, "endtext"))
@@ -1333,18 +1326,18 @@
DECLARE_ZONE_PARSER(limits) {
debugC(7, kDebugParser, "ZONE_PARSER(limits) ");
- _locParseCtxt.z->_left = atoi(_tokens[1]);
- _locParseCtxt.z->_top = atoi(_tokens[2]);
- _locParseCtxt.z->_right = atoi(_tokens[3]);
- _locParseCtxt.z->_bottom = atoi(_tokens[4]);
+ ctxt.z->_left = atoi(_tokens[1]);
+ ctxt.z->_top = atoi(_tokens[2]);
+ ctxt.z->_right = atoi(_tokens[3]);
+ ctxt.z->_bottom = atoi(_tokens[4]);
}
DECLARE_ZONE_PARSER(moveto) {
debugC(7, kDebugParser, "ZONE_PARSER(moveto) ");
- _locParseCtxt.z->_moveTo.x = atoi(_tokens[1]);
- _locParseCtxt.z->_moveTo.y = atoi(_tokens[2]);
+ ctxt.z->_moveTo.x = atoi(_tokens[1]);
+ ctxt.z->_moveTo.y = atoi(_tokens[2]);
}
@@ -1352,12 +1345,12 @@
debugC(7, kDebugParser, "ZONE_PARSER(type) ");
if (_tokens[2][0] != '\0') {
- _locParseCtxt.z->_type = (4 + _vm->_objectsNames->lookup(_tokens[2])) << 16;
+ ctxt.z->_type = (4 + _vm->_objectsNames->lookup(_tokens[2])) << 16;
}
int16 _si = _zoneTypeNames->lookup(_tokens[1]);
if (_si != Table::notFound) {
- _locParseCtxt.z->_type |= 1 << (_si - 1);
- parseZoneTypeBlock(*_locParseCtxt.script, _locParseCtxt.z);
+ ctxt.z->_type |= 1 << (_si - 1);
+ parseZoneTypeBlock(ctxt.z);
}
parser->popTables();
@@ -1367,7 +1360,7 @@
DECLARE_ZONE_PARSER(commands) {
debugC(7, kDebugParser, "ZONE_PARSER(commands) ");
- parseCommands(*_locParseCtxt.script, _locParseCtxt.z->_commands);
+ parseCommands(ctxt.z->_commands);
}
@@ -1375,7 +1368,7 @@
debugC(7, kDebugParser, "ZONE_PARSER(label) ");
// printf("label: %s", _tokens[1]);
- _locParseCtxt.z->_label = _vm->_gfx->renderFloatingLabel(_vm->_labelFont, _tokens[1]);
+ ctxt.z->_label = _vm->_gfx->renderFloatingLabel(_vm->_labelFont, _tokens[1]);
}
@@ -1387,15 +1380,15 @@
do {
char _al = _zoneFlagNames->lookup(_tokens[_si]);
_si++;
- _locParseCtxt.z->_flags |= 1 << (_al - 1);
+ ctxt.z->_flags |= 1 << (_al - 1);
} while (!scumm_stricmp(_tokens[_si++], "|"));
}
-void LocationParser_ns::parseZone(Script &script, ZoneList &list, char *name) {
+void LocationParser_ns::parseZone(ZoneList &list, char *name) {
debugC(5, kDebugParser, "parseZone(name: %s)", name);
if (_vm->findZone(name)) {
- script.skip("endzone");
+ script->skip("endzone");
return;
}
@@ -1403,8 +1396,7 @@
strncpy(z->_name, name, ZONENAME_LENGTH);
- _locParseCtxt.z = z;
- _locParseCtxt.script = &script;
+ ctxt.z = z;
list.push_front(z);
@@ -1416,7 +1408,7 @@
-void LocationParser_ns::parseGetData(Script &script, ZonePtr z) {
+void LocationParser_ns::parseGetData(ZonePtr z) {
GetData *data = new GetData;
@@ -1439,7 +1431,7 @@
data->_icon = 4 + _vm->_objectsNames->lookup(_tokens[1]);
}
- script.readLineToken(true);
+ script->readLineToken(true);
} while (scumm_stricmp(_tokens[0], "endzone"));
z->u.get = data;
@@ -1447,7 +1439,7 @@
}
-void LocationParser_ns::parseExamineData(Script &script, ZonePtr z) {
+void LocationParser_ns::parseExamineData(ZonePtr z) {
ExamineData *data = new ExamineData;
@@ -1457,10 +1449,10 @@
data->_filename = strdup(_tokens[1]);
}
if (!scumm_stricmp(_tokens[0], "desc")) {
- data->_description = parseComment(script);
+ data->_description = parseComment();
}
- script.readLineToken(true);
+ script->readLineToken(true);
} while (scumm_stricmp(_tokens[0], "endzone"));
z->u.examine = data;
@@ -1468,7 +1460,7 @@
}
-void LocationParser_ns::parseDoorData(Script &script, ZonePtr z) {
+void LocationParser_ns::parseDoorData(ZonePtr z) {
DoorData *data = new DoorData;
@@ -1504,7 +1496,7 @@
data->_startFrame = atoi(_tokens[3]);
}
- script.readLineToken(true);
+ script->readLineToken(true);
} while (scumm_stricmp(_tokens[0], "endzone"));
z->u.door = data;
@@ -1512,7 +1504,7 @@
}
-void LocationParser_ns::parseMergeData(Script &script, ZonePtr z) {
+void LocationParser_ns::parseMergeData(ZonePtr z) {
MergeData *data = new MergeData;
@@ -1528,14 +1520,14 @@
data->_obj3 = 4 + _vm->_objectsNames->lookup(_tokens[1]);
}
- script.readLineToken(true);
+ script->readLineToken(true);
} while (scumm_stricmp(_tokens[0], "endzone"));
z->u.merge = data;
}
-void LocationParser_ns::parseHearData(Script &script, ZonePtr z) {
+void LocationParser_ns::parseHearData(ZonePtr z) {
HearData *data = new HearData;
@@ -1549,14 +1541,14 @@
data->_freq = atoi(_tokens[1]);
}
- script.readLineToken(true);
+ script->readLineToken(true);
} while (scumm_stricmp(_tokens[0], "endzone"));
z->u.hear = data;
}
-void LocationParser_ns::parseSpeakData(Script &script, ZonePtr z) {
+void LocationParser_ns::parseSpeakData(ZonePtr z) {
SpeakData *data = new SpeakData;
@@ -1566,10 +1558,10 @@
strcpy(data->_name, _tokens[1]);
}
if (!scumm_stricmp(_tokens[0], "Dialogue")) {
- data->_dialogue = parseDialogue(script);
+ data->_dialogue = parseDialogue();
}
- script.readLineToken(true);
+ script->readLineToken(true);
} while (scumm_stricmp(_tokens[0], "endzone"));
z->u.speak = data;
@@ -1577,37 +1569,37 @@
}
-void LocationParser_ns::parseZoneTypeBlock(Script &script, ZonePtr z) {
+void LocationParser_ns::parseZoneTypeBlock(ZonePtr z) {
debugC(7, kDebugParser, "parseZoneTypeBlock(name: %s, type: %x)", z->_name, z->_type);
switch (z->_type & 0xFFFF) {
case kZoneExamine: // examine Zone alloc
- parseExamineData(script, z);
+ parseExamineData(z);
break;
case kZoneDoor: // door Zone alloc
- parseDoorData(script, z);
+ parseDoorData(z);
break;
case kZoneGet: // get Zone alloc
- parseGetData(script, z);
+ parseGetData(z);
break;
case kZoneMerge: // merge Zone alloc
- parseMergeData(script, z);
+ parseMergeData(z);
break;
case kZoneHear: // hear Zone alloc
- parseHearData(script, z);
+ parseHearData(z);
break;
case kZoneSpeak: // speak Zone alloc
- parseSpeakData(script, z);
+ parseSpeakData(z);
break;
default:
// eats up 'ENDZONE' line for unprocessed zone types
- script.readLineToken(true);
+ script->readLineToken(true);
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list