rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use seq//1 which is now available in library(dcgs)

Browse Source
This commit is contained in:
Markus Triska
2021-11-27 16:17:15 +01:00
parent ca28f24e42
commit fd9b354c70
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/http/http_open.pl
View File

@@ -33,7 +33,7 @@
http_open(Address, Stream, Options) :- http_open(Address, Stream, Options) :-
must_be(list, Options), must_be(list, Options),
must_be(list, Address), must_be(list, Address),
once(phrase((list(SchemeCs), "://", list(Rest)), Address)), once(phrase((seq(SchemeCs), "://", seq(Rest)), Address)),
atom_chars(Scheme, SchemeCs), atom_chars(Scheme, SchemeCs),
chars_host_url(Rest, Host, URL), chars_host_url(Rest, Host, URL),
connect(Scheme, Host, Stream0), connect(Scheme, Host, Stream0),
@@ -48,14 +48,11 @@ Connection: close\r\n\r\n\
read_header_lines(Stream0, HeaderLines), read_header_lines(Stream0, HeaderLines),
handle_response(D1, HeaderLines, Stream0, Stream). handle_response(D1, HeaderLines, Stream0, Stream).
list([]) --> [].
list([L|Ls]) --> [L], list(Ls).
handle_response('2', _, Stream, Stream). % ok handle_response('2', _, Stream, Stream). % ok
handle_response('3', HeaderLines, Stream0, Stream) :- % redirect handle_response('3', HeaderLines, Stream0, Stream) :- % redirect
close(Stream0), close(Stream0),
once((member(Line, HeaderLines), once((member(Line, HeaderLines),
phrase(("Location: ",list(Location),"\r\n"), Line))), phrase(("Location: ",seq(Location),"\r\n"), Line))),
http_open(Location, Stream, []). http_open(Location, Stream, []).
% Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF % Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF
@@ -69,7 +66,7 @@ read_header_lines(Stream, Hs) :-
). ).
chars_host_url(Cs, Host, [/|Us]) :- chars_host_url(Cs, Host, [/|Us]) :-
( phrase((list(Hs),"/",list(Us)), Cs) -> ( phrase((seq(Hs),"/",seq(Us)), Cs) ->
true true
; Hs = Cs, ; Hs = Cs,
Us = [] Us = []