From 871da4fc12ad06513d2d32ed5062ddf9b2d93ac2 Mon Sep 17 00:00:00 2001
From: Matthew Kilgore <mattkilgore12@gmail.com>
Date: Sun, 25 Feb 2024 01:22:44 -0500
Subject: [PATCH] Fix divide in CONST

The regular division symbol always converts its arguments to floating
point before dividing, similar to how integer division converts its
arguments to integers before dividing.
---
 source/utilities/const_eval.bas             | 9 ++-------
 tests/compile_tests/const/expression.bas    | 4 ++++
 tests/compile_tests/const/expression.output | 1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/utilities/const_eval.bas b/source/utilities/const_eval.bas
index d5978c463..fac4f4572 100644
--- a/source/utilities/const_eval.bas
+++ b/source/utilities/const_eval.bas
@@ -600,13 +600,8 @@ FUNCTION Factor&(exp$, state AS ParserState)
             ele$ = getnextelement$(exp$, state.index, state.strIndex)
             IF Unary&(exp$, state) = 0 THEN FixupErrorMessage state, "/": EXIT FUNCTION
 
-            IF (num.typ AND ISFLOAT) OR (state.num.typ AND ISFLOAT) THEN
-                ParseNumSetF num, FLOATTYPE - ISPOINTER, num.f / state.num.f
-            ELSEIF (num.typ AND ISUNSIGNED) OR (state.num.typ AND ISUNSIGNED) THEN
-                ParseNumSetUI num, UINTEGER64TYPE - ISPOINTER, num.ui / state.num.ui
-            ELSE
-                ParseNumSetI num, INTEGER64TYPE - ISPOINTER, num.i / state.num.i
-            END IF
+            ' Regular division is always done as floating-point
+            ParseNumSetF num, FLOATTYPE - ISPOINTER, num.f / state.num.f
         ELSE
             IF CONST_EVAL_DEBUG THEN  _Echo "Factor done!"
             state.num = num
diff --git a/tests/compile_tests/const/expression.bas b/tests/compile_tests/const/expression.bas
index 216b0feba..299267ba4 100644
--- a/tests/compile_tests/const/expression.bas
+++ b/tests/compile_tests/const/expression.bas
@@ -47,6 +47,8 @@ CONST const__str4 = (const__str + (const__str2))
 
 CONST const__unsignedint = 2~&& * 5~&&
 
+CONST const__division_floating = 1& / 5&
+
 PRINT const__OR
 PRINT const__AND
 PRINT const__NOT
@@ -91,4 +93,6 @@ PRINT const__str4
 
 PRINT const__unsignedint
 
+PRINT const__division_floating
+
 SYSTEM
diff --git a/tests/compile_tests/const/expression.output b/tests/compile_tests/const/expression.output
index 20aa2af9d..124205065 100644
--- a/tests/compile_tests/const/expression.output
+++ b/tests/compile_tests/const/expression.output
@@ -34,3 +34,4 @@ foobarfoobar2
 foobarfoobarfoobar2
 foobarfoobarfoobar2
  10 
+ .2