Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enumerations fix - to enable enumeration redeclaration by local variables #206

Merged
merged 2 commits into from
Feb 20, 2012
Merged

Enumerations fix - to enable enumeration redeclaration by local variables #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb77888
Allow enum redefinition by local variable
Oldes Feb 20, 2012
cac1536
Enumerations - it's possible to redeclare enumeration values by local…
Oldes Feb 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions red-system/compiler.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,14 @@ system-dialect: context [
if spec: select spec return-def [last-type: spec]
]

local-variable?: func [name [word!]][
all [locals find locals name]
]

exists-variable?: func [name [word! set-word!]][
name: to word! name
to logic! any [
all [locals find locals name]
local-variable? name
find globals name
]
]
Expand Down Expand Up @@ -400,9 +404,12 @@ system-dialect: context [
if all [not type find functions name][
return reduce ['function! functions/:name/4]
]
if any [
all [type find enumerations type/1]
get-enumerator name
if all [
not local-variable? name
any [
all [type find enumerations type/1]
get-enumerator name
]
][
return [integer!]
]
Expand Down Expand Up @@ -726,7 +733,10 @@ system-dialect: context [
case [
all [type = 'pointer ending = 'value][] ;-- pass thru case
word? ending [
either found? enum-value: get-enumerator/value ending [
either all [
not local-variable? ending
found? enum-value: get-enumerator/value ending
][
path/2: ending: enum-value
][
unless any [
Expand Down Expand Up @@ -824,7 +834,7 @@ system-dialect: context [
if block? args [
foreach [name type] args [
if get-enumerator name [
throw-error ["function's argument redeclares enumeration:" name]
throw-warning ["function's argument redeclares enumeration:" name]
]
]
]
Expand Down Expand Up @@ -1520,7 +1530,10 @@ system-dialect: context [
backtrack name
throw-error ["redeclaration of definition" name]
]
if enum: get-enumerator n [
if all [
not local-variable? n
enum: get-enumerator n
][
backtrack name
throw-error ["redeclaration of enumerator" name "from" enum]
]
Expand Down Expand Up @@ -1696,7 +1709,10 @@ system-dialect: context [
set-path [set-path!] expr casted [block! none!]
/local type new value
][
if get-enumerator set-path/1 [
if all [
not local-variable? set-path/1
get-enumerator set-path/1
][
backtrack set-path
throw-error ["enumeration cannot be used as path root:" set-path/1]
]
Expand Down Expand Up @@ -1867,6 +1883,7 @@ system-dialect: context [

if all [
word? pc/1
not local-variable? pc/1
value: get-enumerator/value pc/1
][ change pc value ]

Expand Down
2 changes: 1 addition & 1 deletion red-system/tests/source/compiler/enum-test.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ change-dir %../
f: func[foo [c-string!]][print foo]
f "bar"
}
--assert-msg? "*** Compilation Error: function's argument redeclares enumeration: foo"
--assert-msg? "*** Warning: function's argument redeclares enumeration: foo"
--clean

--test-- "enum-redec-11"
Expand Down