Merge mainline into community

Author: earl

src/boot/errors.r

@@ -31,7 +31,6 @@ Note: [
 	no-load:            [{cannot load: } :arg1]
 	exited:             [{exit occurred}]
 	deprecated:         {deprecated function not allowed}
-	else-gone:          {ELSE is obsolete - use the EITHER function}
 ]
 
 Syntax: [

src/boot/natives.r

@@ -187,12 +187,10 @@ halt: native [
 ]
 
 if: native [
-	{If TRUE condition, return arg; evaluate block args by default}
+	{If TRUE condition, return arg; evaluate blocks by default.}
 	condition
 	true-branch
-	/else "If FALSE condition, return second arg; evaluate block by default"
-	false-branch
-	/only "Suppress evaluation of block args."
+	/only "Return block arg instead of evaluating it."
 ]
 
 loop: native [
@@ -308,10 +306,10 @@ try: native [
 ]
 
 unless: native [
-	{If FALSE condition, return arg; evaluate block args by default.}
+	{If FALSE condition, return arg; evaluate blocks by default.}
 	condition
 	false-branch
-	/only "Suppress evaluation of block args."
+	/only "Return block arg instead of evaluating it."
 ]
 
 until: native [

src/core/n-control.c

@@ -602,17 +602,6 @@ enum {
 }
 
 
-/***********************************************************************
-**
-*/	REBNATIVE(else)
-/*
-***********************************************************************/
-{
-	Trap0(RE_ELSE_GONE);
-	DEAD_END;
-}
-
-
 /***********************************************************************
 **
 */	REBNATIVE(exit)
@@ -630,27 +619,13 @@ enum {
 /*
 ***********************************************************************/
 {
-	REBVAL *cond = D_ARG(1);
-	REBCNT argnum = 2;
-
-	if (!D_REF(3)) {	// no /else
-		if (IS_FALSE(cond)) return R_NONE;
-	} else
-		if (IS_FALSE(cond)) argnum = 4;
-
-	if (IS_BLOCK(D_ARG(argnum)) && !D_REF(5) /* not using /ONLY */) {
-		DO_BLK(D_ARG(argnum));
+	if (IS_FALSE(D_ARG(1))) return R_NONE;
+	if (IS_BLOCK(D_ARG(2)) && !D_REF(3) /* not using /ONLY */) {
+		DO_BLK(D_ARG(2));
 		return R_TOS1;
-	} {
-		if (argnum == 2)
-			return R_ARG2;
-		else {
-			// No R_ARG4, but IF/ELSE may get the axe (CC #2077)
-			DS_RET_VALUE(D_ARG(argnum));
-			return R_RET;
-		}
+	} else {
+		return R_ARG2;
 	}
-
 }
 
 

src/core/s-crc.c

@@ -158,14 +158,17 @@ static REBCNT *CRC_Table;
 {
 	REBINT m, n;
 	REBINT hash;
+	REBCNT ulen;
 
 	if (len < 0) len = LEN_BYTES(str);
 
 	hash = (REBINT)len + (REBINT)((REBYTE)LO_CASE(*str));
 
-	for (; len > 0; str++, len--) {
+	ulen = (REBCNT)len; // so the & operation later isn't for the wrong type
+
+	for (; ulen > 0; str++, ulen--) {
 		n = *str;
-		if (n > 127 && NZ(m = Decode_UTF8_Char(&str, &len))) n = m; // mods str, len
+		if (n > 127 && NZ(m = Decode_UTF8_Char(&str, &ulen))) n = m; // mods str, ulen
 		if (n < UNICODE_CASES) n = LO_CASE(n);
 		n = (REBYTE)((hash >> CRCSHIFTS) ^ (REBYTE)n); // drop upper 8 bits
 		hash = MASK_CRC(hash << 8) ^ (REBINT)CRC_Table[n];

src/core/s-find.c

@@ -257,7 +257,7 @@
 **			-3: no match, s2 > s1
 **			-1: no match, s1 > s2
 **			 0: exact match
-**		     1: non-case match, s2 > s1
+**			 1: non-case match, s2 > s1
 **			 3: non-case match, s1 > s2
 **
 **		So, result + 2 for no-match gives proper sort order.
@@ -271,7 +271,7 @@
 	REBCNT l1 = LEN_BYTES(s1);
 	REBINT result = 0;
 
-	for (; l2 > 0; s1++, s2++, l2--) {
+	for (; l1 > 0 && l2 > 0; s1++, s2++, l1--, l2--) {
 		c1 = (REBYTE)*s1;
 		c2 = (REBYTE)*s2;
 		if (c1 > 127) c1 = Decode_UTF8_Char(&s1, &l1); //!!! can return 0 on error!
@@ -284,6 +284,7 @@
 			if (!result) result = (c1 > c2) ? 3 : 1;
 		}
 	}
+	if (l1 != l2) result = (l1 > l2) ? -1 : -3;
 
 	return result;
 }

src/core/s-unicode.c

@@ -768,7 +768,7 @@ ConversionResult ConvertUTF8toUTF32 (
 
 /***********************************************************************
 **
-*/	REBCNT Decode_UTF8_Char(REBYTE **str, REBINT *len)
+*/	REBCNT Decode_UTF8_Char(REBYTE **str, REBCNT *len)
 /*
 **		Converts a single UTF8 code-point (to 32 bit).
 **		Errors are returned as zero. (So prescan source for null.)
@@ -817,7 +817,7 @@ ConversionResult ConvertUTF8toUTF32 (
 
 /***********************************************************************
 **
-*/	int Decode_UTF8(REBUNI *dst, REBYTE *src, REBINT len, REBFLG ccr)
+*/	int Decode_UTF8(REBUNI *dst, REBYTE *src, REBCNT len, REBFLG ccr)
 /*
 **		Decode UTF8 byte string into a 16 bit preallocated array.
 **
@@ -853,7 +853,7 @@ ConversionResult ConvertUTF8toUTF32 (
 
 /***********************************************************************
 **
-*/	int Decode_UTF16(REBUNI *dst, REBYTE *src, REBINT len, REBFLG lee, REBFLG ccr)
+*/	int Decode_UTF16(REBUNI *dst, REBYTE *src, REBCNT len, REBFLG lee, REBFLG ccr)
 /*
 **		dst: the desination array, must always be large enough!
 **		src: source binary data