FIX: catch/quit/name catches only quit or halt, but not any named throw

resolves: Oldes/Rebol-issues#2549

Author: Oldes

make/tools/make-headers.reb

@@ -319,6 +319,7 @@ context [
 		checksum
 		request-file
 		request-dir
+		catch
 	] [make-arg-enums word]
 
 ;?? output

src/core/n-control.c

@@ -413,13 +413,15 @@ enum {
 	REBVAL *val;
 	REBVAL *ret;
 	REBCNT sym;
-	REBVAL recover = *D_ARG(6);
+	REBVAL recover = *D_ARG(AM_CATCH_RECOVER);
 	REBVAL *last_result = Get_System(SYS_STATE, STATE_LAST_RESULT);
+	REBOOL quit;
 
-	if (D_REF(4)) {	//QUIT
-		if (Try_Block_Halt(VAL_SERIES(D_ARG(1)), VAL_INDEX(D_ARG(1)))) {
+	if (D_REF(AM_CATCH_QUIT)) {	//QUIT
+		quit = Try_Block_Halt(VAL_SERIES(D_ARG(AM_CATCH_BLOCK)), VAL_INDEX(D_ARG(AM_CATCH_BLOCK)));
+		ret = DS_NEXT;
+		if (quit) {
 			// We are here because of a QUIT or HALT condition.
-			ret = DS_NEXT;
 			if (VAL_ERR_NUM(ret) == RE_QUIT)
 				ret = VAL_ERR_VALUE(ret);
 			else if (VAL_ERR_NUM(ret) == RE_HALT)
@@ -435,20 +437,20 @@ enum {
 			*DS_RETURN = *ret;
 			return R_RET;
 		}
-		return R_TOS1;
-	}
-
-	// Evaluate the block:
-	ret = DO_BLK(D_ARG(1));
+		if (!D_REF(AM_CATCH_NAME)) return R_TOS1;
+	} else {
+		// Evaluate the block:
+		ret = DO_BLK(D_ARG(AM_CATCH_BLOCK));
+	}	
 
 	// If it is a throw, process it:
 	if (IS_ERROR(ret) && VAL_ERR_NUM(ret) == RE_THROW) {
 
 		// If a named throw, then check it:
-		if (D_REF(2)) { // /name
+		if (D_REF(AM_CATCH_NAME)) { // /name
 
 			sym = VAL_ERR_SYM(ret);
-			val = D_ARG(3); // name symbol
+			val = D_ARG(AM_CATCH_WORD); // name symbol
 
 			// If name is the same word:
 			if (IS_WORD(val) && sym == VAL_WORD_CANON(val)) goto got_err;

src/tests/units/evaluation-test.r3

@@ -777,6 +777,13 @@ Rebol [
 		--assert 3 = catch/recover [a: 1 throw 3 a: 2][a: system/state/last-result a: a * 10]  
 		--assert a = 30
 
+	--test-- "catch/quit/name"
+	;@@ https://github.com/Oldes/Rebol-issues/issues/2549
+		--assert all [
+			'foo = catch/quit/name [a: 1 throw/name 'foo 'name a: 2] 'name
+			a = 1
+		]
+
 
 ===end-group===