FEAT: find/same and select/same

implements: Oldes/Rebol-issues#1720

Author: Oldes

src/boot/actions.reb

@@ -199,6 +199,7 @@ find: action [
 	length [number! series! pair!]
 	/only {Treats a series value as only a single value}
 	/case {Characters are case-sensitive}
+	/same {Use "same?" as comparator}
 	/any  {Enables the * and ? wildcards}
 	/with {Allows custom wildcards}
 	wild [string!] "Specifies alternates for * and ?"
@@ -218,6 +219,7 @@ select: action [
 	length [number! series! pair!]
 	/only {Treats a series value as only a single value}
 	/case {Characters are case-sensitive}
+	/same {Use "same?" as comparator}
 	/any  {Enables the * and ? wildcards}
 	/with {Allows custom wildcards}
 	wild [string!] "Specifies alternates for * and ?"

src/core/f-series.c

@@ -282,7 +282,8 @@
 	case REB_OBJECT:
 	case REB_MODULE:
 	case REB_PORT:
-		return VAL_OBJ_FRAME(s) - VAL_OBJ_FRAME(t);
+		//return VAL_OBJ_FRAME(s) - VAL_OBJ_FRAME(t); // strict variant
+		return !CT_Object(s, t, 1); // equality used
 
 	case REB_NATIVE:
 		return &VAL_FUNC_CODE(s) - &VAL_FUNC_CODE(t);

src/core/t-block.c

@@ -167,10 +167,18 @@ static void No_Nones_Or_Logic(REBVAL *arg) {
 	}
 	// All other cases:
 	else {
-		for (; index >= start && index < end; index += skip) {
-			value = BLK_SKIP(series, index);
-			if (0 == Cmp_Value(value, target, (REBOOL)(flags & AM_FIND_CASE))) return index;
-			if (flags & AM_FIND_MATCH) break;
+		if (flags & AM_FIND_SAME) {
+			for (; index >= start && index < end; index += skip) {
+				value = BLK_SKIP(series, index);
+				if (Compare_Values(target, value, 3)) return index;
+				if (flags & AM_FIND_MATCH) break;
+			}
+		} else {
+			for (; index >= start && index < end; index += skip) {
+				value = BLK_SKIP(series, index);
+				if (0 == Cmp_Value(value, target, (REBOOL)(flags & AM_FIND_CASE))) return index;
+				if (flags & AM_FIND_MATCH) break;
+			}
 		}
 		return NOT_FOUND;
 	}

src/core/t-string.c

@@ -116,6 +116,8 @@ static REBCNT find_string(REBSER *series, REBCNT index, REBCNT end, REBVAL *targ
 		else index--;
 	}
 
+	if (flags & AM_FIND_SAME) flags |= AM_FIND_CASE; // /SAME has same functionality as /CASE for any-string!
+
 	if (ANY_BINSTR(target)) {
 		// Do the optimal search or the general search?
 		if (BYTE_SIZE(series) && VAL_BYTE_SIZE(target) && !(flags & ~(AM_FIND_CASE|AM_FIND_MATCH))) {

src/tests/units/series-test.r3

@@ -65,6 +65,23 @@ Rebol [
 	--assert "d"     = find/any/reverse/tail tail "ažcdažcd" "?c"
 	--assert "d"     = find/any/reverse/tail tail "ažcdažcd" "žc"
 
+--test-- "FIND/SAME in block!"
+	a: "a"
+	obj1: context [a: 1 b: 2]
+	obj2: context [a: 1 b: 2]
+	b: reduce  ["a" obj1 a obj2]
+	--assert 1 = index? find b :a
+	--assert 3 = index? find/same b :a
+	--assert 2 = index? find/same b :obj1
+	--assert 4 = index? find/same b :obj2
+	--assert 2 = index? find b :obj1
+	--assert 2 = index? find b :obj2
+	--assert 2 = index? find/case b :obj2 ;/case is not /same in this case
+
+--test-- "FIND/SAME in string!"
+	--assert "AbcdAe" = find/same "aAbcdAe" "A"
+	--assert "Ae" = find/same/last "aAbcdAe" "A"
+
 --test-- "FIND/PART"
 ;@@ https://github.com/Oldes/Rebol-issues/issues/2329
 ;@@ need to decide, which result is correct
@@ -129,6 +146,8 @@ Rebol [
 	--assert #"2" = select/last "ab1ab2" "ab"
 	--assert #"2" = select/last/any "ab1ab2" "?b"
 	--assert #"2" = select/last/any "ab1ab2" "ab"
+	--assert #"b" = select/same "aAbcdAe" "A"
+	--assert #"e" = select/same/last "aAbcdAe" "A"
 
 ===end-group===