Update Iniquity+ and Knock+ to print vectors and strings correctly

Author: pdarragh

iniquity-plus/print.c

@@ -31,15 +31,15 @@ void print_result(val_t x)
   case T_EMPTY:
   case T_BOX:
   case T_CONS:
-  case T_VECT:    
+  case T_VECT:
     printf("'");
     print_result_interior(x);
     break;
   case T_STR:
     putchar('"');
     print_str(val_unwrap_str(x));
     putchar('"');
-    break;    
+    break;
   case T_INVALID:
     printf("internal error");
   }
@@ -62,7 +62,7 @@ void print_result_interior(val_t x)
     break;
   case T_VECT:
     print_vect(val_unwrap_vect(x));
-    break;    
+    break;
   default:
     print_result(x);
   }
@@ -71,14 +71,15 @@ void print_result_interior(val_t x)
 void print_vect(val_vect_t *v)
 {
   uint64_t i;
+  int64_t len = val_unwrap_int(v->len);
 
   if (!v) { printf("#()"); return; }
 
   printf("#(");
-  for (i = 0; i < v->len; ++i) {
+  for (i = 0; i < len; ++i) {
     print_result_interior(v->elems[i]);
 
-    if (i < v->len - 1)
+    if (i < len - 1)
       putchar(' ');
   }
   printf(")");
@@ -105,9 +106,12 @@ void print_cons(val_cons_t *cons)
 
 void print_str(val_str_t* s)
 {
-  if (!s) return;
   uint64_t i;
-  for (i = 0; i < s->len; ++i)
+  int64_t len = val_unwrap_int(s->len);
+
+  if (!s) return;
+
+  for (i = 0; i < len; ++i)
     print_str_char(s->codepoints[i]);
 }
 

iniquity-plus/values.h

@@ -12,7 +12,7 @@ typedef enum type_t {
   T_INT,
   T_BOOL,
   T_CHAR,
-  T_EOF,  
+  T_EOF,
   T_VOID,
   T_EMPTY,
   /* pointers */
@@ -31,11 +31,11 @@ typedef struct val_cons_t {
   val_t snd;
 } val_cons_t;
 typedef struct val_vect_t {
-  uint64_t len;
+  val_t len;
   val_t elems[];
 } val_vect_t;
 typedef struct val_str_t {
-  uint64_t len;
+  val_t len;
   val_char_t codepoints[];
 } val_str_t;
 

knock-plus/print.c

@@ -31,15 +31,15 @@ void print_result(val_t x)
   case T_EMPTY:
   case T_BOX:
   case T_CONS:
-  case T_VECT:    
+  case T_VECT:
     printf("'");
     print_result_interior(x);
     break;
   case T_STR:
     putchar('"');
     print_str(val_unwrap_str(x));
     putchar('"');
-    break;    
+    break;
   case T_INVALID:
     printf("internal error");
   }
@@ -62,7 +62,7 @@ void print_result_interior(val_t x)
     break;
   case T_VECT:
     print_vect(val_unwrap_vect(x));
-    break;    
+    break;
   default:
     print_result(x);
   }
@@ -71,14 +71,15 @@ void print_result_interior(val_t x)
 void print_vect(val_vect_t *v)
 {
   uint64_t i;
+  int64_t len = val_unwrap_int(v->len);
 
   if (!v) { printf("#()"); return; }
 
   printf("#(");
-  for (i = 0; i < v->len; ++i) {
+  for (i = 0; i < len; ++i) {
     print_result_interior(v->elems[i]);
 
-    if (i < v->len - 1)
+    if (i < len - 1)
       putchar(' ');
   }
   printf(")");
@@ -105,9 +106,12 @@ void print_cons(val_cons_t *cons)
 
 void print_str(val_str_t* s)
 {
-  if (!s) return;
   uint64_t i;
-  for (i = 0; i < s->len; ++i)
+  int64_t len = val_unwrap_int(s->len);
+
+  if (!s) return;
+
+  for (i = 0; i < len; ++i)
     print_str_char(s->codepoints[i]);
 }
 

knock-plus/values.h

@@ -31,11 +31,11 @@ typedef struct val_cons_t {
   val_t snd;
 } val_cons_t;
 typedef struct val_vect_t {
-  uint64_t len;
+  val_t len;
   val_t elems[];
 } val_vect_t;
 typedef struct val_str_t {
-  uint64_t len;
+  val_t len;
   val_char_t codepoints[];
 } val_str_t;