TABI: now dump() makes a one-line dump while detailed dump printed by…

… memory_dump()

git-svn-id: https://freearc.svn.sourceforge.net/svnroot/freearc@454 3a4f7f31-9599-433d-91b1-573e8b61252c

Compression/_TABI/tabi.h

@@ -71,6 +71,28 @@ class TABI_MAP
 
                 // Dump first n elements (for debugging purposes)
 		void dump(int n=0)
+		{
+			printf("  TABI_MAP: ");
+			for (int i=0; i<n?n:100; i++)
+			{
+				if (p[i].name == NULL)
+					break;
+				if (i>0)  printf(", ");
+				printf("%s: ", p[i].name);
+				switch (p[i].type)
+				{
+					case TABI_STRING:	if (p[i].value.str)   printf("%s", p[i].value.str); break;
+					case TABI_INTEGER:	printf("%lld", p[i].value.int_number); break;
+					case TABI_FLOATING:	printf("%g", p[i].value.float_number); break;
+					case TABI_PTR:	        printf("<%p>", p[i].value.ptr); break;
+					case TABI_FUNCPTR:	printf("func<%p>", p[i].value.funcptr); break;
+				}
+			}
+			printf("\n");
+		}
+
+                // Memory dump first n elements (for debugging purposes)
+		void memory_dump(int n=0)
 		{
 			printf("dumping TABI_MAP:\n");
 			for (int i=0; i<n?n:100; i++)
@@ -86,8 +108,8 @@ class TABI_MAP
 					case TABI_STRING:	if (p[i].value.str)   printf("%s", p[i].value.str); break;
 					case TABI_INTEGER:	printf("%lld", p[i].value.int_number); break;
 					case TABI_FLOATING:	printf("%g", p[i].value.float_number); break;
-					case TABI_PTR:	        printf("<%x>", p[i].value.ptr); break;
-					case TABI_FUNCPTR:	printf("func<%x>", p[i].value.funcptr); break;
+					case TABI_PTR:	        printf("<%p>", p[i].value.ptr); break;
+					case TABI_FUNCPTR:	printf("func<%p>", p[i].value.funcptr); break;
 				}
 				printf("\n");
 			}