FIX: FIND string! tag! misses < and >

resolves: Oldes/Rebol-issues#1160

Author: Oldes

src/core/s-find.c

@@ -402,6 +402,54 @@
 	return NOT_FOUND;
 }
 
+/***********************************************************************
+**
+*/	REBCNT Find_Str_Tag(REBSER *ser1, REBCNT head, REBCNT index, REBCNT tail, REBINT skip, REBSER *ser2, REBCNT index2, REBCNT len, REBCNT flags)
+/*
+**		General purpose find a tag in a string.
+**
+**		Supports: forward/reverse with skip, cased/uncase, Unicode/byte.
+**
+**		Skip can be set positive or negative (for reverse).
+**
+**		Flags are set according to ALL_FIND_REFS
+**
+***********************************************************************/
+{
+	REBUNI c1;
+	REBUNI c2;
+	REBCNT n = 0;
+	REBOOL uncase = !(flags & AM_FIND_CASE); // uncase = case insenstive
+
+	for (; index >= head && index < tail; index += skip) {
+		c1 = GET_ANY_CHAR(ser1, index);
+		if (c1 == '<') {
+			index++;
+			for (n = 0; n < len; n++) {
+				c1 = GET_ANY_CHAR(ser1, index + n);
+				c2 = GET_ANY_CHAR(ser2, index2 + n);
+				if (uncase && c1 < UNICODE_CASES && c2 < UNICODE_CASES) {
+					if (LO_CASE(c1) != LO_CASE(c2)) break;
+				}
+				else {
+					if (c1 != c2) break;
+				}
+			}
+			if (n == len) {
+				c1 = GET_ANY_CHAR(ser1, index + n);
+				if (c1 == '>') {
+					if (flags & AM_FIND_TAIL) return index + len + 1;
+					return index-1;
+				}
+			}
+		}
+		if (flags & AM_FIND_MATCH) break;
+	}
+
+	return NOT_FOUND;
+}
+
+
 /***********************************************************************
 **
 */	REBCNT Find_Str_Str_Any(REBSER *ser1, REBCNT head, REBCNT index, REBCNT tail, REBINT skip, REBSER *ser2, REBCNT index2, REBCNT len, REBCNT flags, REBVAL *wild)

src/core/t-string.c

@@ -118,7 +118,8 @@ static REBCNT find_string(REBSER *series, REBCNT index, REBCNT end, REBVAL *targ
 
 	if (flags & AM_FIND_SAME) flags |= AM_FIND_CASE; // /SAME has same functionality as /CASE for any-string!
 
-	if (ANY_BINSTR(target)) {
+	//O: not using ANY_BINSTR as TAG is now handled separately
+	if (VAL_TYPE(target) >= REB_BINARY && VAL_TYPE(target) < REB_TAG) {
 		// Do the optimal search or the general search?
 		if (BYTE_SIZE(series) && VAL_BYTE_SIZE(target) && !(flags & ~(AM_FIND_CASE|AM_FIND_MATCH))) {
 			return Find_Byte_Str(series, start, VAL_BIN_DATA(target), len, !GET_FLAG(flags, ARG_FIND_CASE-1), GET_FLAG(flags, ARG_FIND_MATCH-1));
@@ -128,6 +129,10 @@ static REBCNT find_string(REBSER *series, REBCNT index, REBCNT end, REBVAL *targ
 			return Find_Str_Str(series, start, index, end, skip, VAL_SERIES(target), VAL_INDEX(target), len, flags & (AM_FIND_MATCH | AM_FIND_CASE | AM_FIND_TAIL));
 		}
 	}
+	else if (IS_TAG(target)) {
+		return Find_Str_Tag(series, start, index, end, skip, VAL_SERIES(target), VAL_INDEX(target), len, flags & (AM_FIND_MATCH | AM_FIND_CASE | AM_FIND_TAIL));
+	}
+	//O: next condition is always false! It could be removed. 
 	else if (IS_BINARY(target)) {
 		return Find_Byte_Str(series, start, VAL_BIN_DATA(target), len, 0, GET_FLAG(flags, ARG_FIND_MATCH-1));
 	}

src/tests/units/series-test.r3

@@ -26,6 +26,20 @@ Rebol [
 	;@@ https://github.com/Oldes/Rebol-issues/issues/237
 	--assert "23" = find "123" 2
 
+--test-- "FIND string! tag!"
+	;@@ https://github.com/Oldes/Rebol-issues/issues/1160
+	--assert "<a>"  = find "<a>" <a>
+	--assert "b"    = find/tail "<a>b" <a>
+	--assert "<a>3" = find/last "1<a>2<a>3" <a>
+	--assert "<a>b" = find/match "<a>b" <a>
+	--assert "b"    = find/match/tail "<a>b" <a>
+	--assert "<a>b" = find/match next "a<a>b" <a>
+	--assert "<a>b" = find/reverse tail "a<a>b" <a>
+	--assert none?    find/skip "a<a>b" <a> 2
+	--assert "<a>b" = find/skip "aa<a>b" <a> 2
+	--assert "<A>"  = find/case "<a><A>" <A>
+	--assert "<a href=''>" = find "foo<a href=''>" <a href=''>
+
 --test-- "FIND %file %file"
 	;@@ https://github.com/Oldes/Rebol-issues/issues/624
 	--assert %file = find %file %file