[Scummvm-git-logs] scummvm master -> 735db39ad93b9865c0c4486299c2fd50022344f7

[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:
735db39ad9 DIRECTOR: Fix symbol printing


Commit: 735db39ad93b9865c0c4486299c2fd50022344f7
    https://github.com/scummvm/scummvm/commit/735db39ad93b9865c0c4486299c2fd50022344f7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-24T00:22:17+01:00

Commit Message:
DIRECTOR: Fix symbol printing

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


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 872008e..95b83e9 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -383,7 +383,7 @@ void Lingo::printSTUBWithArglist(const char *funcname, int nargs, const char *pr
 
 	s += ")";
 
-	warning("%s %s", prefix, s.c_str());
+	debug(5, "%s %s", prefix, s.c_str());
 }
 
 void Lingo::convertVOIDtoString(int arg, int nargs) {
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 9864fc8..761cf74 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -325,6 +325,35 @@ Common::String *Datum::toString() {
 		s = u.s;
 		break;
 	case SYMBOL:
+		switch (u.i) {
+		case INT:
+			*s = "#integer";
+			break;
+		case FLOAT:
+			*s = "#float";
+			break;
+		case STRING:
+			*s = "#string";
+			break;
+		case SYMBOL:
+			*s = "#symbol";
+			break;
+		case OBJECT:
+			*s = "#object";
+			break;
+		case VOID:
+			*s = "#void";
+			break;
+		case VAR:
+			*s = "#scumm-var";
+			break;
+		case REFERENCE:
+			*s = "#scumm-ref";
+			break;
+		default:
+			*s = Common::String::format("#unknown%d", u.i);
+		}
+		break;
 	case OBJECT:
 		*s = Common::String::format("#%s", u.s->c_str());
 		break;