Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Zach Beane
zacl
Commits
3529eb02
Commit
3529eb02
authored
Nov 28, 2016
by
Zach Beane
Browse files
Make net.aserve:merge-uris accept strings as URIs.
Uses new URI-DESIGNATOR function.
parent
a1e49c00
Changes
1
Hide whitespace changes
Inline
Side-by-side
package-net.uri.lisp
View file @
3529eb02
...
...
@@ -19,6 +19,13 @@
(
print-unreadable-object
(
uri
stream
:type
t
)
(
format
stream
"~S"
(
render-uri
(
real-uri
uri
)))))
(
defun
uri-designator
(
uri
)
(
etypecase
uri
(
string
(
uri
uri
))
(
net.uri:uri
uri
)))
(
defun
net.uri:parse-uri
(
uri-string
)
(
make-instance
'net.uri:uri
:real-uri
(
uri
uri-string
)))
...
...
@@ -74,8 +81,11 @@
(
defun
net.uri:render-uri
(
uri
&optional
stream
)
(
render-uri
(
real-uri
uri
)
stream
))
(
defun
net.uri:merge-uris
(
new-uri
uri
)
(
merge-uris
(
real-uri
new-uri
)
(
real-uri
uri
)))
(
defun
net.uri:merge-uris
(
new-uri
uri
&optional
place
)
(
when
place
(
error
"PLACE option not yet implemented"
))
(
merge-uris
(
real-uri
(
uri-designator
new-uri
))
(
real-uri
(
uri-designator
uri
))))
(
defun
net.uri::uri-string
(
uri
)
(
render-uri
(
real-uri
uri
)))
...
...
Zach Beane
@zbeane
Mentioned in issue
#2 (closed)
·
Nov 28, 2016
Mentioned in issue
#2 (closed)
Mentioned in issue #2
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment