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

DIRECTOR: Lingo: Renamed UNDEF -> VOID

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-06-21 11:23:36 +02:00
parent fc144c716c
commit 8fb7aaf4a0
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/director/lingo/lingo-code.cpp
View File

@ -98,7 +98,7 @@ void Lingo::c_varpush() {
sym = new Symbol;
sym->name = (char *)calloc(strlen(name) + 1, 1);
Common::strlcpy(sym->name, name, strlen(name) + 1);
sym->type = UNDEF;
sym->type = VOID;
sym->u.val = 0;
g_lingo->_vars[name] = sym;
@ -118,7 +118,7 @@ void Lingo::c_assign() {
d1 = g_lingo->pop();
d2 = g_lingo->pop();
if (d1.sym->type != VAR && d1.sym->type != UNDEF) {
if (d1.sym->type != VAR && d1.sym->type != VOID) {
warning("assignment to non-variable '%s'", d1.sym->name);
return;
}
@ -129,13 +129,13 @@ void Lingo::c_assign() {
}
bool Lingo::verify(Symbol *s) {
if (s->type != VAR && s->type != UNDEF) {
if (s->type != VAR && s->type != VOID) {
warning("attempt to evaluate non-variable '%s'", s->name);
return false;
}
if (s->type == UNDEF) {
if (s->type == VOID) {
warning("undefined variable '%s'", s->name);
return false;

8
engines/director/lingo/lingo-gr.cpp
View File

@ -67,7 +67,7 @@
know about them. */
enum yytokentype {
UNARY = 258,
UNDEF = 259,
VOID = 259,
INT = 260,
FLOAT = 261,
VAR = 262,
@ -99,7 +99,7 @@
#endif
/* Tokens. */
#define UNARY 258
#define UNDEF 259
#define VOID 259
#define INT 260
#define FLOAT 261
#define VAR 262
@ -511,7 +511,7 @@ static const yytype_uint8 yyrline[] =
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
{
"$end", "error", "$undefined", "UNARY", "UNDEF", "INT", "FLOAT", "VAR",
"$end", "error", "$undefined", "UNARY", "VOID", "INT", "FLOAT", "VAR",
"STRING", "tIF", "tELSE", "tEND", "tFRAME", "tGO", "tINTO", "tLOOP",
"tMCI", "tMCIWAIT", "tMOVIE", "tNEXT", "tOF", "tPREVIOUS", "tPUT",
"tSET", "tTHEN", "tTO", "tGE", "tLE", "tGT", "tLT", "tEQ", "tNEQ", "'='",
@ -1937,6 +1937,6 @@ yyreturn:
}
#line 215 "engines/director/lingo/lingo-gr.y"
#line 228 "engines/director/lingo/lingo-gr.y"

4
engines/director/lingo/lingo-gr.h
View File

@ -40,7 +40,7 @@
know about them. */
enum yytokentype {
UNARY = 258,
UNDEF = 259,
VOID = 259,
INT = 260,
FLOAT = 261,
VAR = 262,
@ -72,7 +72,7 @@
#endif
/* Tokens. */
#define UNARY 258
#define UNDEF 259
#define VOID 259
#define INT 260
#define FLOAT 261
#define VAR 262

2
engines/director/lingo/lingo-gr.y
View File

@ -69,7 +69,7 @@ using namespace Director;
int code;
}
%token UNARY UNDEF
%token UNARY VOID
%token<i> INT
%token<f> FLOAT
%token<s> VAR STRING

2
engines/director/lingo/lingo.cpp
View File

@ -69,7 +69,7 @@ struct EventHandlerType {
Symbol::Symbol() {
name = NULL;
type = UNDEF;
type = VOID;
u.str = NULL;
}