From: Keith Packard <keithp@keithp.com>
Date: Mon, 11 Dec 2017 00:53:25 +0000 (-0800)
Subject: altos/scheme: Make eqv? work for numbers and strings
X-Git-Tag: 1.8.3~1^2~15
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=3e7a703bb2e70a0568b44159b993386f7ec46e04

altos/scheme: Make eqv? work for numbers and strings

Large numbers, floats and strings need a value check, not just a
comparison between ao_polys

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/scheme/ao_scheme_builtin.c b/src/scheme/ao_scheme_builtin.c
index 7a590735..1754e677 100644
--- a/src/scheme/ao_scheme_builtin.c
+++ b/src/scheme/ao_scheme_builtin.c
@@ -492,9 +492,8 @@ ao_scheme_compare(struct ao_scheme_cons *cons, enum ao_scheme_builtin_id op)
 	for (cons = ao_scheme_cons_cdr(cons); cons; cons = ao_scheme_cons_cdr(cons)) {
 		ao_poly	right = cons->car;
 
-		if (op == builtin_equal) {
-			if (left != right)
-				return _ao_scheme_bool_false;
+		if (op == builtin_equal && left == right) {
+			;
 		} else {
 			uint8_t	lt = ao_scheme_poly_type(left);
 			uint8_t	rt = ao_scheme_poly_type(right);
@@ -519,6 +518,38 @@ ao_scheme_compare(struct ao_scheme_cons *cons, enum ao_scheme_builtin_id op)
 					if (!(l >= r))
 						return _ao_scheme_bool_false;
 					break;
+				case builtin_equal:
+					if (!(l == r))
+						return _ao_scheme_bool_false;
+				default:
+					break;
+				}
+			} else if (ao_scheme_number_typep(lt) && ao_scheme_number_typep(rt)) {
+				float l, r;
+
+				l = ao_scheme_poly_number(left);
+				r = ao_scheme_poly_number(right);
+
+				switch (op) {
+				case builtin_less:
+					if (!(l < r))
+						return _ao_scheme_bool_false;
+					break;
+				case builtin_greater:
+					if (!(l > r))
+						return _ao_scheme_bool_false;
+					break;
+				case builtin_less_equal:
+					if (!(l <= r))
+						return _ao_scheme_bool_false;
+					break;
+				case builtin_greater_equal:
+					if (!(l >= r))
+						return _ao_scheme_bool_false;
+					break;
+				case builtin_equal:
+					if (!(l == r))
+						return _ao_scheme_bool_false;
 				default:
 					break;
 				}
@@ -542,10 +573,15 @@ ao_scheme_compare(struct ao_scheme_cons *cons, enum ao_scheme_builtin_id op)
 					if (!(c >= 0))
 						return _ao_scheme_bool_false;
 					break;
+				case builtin_equal:
+					if (!(c == 0))
+						return _ao_scheme_bool_false;
+					break;
 				default:
 					break;
 				}
-			}
+			} else
+				return _ao_scheme_bool_false;
 		}
 		left = right;
 	}