diff options
| author | Eugene Sandulenko | 2016-07-09 13:09:25 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-08-03 23:40:36 +0200 |
| commit | 82f78708e78254a6a5c80e1265724b75594e2389 (patch) | |
| tree | 1dc045f660d2ca1b6ea5e919f82f91ab40eec389 /engines/director/lingo/lingo-lex.l | |
| parent | 458d1e5f78372b39768c21b20b99a6eb498a4029 (diff) | |
| download | scummvm-rg350-82f78708e78254a6a5c80e1265724b75594e2389.tar.gz scummvm-rg350-82f78708e78254a6a5c80e1265724b75594e2389.tar.bz2 scummvm-rg350-82f78708e78254a6a5c80e1265724b75594e2389.zip | |
DIRECTOR: Lingo: Fixed <> operator, added logical operations and &&
Diffstat (limited to 'engines/director/lingo/lingo-lex.l')
| -rw-r--r-- | engines/director/lingo/lingo-lex.l | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l index 7b04c6b472..d241993d53 100644 --- a/engines/director/lingo/lingo-lex.l +++ b/engines/director/lingo/lingo-lex.l @@ -61,6 +61,7 @@ whitespace [\t ] ^{whitespace}+ { count(); } [\t]+ { count(); return ' '; } +(?i:and) { count(); return tAND; } (?i:down) { count(); return tDOWN; } (?i:if) { count(); return tIF; } (?i:[\n\r]+[\t ]+else[\t ]+if) { countnl(); return tNLELSIF; } @@ -78,7 +79,9 @@ whitespace [\t ] (?i:mciwait) { count(); return tMCIWAIT; } (?i:movie) { count(); return tMOVIE; } (?i:next) { count(); return tNEXT; } +(?i:not) { count(); return tNOT; } (?i:of) { count(); return tOF; } +(?i:or) { count(); return tOR; } (?i:previous) { count(); return tPREVIOUS; } (?i:put) { count(); return tPUT; } (?i:repeat) { count(); return tREPEAT; } @@ -88,9 +91,10 @@ whitespace [\t ] (?i:with) { count(); return tWITH; } (?i:while) { count(); return tWHILE; } -[!][=] { count(); return tNEQ; } +[<][>] { count(); return tNEQ; } [>][=] { count(); return tGE; } [<][=] { count(); return tLE; } +[&][&] { count(); return tCONCAT; } {identifier} { count(); |