[Scummvm-git-logs] scummvm master -> ec8ea8bfadfbe3d6da43c293a6ce74a5f16a35a1

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ec8ea8bfad DIRECTOR: LINGO: More robust simple macro preprocessing


Commit: ec8ea8bfadfbe3d6da43c293a6ce74a5f16a35a1
    https://github.com/scummvm/scummvm/commit/ec8ea8bfadfbe3d6da43c293a6ce74a5f16a35a1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-16T00:30:27+02:00

Commit Message:
DIRECTOR: LINGO: More robust simple macro preprocessing

Changed paths:
    engines/director/lingo/lingo-preprocessor.cpp


diff --git a/engines/director/lingo/lingo-preprocessor.cpp b/engines/director/lingo/lingo-preprocessor.cpp
index 03bef562f1..f8d8a21ba2 100644
--- a/engines/director/lingo/lingo-preprocessor.cpp
+++ b/engines/director/lingo/lingo-preprocessor.cpp
@@ -666,7 +666,10 @@ Common::String preprocessSimpleMacro(Common::String in) {
 	Common::String next = nexttok(in.c_str(), &second);
 
 	if (!next.empty() && Common::isAlpha(next[0]))
-		if (nexttok(second).empty() && !next.equals("end") && !next.equals("exit") && !next.equals("else")) {
+		if (nexttok(second).empty() && // Filter out possible standalone tokens
+				!next.equalsIgnoreCase("end") &&
+				!next.equalsIgnoreCase("exit") &&
+				!next.equalsIgnoreCase("else")) {
 			debugC(2, kDebugParse | kDebugPreprocess, "MACRO: in: %s\nout: %s()", in.c_str(), in.c_str());
 
 			return in + "()";