FIX: objects equality

resolves: Oldes/Rebol-issues#1133

Author: Oldes

src/core/t-object.c

@@ -41,7 +41,7 @@ static REBOOL Same_Object(REBVAL *val, REBVAL *arg)
 }
 
 
-static REBOOL Equal_Object(REBVAL *val, REBVAL *arg)
+static REBOOL Equal_Object(REBVAL *val, REBVAL *arg, REBFLG is_case)
 {
 	REBSER *f1;
 	REBSER *f2;
@@ -64,9 +64,9 @@ static REBOOL Equal_Object(REBVAL *val, REBVAL *arg)
 	for (n = 1; n < (REBINT)(f1->tail); n++) {
 		if (VAL_HIDDEN(BLK_SKIP(w1, n))) return VAL_HIDDEN(BLK_SKIP(w2, n));
 		if (VAL_HIDDEN(BLK_SKIP(w2, n))) return VAL_HIDDEN(BLK_SKIP(w1, n));
-		if (Cmp_Value(BLK_SKIP(w1, n), BLK_SKIP(w2, n), FALSE)) return FALSE;
+		if (Cmp_Value(BLK_SKIP(w1, n), BLK_SKIP(w2, n), is_case)) return FALSE;
 		// Use Compare_Values();
-		if (Cmp_Value(BLK_SKIP(f1, n), BLK_SKIP(f2, n), FALSE)) return FALSE;
+		if (Cmp_Value(BLK_SKIP(f1, n), BLK_SKIP(f2, n), is_case)) return FALSE;
 	}
 
 	return TRUE;
@@ -231,7 +231,7 @@ static REBSER *Trim_Object(REBSER *obj)
 {
 	if (mode < 0) return -1;
 	if (mode == 3) return Same_Object(a, b);
-	return Equal_Object(a, b);
+	return Equal_Object(a, b, mode > 1);
 }
 
 

src/tests/units/compare-test.r3

@@ -226,6 +226,28 @@ Rebol [
 
 ===end-group===
 
+
+===start-group=== "object!"
+	;@@ https://github.com/Oldes/Rebol-issues/issues/1133
+	--test-- "equal? objects with numeric values"
+		--assert equal? construct [c: 1] construct [c: 1]
+		--assert equal? construct [c: 1] construct [c: 1.0]
+		--assert equal? construct [c: 1] construct [c: $1]
+		--assert equal? construct [c: 1] construct [c: 100%]
+		--assert equal? construct [c: 1.0]  construct [c: 1]
+		--assert equal? construct [c: $1]   construct [c: 1]
+		--assert equal? construct [c: 100%] construct [c: 1]
+	--test-- "strict-equal? objects with numeric values"
+		--assert strict-equal? construct [c: 1] construct [c: 1]
+		--assert not strict-equal? construct [c: 1] construct [c: 1.0]
+		--assert not strict-equal? construct [c: 1] construct [c: $1]
+		--assert not strict-equal? construct [c: 1] construct [c: 100%]
+		--assert not strict-equal? construct [c: 1.0]  construct [c: 1]
+		--assert not strict-equal? construct [c: $1]   construct [c: 1]
+		--assert not strict-equal? construct [c: 100%] construct [c: 1]
+===end-group===
+
+
 ;- tests from Red Language...
 ===start-group=== "prefix equal same datatype"
 	--test-- "prefix-equal-same-datatype-1"		--assert equal? 0 0