[Scummvm-git-logs] scummvm master -> 4b8a64d7fc9bcfdfddee39a45af9d529a2913227

[moralrecordings]

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:
4b8a64d7fc DIRECTOR: LINGO: Remove extra arg-injecting code


Commit: 4b8a64d7fc9bcfdfddee39a45af9d529a2913227
    https://github.com/scummvm/scummvm/commit/4b8a64d7fc9bcfdfddee39a45af9d529a2913227
Author: Scott Percival (code at moral.net.au)
Date: 2020-05-31T19:12:41+08:00

Commit Message:
DIRECTOR: LINGO: Remove extra arg-injecting code

Changed paths:
    engines/director/lingo/lingo-codegen.cpp
    engines/director/lingo/lingo-gr.cpp
    engines/director/lingo/lingo-gr.y
    engines/director/lingo/lingo.h


diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index 2b073c025b..a767b1fb16 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -348,14 +348,6 @@ void Lingo::clearArgStack() {
 	_argstack.clear();
 }
 
-void Lingo::codeArgStore() {
-	for (int i = _argstack.size() - 1; i >= 0; i--) {
-		code1(LC::c_varpush);
-		codeString(_argstack[i]->c_str());
-		code1(LC::c_assign);
-	}
-}
-
 int Lingo::codeSetImmediate(bool state) {
 	g_lingo->_immediateMode = state;
 
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index 99c1075bce..cd50b95c61 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -3439,7 +3439,7 @@ yyreduce:
 
   case 165:
 #line 736 "engines/director/lingo/lingo-gr.y"
-                                        { g_lingo->codeArgStore(); inDef(); }
+                                        { inDef(); }
 #line 3444 "engines/director/lingo/lingo-gr.cpp"
     break;
 
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 7abdaa4af8..c269eb0cb1 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -733,7 +733,7 @@ endargdef:	/* nothing */
 	| ID						{ delete $ID; }
 	| endargdef ',' ID			{ delete $ID; }
 
-argstore:	  /* nothing */		{ g_lingo->codeArgStore(); inDef(); }
+argstore:	  /* nothing */		{ inDef(); }
 
 macro: ID nonemptyarglist		{
 		g_lingo->code1(LC::c_call);
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index bdd6387a86..df8da02e79 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -358,7 +358,6 @@ public:
 	}
 
 	void codeArg(Common::String *s);
-	void codeArgStore();
 	int codeSetImmediate(bool state);
 	int codeFunc(Common::String *s, int numpar);
 	int codeMe(Common::String *method, int numpar);