FEAT: Make map datatype composable in functions

related to: Oldes/Rebol-issues#2685

Author: Oldes

src/core/c-frame.c

@@ -3,7 +3,7 @@
 **  REBOL [R3] Language Interpreter and Run-time Environment
 **
 **  Copyright 2012 REBOL Technologies
-**  Copyright 2012-2021 Rebol Open Source Developers
+**  Copyright 2012-2026 Rebol Open Source Developers
 **  REBOL is a trademark of REBOL Technologies
 **
 **  Licensed under the Apache License, Version 2.0 (the "License");
@@ -843,7 +843,7 @@
 				}
 			}
 		}
-		else if ((ANY_BLOCK(value) || IS_MAP(value)) && (mode & BIND_DEEP)) {
+		else if ((ANY_BLOCK_OR_MAP(value)) && (mode & BIND_DEEP)) {
 			// Recursion check: (variation of: Find_Same_Block(MOLD_LOOP, value))
 			for (val = BLK_HEAD(MOLD_LOOP); NOT_END(val); val++) {
 				if (VAL_SERIES(val) == VAL_SERIES(value)) return;
@@ -963,7 +963,7 @@
 				VAL_WORD_FRAME(value) = frame; // func body
 			}
 		}
-		else if (ANY_BLOCK(value))
+		else if (ANY_BLOCK_OR_MAP(value))
 			Bind_Relative_Words(frame, VAL_SERIES(value));
 	}
 }

src/include/sys-value.h

@@ -3,7 +3,7 @@
 **  REBOL [R3] Language Interpreter and Run-time Environment
 **
 **  Copyright 2012 REBOL Technologies
-**  Copyright 2012-2025 Rebol Open Source Contributors
+**  Copyright 2012-2026 Rebol Open Source Contributors
 **  REBOL is a trademark of REBOL Technologies
 **
 **  Licensed under the Apache License, Version 2.0 (the "License");
@@ -1383,6 +1383,7 @@ typedef struct Reb_All {
 #define ANY_STR(v)			(VAL_TYPE(v) >= REB_STRING && VAL_TYPE(v) <= REB_TAG)
 #define ANY_BINSTR(v)		(VAL_TYPE(v) >= REB_BINARY && VAL_TYPE(v) <= REB_TAG)
 #define ANY_BLOCK(v)		(VAL_TYPE(v) >= REB_BLOCK  && VAL_TYPE(v) <= REB_HASH)
+#define ANY_BLOCK_OR_MAP(v) (VAL_TYPE(v) >= REB_BLOCK  && VAL_TYPE(v) <= REB_MAP)
 #define	ANY_WORD(v)			(VAL_TYPE(v) >= REB_WORD   && VAL_TYPE(v) <= REB_ISSUE)
 #define	ANY_PATH(v)			(VAL_TYPE(v) >= REB_PATH   && VAL_TYPE(v) <= REB_LIT_PATH)
 #define ANY_FUNC(v)			(VAL_TYPE(v) >= REB_NATIVE && VAL_TYPE(v) <= REB_FUNCTION)

src/tests/units/evaluation-test.r3

@@ -495,6 +495,12 @@ Rebol [
 		none? m2/c
 		m2/d/k == white
 	]
+
+	a: 1 f1: func[b][compose #[num: (a + b)]]
+	--assert #[num: 3] = try [f1 2]
+	
+	f2: closure/with [b][compose #[num: (a + b)]][a: 1]
+	--assert #[num: 3] = try [f2 2]
 
 ===end-group===