Change type_compatible() so that void is not compatible with

anything, including itself.
YeZ-Liu · Jan 6, 2020 · bea0c06 · bea0c06
1 parent 32dacf2
commit bea0c06
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/12_Types_pt1/Readme.md b/12_Types_pt1/Readme.md
@@ -225,11 +225,12 @@ the types on either side. Here's the code:
 // If onlyright is true, only widen left to right.
 int type_compatible(int *left, int *right, int onlyright) {
 
+  // Voids not compatible with anything
+  if ((*left == P_VOID) || (*right == P_VOID)) return (0);
+
   // Same types, they are compatible
   if (*left == *right) { *left = *right = 0; return (1);
   }
-  // Voids not compatible with anything
-  if ((*left == P_VOID) || (*right == P_VOID)) return (0);
 
   // Widen P_CHARs to P_INTs as required
   if ((*left == P_CHAR) && (*right == P_INT)) {

diff --git a/12_Types_pt1/types.c b/12_Types_pt1/types.c
@@ -13,14 +13,15 @@
 // If onlyright is true, only widen left to right.
 int type_compatible(int *left, int *right, int onlyright) {
 
+  // Voids not compatible with anything
+  if ((*left == P_VOID) || (*right == P_VOID))
+    return (0);
+
   // Same types, they are compatible
   if (*left == *right) {
     *left = *right = 0;
     return (1);
   }
-  // Voids not compatible with anything
-  if ((*left == P_VOID) || (*right == P_VOID))
-    return (0);
 
   // Widen P_CHARs to P_INTs as required
   if ((*left == P_CHAR) && (*right == P_INT)) {