[Scummvm-git-logs] scummvm master -> 34393fde5efea6fde0049bb7eb5cf203e6e80118

[djsrv]

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

Summary:
f49480425d DIRECTOR: LINGO: Adjust c_eval to var changes
34393fde5e DIRECTOR: LINGO: Remove c_lazyeval


Commit: f49480425d961017e3fbb1430b8b7d69714902cb
    https://github.com/scummvm/scummvm/commit/f49480425d961017e3fbb1430b8b7d69714902cb
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-20T23:41:28-04:00

Commit Message:
DIRECTOR: LINGO: Adjust c_eval to var changes

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


diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 0b187671eb..68f0c15804 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -500,7 +500,7 @@ void LC::c_eval() {
 	LC::c_varpush();
 
 	Datum d;
-	d = g_lingo->pop();
+	d = g_lingo->pop(false);
 
 	if (d.type != VAR) { // It could be cast ref
 		g_lingo->push(d);


Commit: 34393fde5efea6fde0049bb7eb5cf203e6e80118
    https://github.com/scummvm/scummvm/commit/34393fde5efea6fde0049bb7eb5cf203e6e80118
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-20T23:41:51-04:00

Commit Message:
DIRECTOR: LINGO: Remove c_lazyeval

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


diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 68f0c15804..27eff974b0 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -99,7 +99,6 @@ static struct FuncDescr {
 	{ LC::c_itemToOf,		"c_itemToOf",		"" },	// D3
 	{ LC::c_jump,			"c_jump",			"o" },
 	{ LC::c_jumpifz,		"c_jumpifz",		"o" },
-	{ LC::c_lazyeval,		"c_lazyeval",			"s" },
 	{ LC::c_le,				"c_le",				"" },
 	{ LC::c_lineOf,			"c_lineOf",			"" },	// D3
 	{ LC::c_lineToOf,		"c_lineToOf",		"" },	// D3
@@ -512,14 +511,6 @@ void LC::c_eval() {
 	g_lingo->push(d);
 }
 
-void LC::c_lazyeval() {
-	LC::c_varpush();
-
-	Datum d;
-	d = g_lingo->pop();
-	g_lingo->push(d);
-}
-
 void LC::c_theentitypush() {
 	Datum id = g_lingo->pop();
 
diff --git a/engines/director/lingo/lingo-code.h b/engines/director/lingo/lingo-code.h
index ea3ab0916b..3b3916ba7d 100644
--- a/engines/director/lingo/lingo-code.h
+++ b/engines/director/lingo/lingo-code.h
@@ -83,7 +83,6 @@ void c_stackdrop();
 void c_assign();
 bool verify(const Symbol &s);
 void c_eval();
-void c_lazyeval();
 void c_setImmediate();
 
 void c_swap();
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index 3ef87b1ef7..b9f6de8dc0 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -2679,7 +2679,7 @@ yyreduce:
   case 83: /* simpleexprnoparens: ID '(' ID ')'  */
 #line 614 "engines/director/lingo/lingo-gr.y"
                                       {
-			g_lingo->code1(LC::c_lazyeval);
+			g_lingo->code1(LC::c_varpush);
 			g_lingo->codeString((yyvsp[-1].s)->c_str());
 			g_lingo->codeFunc((yyvsp[-3].s), 1);
 			delete (yyvsp[-3].s);
@@ -2689,7 +2689,7 @@ yyreduce:
 
   case 84: /* $@10: %empty  */
 #line 620 "engines/director/lingo/lingo-gr.y"
-                                      { g_lingo->code1(LC::c_lazyeval); g_lingo->codeString((yyvsp[-1].s)->c_str()); }
+                                      { g_lingo->code1(LC::c_varpush); g_lingo->codeString((yyvsp[-1].s)->c_str()); }
 #line 2694 "engines/director/lingo/lingo-gr.cpp"
     break;
 
@@ -2999,7 +2999,7 @@ yyreduce:
   case 134: /* proc: ID '(' ID ')'  */
 #line 705 "engines/director/lingo/lingo-gr.y"
                                       {
-			g_lingo->code1(LC::c_lazyeval);
+			g_lingo->code1(LC::c_varpush);
 			g_lingo->codeString((yyvsp[-1].s)->c_str());
 			g_lingo->codeCmd((yyvsp[-3].s), 1);
 			delete (yyvsp[-3].s);
@@ -3009,7 +3009,7 @@ yyreduce:
 
   case 135: /* $@14: %empty  */
 #line 711 "engines/director/lingo/lingo-gr.y"
-                                      { g_lingo->code1(LC::c_lazyeval); g_lingo->codeString((yyvsp[-1].s)->c_str()); }
+                                      { g_lingo->code1(LC::c_varpush); g_lingo->codeString((yyvsp[-1].s)->c_str()); }
 #line 3014 "engines/director/lingo/lingo-gr.cpp"
     break;
 
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 41664374cf..47950975d1 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -612,12 +612,12 @@ simpleexprnoparens: INT		{
     | tSPRITE expr tWITHIN simpleexpr		{ g_lingo->code1(LC::c_within); }
 	| list
 	| ID[func] '(' ID[method] ')' {
-			g_lingo->code1(LC::c_lazyeval);
+			g_lingo->code1(LC::c_varpush);
 			g_lingo->codeString($method->c_str());
 			g_lingo->codeFunc($func, 1);
 			delete $func;
 			delete $method; }
-	| ID[func] '(' ID[method] ',' { g_lingo->code1(LC::c_lazyeval); g_lingo->codeString($method->c_str()); }
+	| ID[func] '(' ID[method] ',' { g_lingo->code1(LC::c_varpush); g_lingo->codeString($method->c_str()); }
 				nonemptyarglist ')' {
 			g_lingo->codeFunc($func, $nonemptyarglist + 1);
 			delete $func;
@@ -703,12 +703,12 @@ proc: tPUT expr					{
 		Common::String open("open");
 		g_lingo->codeCmd(&open, 1); }
 	| ID[func] '(' ID[method] ')' {
-			g_lingo->code1(LC::c_lazyeval);
+			g_lingo->code1(LC::c_varpush);
 			g_lingo->codeString($method->c_str());
 			g_lingo->codeCmd($func, 1);
 			delete $func;
 			delete $method; }
-	| ID[func] '(' ID[method] ',' { g_lingo->code1(LC::c_lazyeval); g_lingo->codeString($method->c_str()); }
+	| ID[func] '(' ID[method] ',' { g_lingo->code1(LC::c_varpush); g_lingo->codeString($method->c_str()); }
 				nonemptyarglist ')' {
 			g_lingo->codeCmd($func, $nonemptyarglist + 1);
 			delete $func;