jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2195 from stedi67/devel

Browse source 
little documentation fix on combine and /
This commit is contained in:
Dominik Picheta 2015-02-21 22:10:15 +00:00
commit 6f069dad84
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pure/uri.nim
View file

@ -184,10 +184,10 @@ proc combine*(base: Uri, reference: Uri): Uri =
## assert foo.path == "/baz" ## assert foo.path == "/baz"
## ##
## let bar = combine(parseUri("http://example.com/foo/bar"), parseUri("baz")) ## let bar = combine(parseUri("http://example.com/foo/bar"), parseUri("baz"))
## assert foo.path == "/foo/baz" ## assert bar.path == "/foo/baz"
## ##
## let bar = combine(parseUri("http://example.com/foo/bar/"), parseUri("baz")) ## let bar = combine(parseUri("http://example.com/foo/bar/"), parseUri("baz"))
## assert foo.path == "/foo/bar/baz" ## assert bar.path == "/foo/bar/baz"
template setAuthority(dest, src: expr): stmt = template setAuthority(dest, src: expr): stmt =
dest.hostname = src.hostname dest.hostname = src.hostname
@ -241,10 +241,10 @@ proc `/`*(x: Uri, path: string): Uri =
## assert foo.path == "/foo/bar/baz" ## assert foo.path == "/foo/bar/baz"
## ##
## let bar = parseUri("http://example.com/foo/bar") / parseUri("baz") ## let bar = parseUri("http://example.com/foo/bar") / parseUri("baz")
## assert foo.path == "/foo/bar/baz" ## assert bar.path == "/foo/bar/baz"
## ##
## let bar = parseUri("http://example.com/foo/bar/") / parseUri("baz") ## let bar = parseUri("http://example.com/foo/bar/") / parseUri("baz")
## assert foo.path == "/foo/bar/baz" ## assert bar.path == "/foo/bar/baz"
result = x result = x
if result.path[result.path.len-1] == '/': if result.path[result.path.len-1] == '/':
if path[0] == '/': if path[0] == '/':