Merge aa5d97f into ebefcd5

tbklang · May 19, 2024 · 7344a55 · 7344a55
2 parents ebefcd5 + aa5d97f
commit 7344a55
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 6 deletions.
diff --git a/source/tlang/compiler/codegen/emit/dgen.d b/source/tlang/compiler/codegen/emit/dgen.d
@@ -304,11 +304,13 @@ public final class DCodeEmitter : CodeEmitter
              * the cast out me thinks.
              * 
              * See issue #140 (https://deavmi.assigned.network/git/tlang/tlang/issues/140#issuecomment-1892)
+             *
+             * Note, this would NOT be the case for equality
              */
             Type leftHandOpType = (cast(Value)binOpInstr.lhs).getInstrType();
             Type rightHandOpType = (cast(Value)binOpInstr.rhs).getInstrType();
 
-            if(typeChecker.isPointerType(leftHandOpType))
+            if(typeChecker.isPointerType(leftHandOpType) && binOpInstr.operator != SymbolType.EQUALS)
             {
                 // Sanity check the other side should have been coerced to CastedValueInstruction
                 CastedValueInstruction cvInstr = cast(CastedValueInstruction)binOpInstr.rhs;
@@ -319,7 +321,7 @@ public final class DCodeEmitter : CodeEmitter
                 // Relax the CV-instr to prevent it from emitting explicit cast code
                 cvInstr.setRelax(true);
             }
-            else if(typeChecker.isPointerType(rightHandOpType))
+            else if(typeChecker.isPointerType(rightHandOpType) && binOpInstr.operator != SymbolType.EQUALS)
             {
                 // Sanity check the other side should have been coerced to CastedValueInstruction
                 CastedValueInstruction cvInstr = cast(CastedValueInstruction)binOpInstr.lhs;
@@ -614,7 +616,7 @@ public final class DCodeEmitter : CodeEmitter
                     emit ~= "("~typeTransform(castingTo)~")";
 
                     /* The expression being casted */
-                    emit ~= transform(uncastedInstruction);
+                    emit ~= "("~transform(uncastedInstruction)~")";
                 }
                 else
                 {

diff --git a/source/tlang/compiler/typecheck/core.d b/source/tlang/compiler/typecheck/core.d
@@ -1821,13 +1821,23 @@ public final class TypeChecker
                         }
                     }
                 }
+                /**
+                 * If both left and right operands are pointers
+                 * and the operator is not equality
+                 *
+                 * `<a> is Pointer, <b> is Pointer`
+                 */
+                else if(binOperator != SymbolType.EQUALS && isPointerType(vLhsType) && isPointerType(vRhsType))
+                {
+                    expect("Both left hand side and right hand side cannot be pointers in any arithmetic operation, except equality");
+                }
                 else
                 {
                     // See issue #141: Binary Operators support for non-Integer types (https://deavmi.assigned.network/git/tlang/tlang/issues/141)
                     ERROR("FIXME: We need to add support for this, class equality, and others like floats");
                 }
 
-                
+
                 /**
                  * Refresh types as instructions may have changed in
                  * the above enforcement call
@@ -1848,8 +1858,17 @@ public final class TypeChecker
                 Type chosenType;
                 if(isSameType(vLhsType, vRhsType))
                 {
-                    /* Left type + Right type = left/right type (just use left - it doesn't matter) */
-                    chosenType = vLhsType;
+                    /* If equality then result is `ubyte` */
+                    if(binOperator == SymbolType.EQUALS)
+                    {
+                        chosenType = getType(this.program, "ubyte");
+                    }
+                    /* Other cases */
+                    else
+                    {
+                        /* Left type + Right type = left/right type (just use left - it doesn't matter) */
+                        chosenType = vLhsType;
+                    }
                 }
                 else
                 {

diff --git a/source/tlang/testing/simple_binops_ptr.t b/source/tlang/testing/simple_binops_ptr.t
@@ -0,0 +1,12 @@
+module simple_binops_ptr;
+
+int main()
+{
+	int* ptr1 = 0;
+	int* ptr2 = 0;
+
+	int* ptr3 = 0;
+
+	ubyte cond = ptr1==ptr2;
+	return cond;
+}
diff --git a/source/tlang/testing/typecheck/simple_binops_ptr_bad.t b/source/tlang/testing/typecheck/simple_binops_ptr_bad.t
@@ -0,0 +1,11 @@
+module simple_binops_ptr_bad;
+
+int main()
+{
+	int* ptr1 = 0;
+	int* ptr2 = 0;
+
+	int* ptr3 = ptr1+ptr2;
+
+	return 0;
+}