CHANGE: Have EXISTS? return the type field or none instead of true/false

resolves: Oldes/Rebol-issues#612
Oldes · Dec 20, 2020 · 0688a19 · 0688a19
1 parent 4280e0a
commit 0688a19
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/mezz/base-files.reb b/src/mezz/base-files.reb
@@ -20,9 +20,10 @@ exists?: func [
  {Determines if a file or URL exists.}
  target [file! url!]
 ][
- either error? try [
- target: query/mode target 'type
- ][ false ][ not none? target ]
+ all [
+ word? target: try [query/mode target 'type]
+ target
+ ]
 ]
 
 size?: func [

diff --git a/src/tests/units/port-test.r3 b/src/tests/units/port-test.r3
@@ -100,7 +100,7 @@ if system/platform = 'Windows [
 ]
  --test-- "exists? %/"
  ;@@ https://github.com/Oldes/Rebol-issues/issues/2317
- --assert exists? %/
+ --assert 'dir = exists? %/ ;@@ https://github.com/Oldes/Rebol-issues/issues/612
  --assert object? info: query %/
  --assert info/name = %/
  --assert info/type = 'dir
@@ -141,6 +141,8 @@ if system/platform = 'Windows [
  --assert ["a" ""] = read/lines %tmp.txt
  ;@@ https://github.com/Oldes/Rebol-issues/issues/2429
  --assert "a^/b^/" = read/string write/lines %tmp.txt ["a" "b"]
+ ;@@ https://github.com/Oldes/Rebol-issues/issues/612
+ --assert 'file = exists? %tmp.txt
  delete %tmp.txt
 
  --test-- "read/lines - issue/1794"
@@ -223,7 +225,7 @@ if system/platform = 'Windows [
  --test-- "exists? url"
  ;@@ https://github.com/Oldes/Rebol3/issues/14
  ;@@ https://github.com/Oldes/Rebol-issues/issues/1613
- --assert  exists? http://httpbin.org/
+ --assert 'url = exists? http://httpbin.org/ ;@@ https://github.com/Oldes/Rebol-issues/issues/612
  --assert not exists? http://httpbin.org/not-exists
  --test-- "read/part"
  ;@@ https://github.com/Oldes/Rebol-issues/issues/2434