Rserve_client: regression in 1.2.0

Dear @jan,

I just downloaded rserve_client via pack_install(rserve_client), and I received a Version 1.2.0. From the numbering, Version 1.2.0 seems to be a fresher version than the one on github; on the other hand, it does not include your recent commit 48a4616 that suppresses a warning related to eol//0 which is also defined in dcg/basics.

I did a diff -r rserve_client .local/share/swi-prolog/pack/rserve_client, the left one pointing to github (Version 1.1.1) and the right one to the one selected by pack_install (Version 1.2.0). From what I saw in the output, 1.1.1 is actually more recent than 1.2.0, so I think 1.2.0 can be removed.

Best wishes,

Matthias

matthias@DESKTOP-A2T8IFC:~$ diff -r rserve_client .local/share/swi-prolog/pack/rserve_client
Only in rserve_client: .git
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: .git
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: .gitmodules
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: DESCRIPTION
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: INDEX
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: LICENSE
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: NAMESPACE
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: NEWS
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: R
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: cleanup
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: clients.txt
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: configure.ac
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: configure.win
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: m4
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: man
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: mkdist
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: src
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: test
Only in .local/share/swi-prolog/pack/rserve_client/Rserve: version
Only in .local/share/swi-prolog/pack/rserve_client: buildenv.sh
Only in .local/share/swi-prolog/pack/rserve_client/cc: rserve.o
Only in .local/share/swi-prolog/pack/rserve_client: lib
diff -r rserve_client/pack.pl .local/share/swi-prolog/pack/rserve_client/pack.pl
2c2
< version('1.1.1').
---
> version('1.2.0').
5,7c5,7
< author( 'Jan Wielemaker', 'jan@swi-prolog.org' ).
< packager( 'Jan Wielemaker', 'jan@swi-prolog.org' ).
< maintainer( 'Jan Wielemaker', 'jan@swi-prolog.org' ).
---
> author( 'Jan Wielemaker', 'J.Wielemaker@cwi.nl' ).
> packager( 'Jan Wielemaker', 'J.Wielemaker@cwi.nl' ).
> maintainer( 'Jan Wielemaker', 'J.Wielemaker@cwi.nl' ).
diff -r rserve_client/prolog/r/r_grammar.pl .local/share/swi-prolog/pack/rserve_client/prolog/r/r_grammar.pl
352,353d351
< :- if(\+ current_predicate(eol//0)).
< % part of library(dcg/basics) from 8.3.26.
357d354
< :- endif.
diff -r rserve_client/prolog/r/r_term.pl .local/share/swi-prolog/pack/rserve_client/prolog/r/r_term.pl
155,170d154
< % Support for signs + and -
< r_expr(Compound, Ctx) -->
<       { compound(Compound),
<         compound_name_arguments(Compound, Name, [Right]),
<         r_prefix_op(Name, RName, Pri, Ass), !,
<         r_pri(Pri, Ass, RPri)
<       },
<       (   {  Ctx.priority >= Pri }
<       ->  atom(RName), " ",
<           r_expr(Right, Ctx.put(priority,RPri))
<       ;   "(",
<           atom(RName), " ",
<           r_expr(Right, Ctx.put(priority,RPri)),
<           ")"
<       ).
<
254,261d237
<
< %%    r_prefix_op(Op, Rop, Priority, Associativity)
< %
< %     True if Op is the Prolog representation for the R operator Rop.
< r_prefix_op(-,         -,    200, fy).
<
< r_pri(Pri, fx,  APri) :- !, APri is Pri - 1.
< r_pri(Pri, fy,  Pri).

Thanks. I was maintaining this work from several places and messed up. Luckily git is good at bringing it all together. Deleted the 1.2.0 tag as there was no uncommitted work on this tag, just the version bump. Seems to work again.