[Scummvm-cvs-logs] SF.net SVN: scummvm:[39890] scummvm/trunk/engines/gob
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Apr 7 15:29:13 CEST 2009
Revision: 39890
http://scummvm.svn.sourceforge.net/scummvm/?rev=39890&view=rev
Author: fingolfin
Date: 2009-04-07 13:29:13 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
GOB: Some more cleanup
Modified Paths:
--------------
scummvm/trunk/engines/gob/parse.cpp
scummvm/trunk/engines/gob/parse.h
scummvm/trunk/engines/gob/parse_v1.cpp
scummvm/trunk/engines/gob/parse_v2.cpp
Modified: scummvm/trunk/engines/gob/parse.cpp
===================================================================
--- scummvm/trunk/engines/gob/parse.cpp 2009-04-07 13:21:20 UTC (rev 39889)
+++ scummvm/trunk/engines/gob/parse.cpp 2009-04-07 13:29:13 UTC (rev 39890)
@@ -118,7 +118,7 @@
_vm->_global->_inter_execPtr += 2;
if (*_vm->_global->_inter_execPtr == 13) {
_vm->_global->_inter_execPtr++;
- skipExpr(12);
+ skipExpr(OP_END_MARKER);
}
break;
@@ -134,17 +134,17 @@
_vm->_global->_inter_execPtr += 3 + dimCount;
// skip indices
for (dim = 0; dim < dimCount; dim++)
- skipExpr(12);
+ skipExpr(OP_END_MARKER);
if ((operation == OP_ARRAY_STR) && (*_vm->_global->_inter_execPtr == 13)) {
_vm->_global->_inter_execPtr++;
- skipExpr(12);
+ skipExpr(OP_END_MARKER);
}
break;
case OP_FUNC:
_vm->_global->_inter_execPtr++;
- skipExpr(10);
+ skipExpr(OP_END_EXPR);
}
continue;
} // if ((operation >= OP_ARRAY_UINT8) && (operation <= OP_FUNC))
@@ -166,7 +166,7 @@
if (operation != stopToken)
continue;
- if ((stopToken != 10) || (num < 0))
+ if ((stopToken != OP_END_EXPR) || (num < 0))
return;
}
}
@@ -235,7 +235,7 @@
if (*_vm->_global->_inter_execPtr == 13) {
_vm->_global->_inter_execPtr++;
debugN(5, "{");
- printExpr_internal(12); // this also prints the closing }
+ printExpr_internal(OP_END_MARKER); // this also prints the closing }
}
break;
@@ -252,7 +252,7 @@
arrDesc = _vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr += dimCount;
for (dim = 0; dim < dimCount; dim++) {
- printExpr_internal(12);
+ printExpr_internal(OP_END_MARKER);
debugN(5, " of %d", (int16) arrDesc[dim]);
if (dim != dimCount - 1)
debugN(5, ",");
@@ -264,7 +264,7 @@
if ((operation == OP_ARRAY_STR) && (*_vm->_global->_inter_execPtr == 13)) {
_vm->_global->_inter_execPtr++;
debugN(5, "{");
- printExpr_internal(12); // this also prints the closing }
+ printExpr_internal(OP_END_MARKER); // this also prints the closing }
}
break;
@@ -280,7 +280,7 @@
debugN(5, "sqrt(");
else
debugN(5, "id(");
- printExpr_internal(10);
+ printExpr_internal(OP_END_EXPR);
break;
}
continue;
@@ -368,9 +368,9 @@
debugN(5, "\n");
break;
- case 12:
+ case OP_END_MARKER:
debugN(5, "}");
- if (stopToken != 12) {
+ if (stopToken != OP_END_MARKER) {
debugN(5, "Closing paren without opening?");
}
break;
@@ -396,7 +396,7 @@
num--;
if (operation == stopToken) {
- if ((stopToken != 10) || (num < 0)) {
+ if ((stopToken != OP_END_EXPR) || (num < 0)) {
return;
}
}
@@ -422,7 +422,7 @@
if ((operation == OP_LOAD_VAR_STR) && (*_vm->_global->_inter_execPtr == 13)) {
_vm->_global->_inter_execPtr++;
debugN(5, "+");
- printExpr(12);
+ printExpr(OP_END_MARKER);
}
break;
@@ -433,7 +433,7 @@
arrDesc = _vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr += dimCount;
for (dim = 0; dim < dimCount; dim++) {
- printExpr(12);
+ printExpr(OP_END_MARKER);
debugN(5, " of %d", (int16) arrDesc[dim]);
if (dim != dimCount - 1)
debugN(5, ",");
@@ -443,7 +443,7 @@
if ((operation == OP_ARRAY_STR) && (*_vm->_global->_inter_execPtr == 13)) {
_vm->_global->_inter_execPtr++;
debugN(5, "+");
- printExpr(12);
+ printExpr(OP_END_MARKER);
}
break;
Modified: scummvm/trunk/engines/gob/parse.h
===================================================================
--- scummvm/trunk/engines/gob/parse.h 2009-04-07 13:21:20 UTC (rev 39889)
+++ scummvm/trunk/engines/gob/parse.h 2009-04-07 13:29:13 UTC (rev 39890)
@@ -41,7 +41,9 @@
OP_END_EXPR = 10,
OP_NOT = 11,
+ OP_END_MARKER = 12, // Marks end of an array or string
+
OP_ARRAY_UINT8 = 16,
// FIXME: OP_LOAD_VAR_UINT16 comment says "uint16 variable load" in
Modified: scummvm/trunk/engines/gob/parse_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/parse_v1.cpp 2009-04-07 13:21:20 UTC (rev 39889)
+++ scummvm/trunk/engines/gob/parse_v1.cpp 2009-04-07 13:29:13 UTC (rev 39890)
@@ -56,7 +56,7 @@
if ((operation == OP_LOAD_VAR_STR) && (*_vm->_global->_inter_execPtr == 13)) {
_vm->_global->_inter_execPtr++;
- val = parseValExpr(12);
+ val = parseValExpr(OP_END_MARKER);
temp += val;
debugC(5, kDebugParser, "parse subscript = %d", val);
}
@@ -70,7 +70,7 @@
_vm->_global->_inter_execPtr += dimCount;
offset = 0;
for (dim = 0; dim < dimCount; dim++) {
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
offset = arrDesc[dim] * offset + temp2;
}
offset *= 4;
@@ -79,7 +79,7 @@
if (*_vm->_global->_inter_execPtr == 13) {
_vm->_global->_inter_execPtr++;
- temp += parseValExpr(12);
+ temp += parseValExpr(OP_END_MARKER);
}
return offset * _vm->_global->_inter_animDataSize + temp;
@@ -140,7 +140,7 @@
case OP_LOAD_VAR_STR:
temp = _vm->_inter->load16() * 4;
_vm->_global->_inter_execPtr++;
- temp += parseValExpr(12);
+ temp += parseValExpr(OP_END_MARKER);
*valPtr = READ_VARO_UINT8(temp);
break;
@@ -152,14 +152,14 @@
_vm->_global->_inter_execPtr += dimCount;
offset = 0;
for (dim = 0; dim < dimCount; dim++) {
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
offset = arrDesc[dim] * offset + temp2;
}
if (operation == OP_ARRAY_UINT32) {
*valPtr = (uint16) VAR(temp + offset);
} else {
_vm->_global->_inter_execPtr++;
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
*valPtr = READ_VARO_UINT8(temp * 4 + offset * 4 *
_vm->_global->_inter_animDataSize + temp2);
}
@@ -167,7 +167,7 @@
case OP_FUNC:
operation = *_vm->_global->_inter_execPtr++;
- parseExpr(10, 0);
+ parseExpr(OP_END_EXPR, 0);
if (operation == FUNC_SQR) {
_vm->_global->_inter_resVal =
@@ -379,7 +379,7 @@
kInterVar);
if (*_vm->_global->_inter_execPtr == 13) {
_vm->_global->_inter_execPtr++;
- temp += parseValExpr(12);
+ temp += parseValExpr(OP_END_MARKER);
*operPtr = OP_LOAD_IMM_INT16;
*valPtr = READ_VARO_UINT8(temp);
}
@@ -395,7 +395,7 @@
offset = 0;
dim = 0;
for (dim = 0; dim < dimCount; dim++) {
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
offset = offset * arrDescPtr[dim] + temp2;
}
@@ -408,7 +408,7 @@
kInterVar);
if (*_vm->_global->_inter_execPtr == 13) {
_vm->_global->_inter_execPtr++;
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
*operPtr = OP_LOAD_IMM_INT16;
*valPtr = READ_VARO_UINT8(temp * 4 +
offset * 4 * _vm->_global->_inter_animDataSize + temp2);
@@ -417,7 +417,7 @@
case OP_FUNC:
operation = *_vm->_global->_inter_execPtr++;
- parseExpr(10, 0);
+ parseExpr(OP_END_EXPR, 0);
switch (operation) {
case FUNC_SQR:
@@ -473,7 +473,7 @@
continue;
switch (operPtr[-1]) {
- case 2:
+ case OP_ADD:
if (operPtr[-2] == OP_LOAD_IMM_STR) {
if ((char *) decodePtr(valPtr[-2]) != _vm->_global->_inter_resStr) {
strcpy(_vm->_global->_inter_resStr, (char *) decodePtr(valPtr[-2]));
@@ -734,7 +734,7 @@
if (((operation == OP_OR) && (operPtr[-1] == GOB_TRUE)) ||
((operation == OP_AND) && (operPtr[-1] == GOB_FALSE))) {
if ((stkPos > 1) && (operPtr[-2] == OP_BEGIN_EXPR)) {
- skipExpr(10);
+ skipExpr(OP_END_EXPR);
operPtr[-2] = operPtr[-1];
stkPos -= 2;
operPtr -= 2;
Modified: scummvm/trunk/engines/gob/parse_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/parse_v2.cpp 2009-04-07 13:21:20 UTC (rev 39889)
+++ scummvm/trunk/engines/gob/parse_v2.cpp 2009-04-07 13:29:13 UTC (rev 39890)
@@ -85,7 +85,7 @@
uint16 var_6 = 0;
for (int i = 0; i < var_A; i++) {
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
int16 ax = sub_12063(temp2, var_12[i], varPos, 0, 0);
@@ -122,7 +122,7 @@
_vm->_global->_inter_execPtr += dimCount;
offset = 0;
for (dim = 0; dim < dimCount; dim++) {
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
offset = arrDesc[dim] * offset + temp2;
}
if (operation == OP_ARRAY_UINT8)
@@ -135,7 +135,7 @@
offset *= 4;
if (*_vm->_global->_inter_execPtr == 13) {
_vm->_global->_inter_execPtr++;
- temp += parseValExpr(12);
+ temp += parseValExpr(OP_END_MARKER);
}
return varPos + offset * _vm->_global->_inter_animDataSize + temp;
@@ -153,7 +153,7 @@
(int16) *_vm->_global->_inter_execPtr);
if ((operation == OP_LOAD_VAR_STR) && (*_vm->_global->_inter_execPtr == 13)) {
_vm->_global->_inter_execPtr++;
- val = parseValExpr(12);
+ val = parseValExpr(OP_END_MARKER);
temp += val;
debugC(5, kDebugParser, "parse subscript = %d", val);
}
@@ -216,7 +216,7 @@
uint16 var_6 = 0;
for (int i = 0; i < var_A; i++) {
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
int16 ax = sub_12063(temp2, var_12[i], varPos, 0, 0);
@@ -250,7 +250,7 @@
_vm->_global->_inter_execPtr += dimCount;
offset = 0;
for (dim = 0; dim < dimCount; dim++) {
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
offset = arrDesc[dim] * offset + temp2;
}
if (operation == OP_ARRAY_UINT8)
@@ -261,7 +261,7 @@
*valPtr = READ_VARO_UINT16(varPos + temp * 2 + offset * 2);
else if (operation == OP_ARRAY_STR) {
_vm->_global->_inter_execPtr++;
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
*valPtr = READ_VARO_UINT8(varPos + temp * 4 +
offset * 4 * _vm->_global->_inter_animDataSize + temp2);
}
@@ -299,13 +299,13 @@
case OP_LOAD_VAR_STR:
temp = _vm->_inter->load16() * 4;
_vm->_global->_inter_execPtr++;
- temp += parseValExpr(12);
+ temp += parseValExpr(OP_END_MARKER);
*valPtr = READ_VARO_UINT8(varPos + temp);
break;
case OP_FUNC:
operation = *_vm->_global->_inter_execPtr++;
- parseExpr(10, 0);
+ parseExpr(OP_END_EXPR, 0);
if (operation == FUNC_SQR) {
_vm->_global->_inter_resVal =
@@ -508,7 +508,7 @@
uint16 var_6 = 0;
for (int i = 0; i < var_A; i++) {
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
int16 ax = sub_12063(temp2, var_12[i], varPos, 0, 0);
@@ -543,7 +543,7 @@
_vm->_global->_inter_execPtr += dimCount;
offset = 0;
for (dim = 0; dim < dimCount; dim++) {
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
offset = offset * arrDescPtr[dim] + temp2;
}
if (operation == OP_ARRAY_UINT8)
@@ -558,7 +558,7 @@
kInterVar);
if (*_vm->_global->_inter_execPtr == 13) {
_vm->_global->_inter_execPtr++;
- temp2 = parseValExpr(12);
+ temp2 = parseValExpr(OP_END_MARKER);
*operPtr = OP_LOAD_IMM_INT16;
*valPtr = READ_VARO_UINT8(varPos + temp * 4 +
offset * 4 * _vm->_global->_inter_animDataSize + temp2);
@@ -615,7 +615,7 @@
*valPtr = encodePtr(_vm->_inter->_variables->getAddressOff8(varPos + temp, 0), kInterVar);
if (*_vm->_global->_inter_execPtr == 13) {
_vm->_global->_inter_execPtr++;
- temp += parseValExpr(12);
+ temp += parseValExpr(OP_END_MARKER);
*operPtr = OP_LOAD_IMM_INT16;
*valPtr = READ_VARO_UINT8(varPos + temp);
}
@@ -623,7 +623,7 @@
case OP_FUNC:
operation = *_vm->_global->_inter_execPtr++;
- parseExpr(10, 0);
+ parseExpr(OP_END_EXPR, 0);
switch (operation) {
case FUNC_SQRT1:
@@ -951,7 +951,7 @@
if (((operation == OP_OR) && (operPtr[-1] == GOB_TRUE)) ||
((operation == OP_AND) && (operPtr[-1] == GOB_FALSE))) {
if ((stkPos > 1) && (operPtr[-2] == OP_BEGIN_EXPR)) {
- skipExpr(10);
+ skipExpr(OP_END_EXPR);
operPtr[-2] = operPtr[-1];
stkPos -= 2;
operPtr -= 2;
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