diff options
| author | Eugene Sandulenko | 2017-02-07 10:55:02 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-02-07 10:55:02 +0100 |
| commit | b0cd2a9016f21a95a27afbde7515541761aa60d0 (patch) | |
| tree | 77d5debc626354b41cbbef0f064337ef46760b02 /engines/director/lingo | |
| parent | 54aac6a03c1e655e13ccebeca2ea2a77d2c95382 (diff) | |
| download | scummvm-rg350-b0cd2a9016f21a95a27afbde7515541761aa60d0.tar.gz scummvm-rg350-b0cd2a9016f21a95a27afbde7515541761aa60d0.tar.bz2 scummvm-rg350-b0cd2a9016f21a95a27afbde7515541761aa60d0.zip | |
DIRECTOR: Lingo: Fix lexer for built-ins detection
Diffstat (limited to 'engines/director/lingo')
| -rw-r--r-- | engines/director/lingo/lingo-lex.cpp | 8 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-lex.l | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index 8675768fb1..1598a2758e 100644 --- a/engines/director/lingo/lingo-lex.cpp +++ b/engines/director/lingo/lingo-lex.cpp @@ -1472,16 +1472,16 @@ YY_RULE_SETUP if (g_lingo->_builtins[yytext]->maxArgs == 0) return type == BLTIN ? BLTINNOARGS : FBLTINNOARGS; else if (g_lingo->_builtins[yytext]->maxArgs == 1) - return type == BLTINNOARGSORONE; + return BLTINNOARGSORONE; else - return type == BLTINARGLIST; + return BLTINARGLIST; } else if (g_lingo->_builtins[yytext]->nargs == 1 && g_lingo->_builtins[yytext]->maxArgs == 1) { return type == BLTIN ? BLTINONEARG : FBLTINONEARG; } else if (g_lingo->_builtins[yytext]->nargs == -1) { - return type == BLTINARGLIST; + return BLTINARGLIST; } else { - return type == BLTINARGLIST; + return BLTINARGLIST; } } } diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l index 5b93a46fc5..a4134b81c0 100644 --- a/engines/director/lingo/lingo-lex.l +++ b/engines/director/lingo/lingo-lex.l @@ -274,16 +274,16 @@ whitespace [\t ] if (g_lingo->_builtins[yytext]->maxArgs == 0) return type == BLTIN ? BLTINNOARGS : FBLTINNOARGS; else if (g_lingo->_builtins[yytext]->maxArgs == 1) - return type == BLTINNOARGSORONE; + return BLTINNOARGSORONE; else - return type == BLTINARGLIST; + return BLTINARGLIST; } else if (g_lingo->_builtins[yytext]->nargs == 1 && g_lingo->_builtins[yytext]->maxArgs == 1) { return type == BLTIN ? BLTINONEARG : FBLTINONEARG; } else if (g_lingo->_builtins[yytext]->nargs == -1) { - return type == BLTINARGLIST; + return BLTINARGLIST; } else { - return type == BLTINARGLIST; + return BLTINARGLIST; } } } |