Update redis library to also support Ciao Prolog (work-in-progress)

LogtalkDotOrg · May 27, 2020 · d67d7e6 · d67d7e6
1 parent 88901f5
commit d67d7e6
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 16 deletions.
diff --git a/docs/_sources/index.rst.txt b/docs/_sources/index.rst.txt
diff --git a/docs/_sources/redis_0.rst.txt b/docs/_sources/redis_0.rst.txt
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/redis_0.html b/docs/redis_0.html
diff --git a/docs/searchindex.js b/docs/searchindex.js
diff --git a/library/redis/loader.lgt b/library/redis/loader.lgt
@@ -18,7 +18,15 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-:- if(current_logtalk_flag(prolog_dialect, eclipse)).
+:- if(current_logtalk_flag(prolog_dialect, ciao)).
+
+	:- use_module(library(sockets), []).
+	:- initialization((
+		logtalk_load(basic_types(loader)),
+		logtalk_load(redis, [optimize(on)])
+	)).
+
+:- elif(current_logtalk_flag(prolog_dialect, eclipse)).
 
 	:- initialization((
 		logtalk_load(basic_types(loader)),

diff --git a/library/redis/redis.lgt b/library/redis/redis.lgt
@@ -21,9 +21,9 @@
 :- object(redis).
 
 	:- info([
-		version is 0:3:0,
+		version is 0:4:0,
 		author is 'Paulo Moura',
-		date is 2017-06-29,
+		date is 2020-05-27,
 		comment is 'Redis client. Inspired by Sean Charles GNU Prolog Redis client.',
 		remarks is [
 			'Command representation' - 'Use the Redis command name as the functor of a compound term where the arguments are the command arguments.',
@@ -114,7 +114,15 @@
 	% backend Prolog compiler dependent auxiliary predicates
 	% (there is not standard sockets Prolog library)
 
-	:- if(current_logtalk_flag(prolog_dialect, eclipse)).
+	:- if(current_logtalk_flag(prolog_dialect, ciao)).
+
+	connect_to_server(Host, Port, redis(Stream, Stream, _)) :-
+		sockets:connect_to_socket(Host, Port, Stream).
+
+	disconnect_from_server(redis(Stream, _, _)) :-
+		sockets:socket_shutdown(Stream, read_write).
+
+	:- elif(current_logtalk_flag(prolog_dialect, eclipse)).
 
 	connect_to_server(Host, Port, redis(Stream, Stream, _)) :-
 		socket(internet, stream, Stream),

diff --git a/library/redis/tester.lgt b/library/redis/tester.lgt
@@ -20,7 +20,7 @@
 
 :- if((
 	current_logtalk_flag(prolog_dialect, Dialect),
-	Dialect \== eclipse, Dialect \== gnu, Dialect \== qp, Dialect \== sicstus, Dialect \== swi, Dialect \== xsb
+	Dialect \== ciao, Dialect \== eclipse, Dialect \== gnu, Dialect \== qp, Dialect \== sicstus, Dialect \== swi, Dialect \== xsb
 )).
 
 	:- initialization((
@@ -29,7 +29,9 @@
 
 :- else.
 
-	:- if(current_logtalk_flag(prolog_dialect, sicstus)).
+	:- if(current_logtalk_flag(prolog_dialect, ciao)).
+		:- use_module(library(system), []).
+	:- elif(current_logtalk_flag(prolog_dialect, sicstus)).
 		:- use_module(library(system), []).
 	:- elif(current_logtalk_flag(prolog_dialect, xsb)).
 		:- import(from(/(sleep,1), shell)).

diff --git a/library/redis/tests.lgt b/library/redis/tests.lgt
@@ -22,9 +22,9 @@
 	extends(lgtunit)).
 
 	:- info([
-		version is 0:2:0,
+		version is 0:3:0,
 		author is 'Sean Charles. Adapted to Logtalk by Paulo Moura',
-		date is 2020-01-25,
+		date is 2020-05-27,
 		comment is 'Unit tests for the "redis" library.'
 	]).
 
@@ -38,7 +38,9 @@
 		length/2
 	]).
 
-	:- if(current_logtalk_flag(prolog_dialect, sicstus)).
+	:- if(current_logtalk_flag(prolog_dialect, ciao)).
+		:- use_module(system, [pause/1 as sleep/1]).
+	:- elif(current_logtalk_flag(prolog_dialect, sicstus)).
 		:- use_module(system, [sleep/1]).
 	:- elif(current_logtalk_flag(prolog_dialect, qp)).
 		:- uses(user, [thread_sleep/1 as sleep/1]).