Fix cppia type check for pointer and int

Kode · Dec 7, 2020 · 8d00031 · 8d00031
1 parent f228dc3
commit 8d00031
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/hx/cppia/CppiaCompiler.cpp b/src/hx/cppia/CppiaCompiler.cpp
@@ -735,9 +735,14 @@ class CppiaJitCompiler : public CppiaCompiler
       if (inV1.type==jtInt && (inV2.type==jtByte || inV2.type==jtShort))
          return inV1.type;
 
+      // Pointer + Int
+      if ( (inV1.type==jtInt||inV2.type==jtInt) && (inV1.type==jtPointer||inV2.type==jtPointer))
+         return jtPointer;
+
       // TODO
-      //if (inV1.type!=inV2.type)
-      //   setError("Type mismatch");
+      if (inV1.type!=inV2.type)
+         setError("Type mismatch");
+
       return inV1.type;
    }