CHANGE: replace bind? and bound? with context?

resolves: Oldes/Rebol-issues#2440
resolves: Oldes/Rebol-issues#886
related to: Oldes/Rebol-issues#196
related to: Oldes/Rebol-issues#2076

Author: Oldes

src/boot/natives.reb

@@ -370,9 +370,10 @@ unbind: native [
 	/deep "Process nested blocks"
 ]
 
-bound?: native [
+context?: native [ ; was originally named `bound?`
 	{Returns the context in which a word is bound.}
-	word [any-word!]
+	word [any-word!] "Word to check."
+	;return: [object! function! none!]
 ]
 
 collect-words: native [

src/core/n-data.c

@@ -328,15 +328,22 @@ static int Check_Char_Range(REBVAL *val, REBINT limit)
 
 /***********************************************************************
 **
-*/	REBNATIVE(boundq)
+*/	REBNATIVE(contextq)
 /*
+**	Originally named `boundq`
+**	see: https://github.com/Oldes/Rebol-issues/issues/2440
+**
 ***********************************************************************/
 {
 	REBVAL *word = D_ARG(1);
 
 	if (!HAS_FRAME(word)) return R_NONE;
-	if (VAL_WORD_INDEX(word) < 0) return R_TRUE;
-	SET_OBJECT(D_RET, VAL_WORD_FRAME(word));
+	if (VAL_WORD_INDEX(word) < 0) {
+		// was originally returning R_TRUE for function context
+		 *D_RET = Stack_Frame(1)[3];
+	} else {
+		SET_OBJECT(D_RET, VAL_WORD_FRAME(word));
+	}
 	return R_RET;
 }
 

src/mezz/base-constants.reb

@@ -58,6 +58,6 @@ max: :maximum
 abs: :absolute
 empty?: :tail?
 ---: :comment
-bind?: :bound?
+;bind?: :bound? ;@@ https://github.com/Oldes/Rebol-issues/issues/2440
 
 rebol.com: http://www.rebol.com

src/tests/units/func-test.r3

@@ -66,6 +66,21 @@ Rebol [
 ===end-group===
 
 
+===start-group=== "function's context?"
+--test-- "wish-2440"
+	;@@ https://github.com/Oldes/Rebol-issues/issues/2440
+	f: func[arg1 arg2][context? 'arg1]
+	--assert same? :f f 1 2
+	f: func[arg1 arg2][spec-of context? 'arg1]
+	--assert [arg1 arg2] = f 1 2
+	f: func[arg1 arg2 /local f2][
+		f2: func[a][spec-of context? 'a]
+		f2 arg1
+	]
+	--assert [a] = f 1 2
+===end-group===
+
+
 ===start-group=== "types-of"
 
 --test-- "types-of FUNCTION"
@@ -188,7 +203,9 @@ Rebol [
 
 --test-- "issue-196"
 ;@@ https://github.com/Oldes/Rebol-issues/issues/196
-	--assert do func [a] [bind? 'a] 1 ;-no crash
+	; with change related to https://github.com/Oldes/Rebol-issues/issues/2440
+	; bellow test is now throwing error instead of `true`
+	--assert error? try [do func [a] [context? 'a] 1] ;-no crash
 
 --test-- "issue-216"
 ;@@ https://github.com/Oldes/Rebol-issues/issues/216

src/tests/units/object-test.r3

@@ -331,7 +331,7 @@ Rebol [
 ===start-group=== "USE"
 	--test-- "issue-197"
 	;@@ https://github.com/Oldes/Rebol-issues/issues/197
-	--assert object? o: use [a] [bind? 'a]
+	--assert object? o: use [a] [context? 'a]
 	--assert [a] = words-of o
 
 ===end-group===