diff --git a/make/rebol3.nest b/make/rebol3.nest index 7f03a282a6..ed7a7c27b6 100644 --- a/make/rebol3.nest +++ b/make/rebol3.nest @@ -426,6 +426,7 @@ config: [ ;- this is list of configuration (optional) defines ;FORCE_ANSI_ESC_EMULATION_ON_WINDOWS ; would not try to use MS' built-in VIRTUAL_TERMINAL_PROCESSING ;EXCLUDE_VECTOR_MATH ; don't include vector math support (like: 3 * #[vector! integer! 8 3 [1 2 3]]); Used in t-vector.c file ;WRITE_ANY_VALUE_TO_CLIPBOARD ; https://github.com/Oldes/Rebol-issues/issues/1619 + ;CONSTRUCT_LIT_WORD_AS_WORD ; https://github.com/Oldes/Rebol-issues/issues/2502 ;SERIES_LABELS ; used for special debug purposes ;SHOW_SIZEOFS ; for debugging ports to some new systems diff --git a/src/core/c-do.c b/src/core/c-do.c index 999dc6b920..7881188271 100644 --- a/src/core/c-do.c +++ b/src/core/c-do.c @@ -1678,6 +1678,8 @@ x*/ static REBINT Do_Args_Light(REBVAL *func, REBVAL *path, REBSER *block, REBCN VAL_SET(temp, REB_WORD); } } +#ifdef CONSTRUCT_LIT_WORD_AS_WORD + //https://github.com/Oldes/Rebol-issues/issues/2502 else if (IS_LIT_WORD(value)) { *temp = *value; VAL_SET(temp, REB_WORD); @@ -1686,6 +1688,7 @@ x*/ static REBINT Do_Args_Light(REBVAL *func, REBVAL *path, REBSER *block, REBCN *temp = *value; VAL_SET(temp, REB_PATH); } +#endif else if (VAL_TYPE(value) >= REB_NONE) { // all valid values *temp = *value; } diff --git a/src/tests/units/object-test.r3 b/src/tests/units/object-test.r3 index 71d69e346d..980cfc25ca 100644 --- a/src/tests/units/object-test.r3 +++ b/src/tests/units/object-test.r3 @@ -247,6 +247,7 @@ Rebol [ --test-- "construct" ;@@ https://github.com/Oldes/Rebol-issues/issues/651 + ;@@ https://github.com/Oldes/Rebol-issues/issues/2502 --assert logic? get in construct [a: true] 'a --assert logic? get in construct [a: false] 'a --assert logic? get in construct [a: on] 'a @@ -256,9 +257,11 @@ Rebol [ --assert none? get in construct [a: none] 'a --assert none? get/any in construct head insert tail [a:]() 'a --assert word? get in construct [a: b] 'a - --assert word? get in construct [a: 'b] 'a + --assert lit-word? get in construct [a: 'b] 'a + --assert get-word? get in construct [a: :b] 'a --assert path? get in construct [a: b/c] 'a - --assert path? get in construct [a: 'b/c] 'a + --assert lit-path? get in construct [a: 'b/c] 'a + --assert get-path? get in construct [a: :b/c] 'a --test-- "construct/only" ;@@ https://github.com/Oldes/Rebol-issues/issues/687