DIRECTOR: Lingo: Parsing of macro calls without parens.

scummvm · Aug 3, 2016 · 3e0bf3a · 3e0bf3a
1 parent 24a2582
commit 3e0bf3a
Show file tree

Hide file tree

Showing 4 changed files with 226 additions and 197 deletions.
diff --git a/engines/director/director.cpp b/engines/director/director.cpp
@@ -95,6 +95,7 @@ put par3\n\
 ", kMovieScript, 5);
 
 _lingo->addCode("check(1, 2, 3)\n\
+check 4, 5, 6\n\
 ", kMovieScript, 2);
 
 _lingo->executeScript(kMovieScript, 2);

diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
@@ -120,16 +120,10 @@ int Lingo::codeId(Common::String &s) {
 int Lingo::codeId_(Common::String &name) {
 	int ret;
 
-	if (_handlers.contains(name)) { // This is a call
-		ret = code1(c_call);
-		codeString(name.c_str());
-		code1((inst)0);	// Zero arguments
-	} else {
-		ret = code1(c_varpush);
+	ret = code1(c_varpush);
 
-		codeString(name.c_str());
-		code1(c_eval);
-	}
+	codeString(name.c_str());
+	code1(c_eval);
 
 	return ret;
 }