[crt] debug-print: Use more specific types for string data.

The real purpose of this change is to ensure that our build products have debug info for the 'dylan_byte_string' typedef.
waywardmonkeys · Jun 25, 2014 · 551b0ed · 551b0ed
1 parent 96ea046
commit 551b0ed
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/sources/lib/run-time/debug-print.c b/sources/lib/run-time/debug-print.c
@@ -128,8 +128,8 @@ bool dylan_string_p (dylan_value instance) {
   return dylan_object_class(instance) == Lbyte_stringGVKd;
 }
 
-char* dylan_string_data (dylan_value instance) {
-  return ((dylan_byte_string*)instance)->data;
+char* dylan_string_data (dylan_byte_string* instance) {
+  return instance->data;
 }
 
 /* SIMPLE-CONDITION */
@@ -143,8 +143,8 @@ bool dylan_simple_condition_p (dylan_value instance) {
   return DTRUE == CALL2(&KinstanceQVKd, instance, Lsimple_conditionGVKe);
 }
 
-dylan_value dylan_simple_condition_format_string (dylan_value instance) {
-  return CALL1(&Kcondition_format_stringVKd, instance);
+dylan_byte_string* dylan_simple_condition_format_string (dylan_value instance) {
+  return (dylan_byte_string*)CALL1(&Kcondition_format_stringVKd, instance);
 }
 
 dylan_simple_object_vector* dylan_simple_condition_format_args (dylan_value instance) {
@@ -205,7 +205,7 @@ enum dylan_type_enum {
 };
 
 static void print_object (STREAM, dylan_value, BOOL, int);
-void dylan_format (STREAM, dylan_value, dylan_simple_object_vector*);
+void dylan_format (STREAM, dylan_byte_string*, dylan_simple_object_vector*);
 
 static enum dylan_type_enum
 dylan_get_type (dylan_value instance) {
@@ -278,7 +278,7 @@ static void print_float (STREAM stream, dylan_value instance, BOOL escape_p, int
   }
 }
 
-static void print_string (STREAM stream, dylan_value instance, BOOL escape_p, int print_depth) {
+static void print_string (STREAM stream, dylan_byte_string* instance, BOOL escape_p, int print_depth) {
   ignore(print_depth);
   if (escape_p) {
     format(stream, "\"%s\"", dylan_string_data(instance))
@@ -287,7 +287,7 @@ static void print_string (STREAM stream, dylan_value instance, BOOL escape_p, in
   }
 }
 
-static void print_string_data (STREAM stream, dylan_value instance, BOOL escape_p, int print_depth) {
+static void print_string_data (STREAM stream, dylan_byte_string* instance, BOOL escape_p, int print_depth) {
   ignore(escape_p); ignore(print_depth);
   format(stream, "%s", dylan_string_data(instance));
 }
@@ -387,7 +387,7 @@ static void print_boolean (STREAM stream, dylan_value instance, BOOL escape_p, i
 }
 
 static void print_simple_condition (STREAM stream, dylan_value instance, BOOL escape_p, int print_depth) {
-  dylan_value format_string = dylan_simple_condition_format_string(instance);
+  dylan_byte_string* format_string = dylan_simple_condition_format_string(instance);
   dylan_simple_object_vector* format_args = dylan_simple_condition_format_args(instance);
   ignore(print_depth);
   if (escape_p) put_char('"', stream);
@@ -398,7 +398,7 @@ static void print_simple_condition (STREAM stream, dylan_value instance, BOOL es
 static void print_class_debug_name (STREAM stream, dylan_value instance, BOOL escape_p, int print_depth) {
   dylan_value name = dylan_class_debug_name(instance);
   ignore(escape_p);
-  print_string_data(stream, name, TRUE, print_depth);
+  print_string_data(stream, (dylan_byte_string*)name, TRUE, print_depth);
 }
 
 static void print_class (STREAM stream, dylan_value instance, BOOL escape_p, int print_depth) {
@@ -453,7 +453,7 @@ static void print_object (STREAM stream, dylan_value instance, BOOL escape_p, in
   }
 }
 
-void dylan_format (STREAM stream, dylan_value dylan_string, dylan_simple_object_vector* dylan_arguments) {
+void dylan_format (STREAM stream, dylan_byte_string* dylan_string, dylan_simple_object_vector* dylan_arguments) {
   BOOL  percent_p = false;
   char* string = dylan_string_data(dylan_string);
   dylan_value*    arguments = vector_data(dylan_arguments);