Merge 52ff503 into ebefcd5

tbklang · May 19, 2024 · 1b08675 · 1b08675
2 parents ebefcd5 + 52ff503
commit 1b08675
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 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,10 +1821,16 @@ public final class TypeChecker
                         }
                     }
                 }
+                // If both left and right operands are pointers
+                else if(isPointerType(vLhsType) && isPointerType(vRhsType)) // <a> is Pointer, <b> is Pointer
+                {
+                    expect("Both left hand side and right hand side cannot be pointers in any arithmetic operation");
+                }
                 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");
+                    assert(false);
                 }