Fixing #144 through Iniquity.

dvanhorn · dvanhorn · commit 6d32cf702d6a · 2023-07-01T13:19:16.000-04:00
diff --git a/langs/evildoer/io.c b/langs/evildoer/io.c
@@ -7,7 +7,7 @@
 val_t read_byte(void)
 {
   char c = getc(in);
-  return (c == EOF) ? val_wrap_eof() : val_wrap_int(c);  
+  return (c == EOF) ? val_wrap_eof() : val_wrap_byte(c);
 }
 
 val_t peek_byte(void)
diff --git a/langs/evildoer/values.c b/langs/evildoer/values.c
@@ -29,6 +29,10 @@ val_t val_wrap_int(int64_t i)
 {
   return (i << int_shift) | int_type_tag;
 }
+val_t val_wrap_byte(unsigned char b)
+{
+  return (b << int_shift) | int_type_tag;
+}
 
 int val_unwrap_bool(val_t x)
 {
diff --git a/langs/evildoer/values.h b/langs/evildoer/values.h
@@ -28,6 +28,7 @@ type_t val_typeof(val_t x);
  */
 int64_t val_unwrap_int(val_t x);
 val_t val_wrap_int(int64_t i);
+val_t val_wrap_byte(unsigned char b);
 
 int val_unwrap_bool(val_t x);
 val_t val_wrap_bool(int b);
diff --git a/langs/extort/io.c b/langs/extort/io.c
@@ -7,7 +7,7 @@
 val_t read_byte(void)
 {
   char c = getc(in);
-  return (c == EOF) ? val_wrap_eof() : val_wrap_int(c);  
+  return (c == EOF) ? val_wrap_eof() : val_wrap_byte(c);
 }
 
 val_t peek_byte(void)
diff --git a/langs/extort/values.c b/langs/extort/values.c
@@ -29,6 +29,10 @@ val_t val_wrap_int(int64_t i)
 {
   return (i << int_shift) | int_type_tag;
 }
+val_t val_wrap_byte(unsigned char b)
+{
+  return (b << int_shift) | int_type_tag;
+}
 
 int val_unwrap_bool(val_t x)
 {
diff --git a/langs/extort/values.h b/langs/extort/values.h
@@ -28,6 +28,7 @@ type_t val_typeof(val_t x);
  */
 int64_t val_unwrap_int(val_t x);
 val_t val_wrap_int(int64_t i);
+val_t val_wrap_byte(unsigned char b);
 
 int val_unwrap_bool(val_t x);
 val_t val_wrap_bool(int b);
diff --git a/langs/fraud/io.c b/langs/fraud/io.c
@@ -7,7 +7,7 @@
 val_t read_byte(void)
 {
   char c = getc(in);
-  return (c == EOF) ? val_wrap_eof() : val_wrap_int(c);  
+  return (c == EOF) ? val_wrap_eof() : val_wrap_byte(c);
 }
 
 val_t peek_byte(void)
diff --git a/langs/fraud/values.c b/langs/fraud/values.c
@@ -29,6 +29,10 @@ val_t val_wrap_int(int64_t i)
 {
   return (i << int_shift) | int_type_tag;
 }
+val_t val_wrap_byte(unsigned char b)
+{
+  return (b << int_shift) | int_type_tag;
+}
 
 int val_unwrap_bool(val_t x)
 {
diff --git a/langs/fraud/values.h b/langs/fraud/values.h
@@ -28,6 +28,7 @@ type_t val_typeof(val_t x);
  */
 int64_t val_unwrap_int(val_t x);
 val_t val_wrap_int(int64_t i);
+val_t val_wrap_byte(unsigned char b);
 
 int val_unwrap_bool(val_t x);
 val_t val_wrap_bool(int b);
diff --git a/langs/hoax/io.c b/langs/hoax/io.c
@@ -7,7 +7,7 @@
 val_t read_byte(void)
 {
   char c = getc(in);
-  return (c == EOF) ? val_wrap_eof() : val_wrap_int(c);  
+  return (c == EOF) ? val_wrap_eof() : val_wrap_byte(c);
 }
 
 val_t peek_byte(void)
diff --git a/langs/hoax/values.c b/langs/hoax/values.c
@@ -42,6 +42,10 @@ val_t val_wrap_int(int64_t i)
 {
   return (i << int_shift) | int_type_tag;
 }
+val_t val_wrap_byte(unsigned char b)
+{
+  return (b << int_shift) | int_type_tag;
+}
 
 int val_unwrap_bool(val_t x)
 {
diff --git a/langs/hoax/values.h b/langs/hoax/values.h
@@ -49,6 +49,7 @@ type_t val_typeof(val_t x);
  */
 int64_t val_unwrap_int(val_t x);
 val_t val_wrap_int(int64_t i);
+val_t val_wrap_byte(unsigned char b);
 
 int val_unwrap_bool(val_t x);
 val_t val_wrap_bool(int b);
diff --git a/langs/hustle/io.c b/langs/hustle/io.c
@@ -7,7 +7,7 @@
 val_t read_byte(void)
 {
   char c = getc(in);
-  return (c == EOF) ? val_wrap_eof() : val_wrap_int(c);  
+  return (c == EOF) ? val_wrap_eof() : val_wrap_byte(c);
 }
 
 val_t peek_byte(void)
diff --git a/langs/hustle/values.c b/langs/hustle/values.c
@@ -38,6 +38,10 @@ val_t val_wrap_int(int64_t i)
 {
   return (i << int_shift) | int_type_tag;
 }
+val_t val_wrap_byte(unsigned char b)
+{
+  return (b << int_shift) | int_type_tag;
+}
 
 int val_unwrap_bool(val_t x)
 {
diff --git a/langs/hustle/values.h b/langs/hustle/values.h
@@ -39,6 +39,7 @@ type_t val_typeof(val_t x);
  */
 int64_t val_unwrap_int(val_t x);
 val_t val_wrap_int(int64_t i);
+val_t val_wrap_byte(unsigned char b);
 
 int val_unwrap_bool(val_t x);
 val_t val_wrap_bool(int b);
diff --git a/langs/iniquity/io.c b/langs/iniquity/io.c
@@ -7,7 +7,7 @@
 val_t read_byte(void)
 {
   char c = getc(in);
-  return (c == EOF) ? val_wrap_eof() : val_wrap_int(c);  
+  return (c == EOF) ? val_wrap_eof() : val_wrap_byte(c);
 }
 
 val_t peek_byte(void)
diff --git a/langs/iniquity/values.c b/langs/iniquity/values.c
@@ -38,6 +38,10 @@ int64_t val_unwrap_int(val_t x)
 {
   return x >> int_shift;
 }
+val_t val_wrap_byte(unsigned char b)
+{
+  return (b << int_shift) | int_type_tag;
+}
 val_t val_wrap_int(int64_t i)
 {
   return (i << int_shift) | int_type_tag;
diff --git a/langs/iniquity/values.h b/langs/iniquity/values.h
@@ -49,6 +49,7 @@ type_t val_typeof(val_t x);
  */
 int64_t val_unwrap_int(val_t x);
 val_t val_wrap_int(int64_t i);
+val_t val_wrap_byte(unsigned char b);
 
 int val_unwrap_bool(val_t x);
 val_t val_wrap_bool(int b);

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`val_t read_byte(void)`
`8`	`8`	`{`
`9`	`9`	`char c = getc(in);`
`10`		`- return (c == EOF) ? val_wrap_eof() : val_wrap_int(c);`
	`10`	`+ return (c == EOF) ? val_wrap_eof() : val_wrap_byte(c);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`val_t peek_byte(void)`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,10 @@ val_t val_wrap_int(int64_t i)`
`29`	`29`	`{`
`30`	`30`	`return (i << int_shift) \| int_type_tag;`
`31`	`31`	`}`
	`32`	`+val_t val_wrap_byte(unsigned char b)`
	`33`	`+{`
	`34`	`+ return (b << int_shift) \| int_type_tag;`
	`35`	`+}`
`32`	`36`
`33`	`37`	`int val_unwrap_bool(val_t x)`
`34`	`38`	`{`