diff options
| author | Eugene Sandulenko | 2016-08-05 07:47:21 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-08-05 07:49:00 +0200 |
| commit | b60c5d927e6d4a86660937f8426cf557e7e90f7e (patch) | |
| tree | 50191cf04f570db6b4dd27506f42de70e61800d0 /engines/director/lingo/lingo-lex.cpp | |
| parent | 8a6b82a91978bd3b35a8e5dbfd842710b65f2a59 (diff) | |
| download | scummvm-rg350-b60c5d927e6d4a86660937f8426cf557e7e90f7e.tar.gz scummvm-rg350-b60c5d927e6d4a86660937f8426cf557e7e90f7e.tar.bz2 scummvm-rg350-b60c5d927e6d4a86660937f8426cf557e7e90f7e.zip | |
DIRECTOR: Lingo: Revert adding prefix 'v' to all Symbol types.
Diffstat (limited to 'engines/director/lingo/lingo-lex.cpp')
| -rw-r--r-- | engines/director/lingo/lingo-lex.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index 35ae9c6db4..1cdd8a7267 100644 --- a/engines/director/lingo/lingo-lex.cpp +++ b/engines/director/lingo/lingo-lex.cpp @@ -1209,9 +1209,9 @@ YY_RULE_SETUP yylval.e[1] = g_lingo->_theEntityFields[field]->field; if (g_lingo->_theEntities[ptr]->hasId) - return vTHEENTITYWITHID; + return THEENTITYWITHID; else - return vTHEENTITY; + return THEENTITY; } warning("Unhandled the entity %s", ptr); @@ -1232,9 +1232,9 @@ YY_RULE_SETUP yylval.e[1] = 0; // No field if (g_lingo->_theEntities[ptr]->hasId) - return vTHEENTITYWITHID; + return THEENTITYWITHID; else - return vTHEENTITY; + return THEENTITY; } warning("Unhandled the entity %s", ptr); @@ -1303,8 +1303,8 @@ YY_RULE_SETUP yylval.s = new Common::String(yytext); if (g_lingo->_handlers.contains(yytext)) { - if (g_lingo->_handlers[yytext]->type == vBLTIN && g_lingo->_handlers[yytext]->nargs == -1) - return vBLTINNOARGS; + if (g_lingo->_handlers[yytext]->type == BLTIN && g_lingo->_handlers[yytext]->nargs == -1) + return BLTINNOARGS; } return ID; @@ -1313,12 +1313,12 @@ YY_RULE_SETUP case 54: YY_RULE_SETUP #line 194 "engines/director/lingo/lingo-lex.l" -{ count(); yylval.f = atof(yytext); return vFLOAT; } +{ count(); yylval.f = atof(yytext); return FLOAT; } YY_BREAK case 55: YY_RULE_SETUP #line 195 "engines/director/lingo/lingo-lex.l" -{ count(); yylval.i = strtol(yytext, NULL, 10); return vINT; } +{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; } YY_BREAK case 56: YY_RULE_SETUP @@ -1334,7 +1334,7 @@ YY_RULE_SETUP case 58: YY_RULE_SETUP #line 198 "engines/director/lingo/lingo-lex.l" -{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return vSTRING; } +{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; } YY_BREAK case 59: YY_RULE_SETUP |