aboutsummaryrefslogtreecommitdiff
path: root/engines/director/lingo/lingo-lex.l
diff options
context:
space:
mode:
authorEugene Sandulenko2019-12-02 21:24:17 +0100
committerEugene Sandulenko2019-12-02 21:24:17 +0100
commitbbc8b177ed75f83187116ead882a151b5c29c952 (patch)
treec39007ad6681ae6a61df9449795de065642c7d70 /engines/director/lingo/lingo-lex.l
parent6060ec7fcc1982a1f46526197d48c358961466a9 (diff)
downloadscummvm-rg350-bbc8b177ed75f83187116ead882a151b5c29c952.tar.gz
scummvm-rg350-bbc8b177ed75f83187116ead882a151b5c29c952.tar.bz2
scummvm-rg350-bbc8b177ed75f83187116ead882a151b5c29c952.zip
DIRECTOR: LINGO: Resolved grammar conflict for '=' vs tEQ
Diffstat (limited to 'engines/director/lingo/lingo-lex.l')
-rw-r--r--engines/director/lingo/lingo-lex.l8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index c133b866a0..d01849d772 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -253,18 +253,18 @@ whitespace [\t ]
(?i:then) { count(); return tTHEN; }
(?i:then[\n\r]+) { count(); return tTHENNL; }
(?i:to) { count(); return tTO; }
-(?i:sprite) { count(); return tSPRITE; }
+(?i:sprite) { count(); return tSPRITE; }
(?i:with) { count(); return tWITH; }
-(?i:within) { count(); return tWITHIN; }
+(?i:within) { count(); return tWITHIN; }
(?i:when) { count(); return tWHEN; }
-(?i:while) { count(); return tWHILE; }
+(?i:while) { count(); return tWHILE; }
(?i:word) { count(); return tWORD; }
[<][>] { count(); return tNEQ; }
[>][=] { count(); return tGE; }
[<][=] { count(); return tLE; }
[&][&] { count(); return tCONCAT; }
-[=] { count(); return g_lingo->_inCond ? tEQ : '='; }
+[=] { count(); return tEQ; }
{identifier} {
count();