From 7e84455117d6612033c16028204b7bb66e7fcbbb Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Tue, 11 Dec 2018 12:50:52 +0000
Subject: [PATCH] yap

---
 misc/backcall-0.1.0-cp36-none-any.whl         | Bin 11964 -> 0 bytes
 os/readterm.c                                 |   2 +-
 os/writeterm.c                                |   5 +-
 packages/python/swig/README.md                |  45 +++++++-----------
 packages/python/swig/prolog/yapi.yap          |  26 +++++-----
 .../yap_ipython/core/interactiveshell.py      |   2 +-
 .../yap_kernel/yap_ipython/prolog/jupyter.yap |   8 ++--
 .../python/yap_kernel/yap_ipython/yapi.py     |  13 ++---
 8 files changed, 47 insertions(+), 54 deletions(-)
 delete mode 100644 misc/backcall-0.1.0-cp36-none-any.whl

diff --git a/misc/backcall-0.1.0-cp36-none-any.whl b/misc/backcall-0.1.0-cp36-none-any.whl
deleted file mode 100644
index c08fa1b1527e860e1c78bd5de7fd4061d7766cfb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11964
zcmaKy18`<bxA$Y)wrx9k;wR3;wryi#OfoSh*2JFJPA0ZFvCVJJz4g|4&)lz0?^?C1
z_pbics@=W2|J`dT$$>*)fPjF&fTT;>%e#xO(|G-^CH=O)o*EmO*q9jE+A<p$SlL^-
z8W=D+dQnEz!u64$h<J4E<c26IC01g<t+%<Sma|6ok45t8TtCE``m{eV8CF3FAUkEB
zE17XLo6l*cb^A{-6R8GEr$>wI9_TVLF!&(J@`kIMGyUuVzx6TiMbs}l-&DF)1~-zo
zz|eh6{ie#kz~1PqtFw1Uz_+@p@Bymy4_9gPv}}FwKtNJmK|rwo;i`+3g}srho3okA
zZ*SKHZCq9*6E~mesb<tgRxmy_HJ>-B8J!dO)R)(rv>7|7&{o0)59dX|K>Pr))OLF6
zGVqvu0sYeS6}Ycdrb%J$?d{#_^UT>-P*C8|Jl{@#9Mw1gO!im}tABpB5W3KAs=()(
z9AoQZ^5Vzy`#R~cTx`$xiFvua%^otFs3;!I5~ug@xHS|T*kQgNRiAIo4f3_}WT0tp
z7WGw!0lqWP{WPQAt7BtN4|KOiZ@LoWHvA|+VLRYs;My8gT(CVS?st(a*!^m7gG<P6
z!&h;JW#&}LqQLD@VYzJXqle|vRJ!P;EDC)Zax3E8a4OT$ViT3AJ~XIEb-H~NB6aGt
z0n+Y5LBR1Q1+TjP34WtyDAN}S!b^YLYu@=D++iiS*qe`Uuz1rRpG33oTgCNpSTh5(
zvE)`4D9$gmlag0P=97sG4MLy3n?{h^2FteM9~<u8mbwvf+$UJrD8jxs&t+m1W)RLT
zjB=l3*9<o}w5;1044uBU``*nyMRx(0d%?bedpY-DuERYy+|{jut{hc&D3BYMFzDDP
z4AjM7+87VLwpPlCP@?CcwlzblxQ%iFmEF>JCKFDTKrkaj=dtIy-}ASRtIzF2#*s}y
zkg}_#X;$)EX`f&dAv!mmwxa2dG~3pdu#H!n2C;A2jfEXn74n|zf<A9WmkhL{*QYO<
zjli~WEtn^nIY5SYyIL^tLVAUe@(zRNg&>NE9qj|Ifr#*LKU$W_=o?0oD66lj3|!Kf
z{5>lR(S<FQflNm3%kjX@<;w$FhhM<jBf~`YjAxvWRP*I5$@G}I3!ck0F)oeRt)hAJ
zq>fU0L$AOl2D(nqd{-C_;&5`Hl<k%iG=aUGO|pMI<7icBlCclC0hmGoq`}Tk<qcEy
z_tvqi^`%!{vqi5l_Pktk7EmGHf}SW!7%)rlL#|&6&;$xxiHH+AB;g>RZMAEioEdBK
z)koN#Xvfejbm8%Y5W^wA>y~0xSfs>;Wt0Y8P+K{7Ro9;`T>?#jvZ!=z+j>o(DaWyl
z5$ib_`#klVRH@#nELGjBcNj}SBfS^bcrk+ROQpW3)wUc}qfpd9BV>B$p(C(QBPzdN
z;un6$S^j(i+8eJ*#WK(ZN%C(0lbg_IO@{J*vA8U=UKxU0ziBNUMQQW^8ni2ZyW>v4
zoH-A<sw+ik3uNh9<fxY^jTy^WO8y%KH6@)}b@N6{iP&tfB$&>1ToUqa^<!4E-NxEL
z8VqW3bU8F}p8~V8eBz!1ftr;e6iSa1_|hKZxiMTghIdR-Ac^uEJUk6z4t7m)E(%)0
z(8$Xya|ZG-`V#Hp`ktc<ooQ08yd)}YD7Gr?kr-#Y)4*j~wnm}=iDqf&>Z&pMLk*PL
zmE@5`BjU`t=0=c8bD(9WdAnV6;4WdCwO32Ku}B=f;bghYcOCGFz<q+cV%#&nQlyU0
zf#$T*dg*<-9CT+DtM-BJk2AjMofBh>4nto@214rPWDuo#`-hDMqDzpBoOLI8qREw7
zgi4_c_+VEgrg+VTgE>X|7jIV+4)kkI_%+WUa~6R}vL9V;#CQ5YasT%U861lJDCyi6
zoY7@=Fh}nXd8d<wPms0N%!YQ_TdnQ@eTCO~mnW!IIm<^i-&9obtph79D4~)-nR-b{
zT&=>q?Yj0BD@vy$#jVXN3QM=K3wO7ACB{1`%eVIs`!fbEp~aRo5pO-UXn8RF&HAA*
z!kurzQMd+G)eFd$z-y0hvJMIIkr4T}iBsg|1hHy{-=Vt38qZA1QBwnCh~EN(DKXGQ
znoGl0kaCAR5I@Lp`_~Wn6ghnX4%o`t$RhI$E1!eijyNP#MLR`?g}ii29|H}8h{z!k
zyG3JCo|;Z^wxO^fa(>ll!4pD5nRS5cK^5-@OM&DWW9&sCpj%BYEgA$&gx;ye-;AWQ
zeBZ9#7|ajafx2UMg^v13l%;T)6JCODx`-1IUXp{zn<L0~7W7U7COC7+8AxHEcBPm9
zx<hM4Sm^k3FUo2V{8-X3d4RD}pPCPnzVty;JI!5H1Kx+7EwG`Rm;=%<y&Xc>G@H9w
zj5f1UQJ!%&3mRz^h!#}KaD#t|nDcAODyluhl;(IO=@PidfyRq`1cqcpRO@c($Pu$G
zu2a!WiGT$v3J!J50eXfY3px?OafpE~@kQ}j)}hxKiJkGZPeJlx7tQ6qc-dL5cB@Yg
z#kcmTq*(-DBp)1^@OJt5a=L5~@O-uZpxBequUM_$DHP!Hem$`J3mqW<AwSd*LJd1y
zhGsjA?5KDn22-6uB76d)yo*ag!k{)iuZN{!h%XG!H~JVRrW=g{?jeKVY%WVEt|DwR
zf1AsU@*)unA`<;JE=ibYiSx&>SvEO8Ep?Ji^FT1DD^u%2aJ9Y>a(DaUJ}ENx1M2k}
z#B2W{ma8+0SoOf(#r4w43J75zAon?cL-{gr{6!3>4A$_AwAgezDy}Y~BMC%463QGa
zxJ&-s6o@V$@?PNfJX_ILVajNywpEz1F%c7QR<&+S<E}}!+jb+E>(J26rRHaSMQM}*
zgokV#Uvl_(JP;}U8%S~}KIk=aFHV-JZT^zn^B1#2#F-z^JRw7;PDQ6UGyPH3wsP9m
z4n2_Ta5ScmA}xxTswN@ljeJr&yq7uH?VxU%U6t?}(kVRRNZN*-m<c1SPzF7?knBb0
zhP+b{HcyC0<0HRdQD607_@8g~WoWbYe+_u(dS?e}z7FfRUW^2X+O?;Fqw;E1+PJnm
z^h;Ke2~stYo-TfG$~vJ8J3c)aG$QNcvhPO1sqQJ4@L7l(Vhl;@C1n>CnLHzc1$-s-
ziGeK05a}`D=-cR}0;WJtZH3yga)5lDx{|yva!RF9$tAhID{gZUO++ujw?vsV42SSi
zt)yX~#8|))bh@NZ@*zclu}N?=Ne30u!#iTF%`EDL$zcWECF_YFDVpS*ayB)Zc8?9k
z^^Sb3477ge=FxFT-J|zdurMC!Tqrj-+*#3V61~43xXHn2NLOrEMSaSk)QA4U1s&ET
zNXA0cZ+M6VGt&4;lbH({lcE_s_{&t*a=(ax3dt!F9JF9KC`dq)6N`(|cnLnVz=vQ3
zvBUHo_z3qPLya$yOhA$G(T740$}06&uR`6=?A`MPDGw6zH!+|VR_EQJ2!4#aYUY|N
zAFSZ2>xFe)&NM&wI(I}Oeef4JL>%lNvs9c7&vIrx-D5<W#QVVK(ti0T+T@iKVj^B(
z*i&_$8k%*!`zB@mcop&;zIV4`<Qla>8pOmgSjk4`Vxruxk}>J~cC=;X8>hj^^SRU>
zki+g?)Ixi=cQNXTBN)r!q7OWys@m)CS;|Mf|755-uoV0uQk3krs6u3w^`$sZVxaQ!
zE>WJ>`>{EX)6dmUx`ptrlqOO7L49g1#k9J`ACT>hf$Z*VpnO6^7*ctrf#)odO*0G!
zYXrR$7Upn>tn&;0MAcr9EI0Hvi|#2sl1Vk%YhELd@z^VMGuSS|JkpM<g{esDzzUi2
zC0j2(LN!%EH5|i#XOvqqE()$cUsDrrc#moXTOp>OD4kH-)|aCecVaTVW=3447xGM3
z9z&}k^-R7r0P0b??d<Icn*1V7y?Y)_Ke_-0IE5;O;1~Df>fomuXcq0%hL4=tPuoUo
zRe%KMYQ%m;#1(+%^Y&>Ur$iu?6ZyhdsDfNt{uN>_-tWi9rmD@5WZ9|IZt5GjD?}|E
z?2^b~YSZ6T9K?R9G=aqmxzB#~DF!A}@(?f8FQzFGbB_T0ujSmICf7SYq?49<S8qt6
zoY=I3S<J)9%)V=q_cO`bgmdonU-I-RBbUZyF-x3$EOT)3_^)SwQh_-V;paMK&~mNm
zGTtRZ`9$Xr6E%56N}{_ZiX!P{=z_V-*6JnM88<a`?4ZLu%iYs!1!Us$l+EaDL<v5-
zm+9+q%1>KtIy-i|f<I6@naF0lj`=i~S-)pQxd_4e^L-<6d7SuyhO=CeY<YTy>*_p?
zFN!%C!mR8VhM?e{OqZP0lYj^sBSKVyCs>JkfGWacuvSm|{iG(u%pS>7Fo$q$>r_8{
zMxVgLE|l%)u~*MEV8Y_%*0;7n1kj8S(9jP=<Eicp&YpR!c%JW%+Y{1fu&olkJF(5b
zCkSSAFwF5l0TuYUA^eDv@9bzQOoMUlRLfq8HxGV_N<67Wps1X>D{?0}2Y-sk30|-+
zx8!#d+nD}5RS4jK7!BE%OL{oSMS;oC@*3I@=Hd5$2<iyHfekd>E3!zhGJP(U2a<9}
zlxZ^3pOIdID>`HDP~Sfm*nO_1&5~@CZ}1$MCVG7x&ZZ4v4dQ3z`AEITu&($(pygm%
zarXg|$CO3lI#|2Mde#j$5t+;17stO<V#*CK+}3tAE^M`iJQsJxclaFID==o{DGoeL
zOFcd|AV|nh%ZIzKtqe>1mH<qR&^y`8h|-SQ(aHdW@A|3ms6VxSWg<ek92e2@knpha
z<nD+@COg^*lTs80)w7q-r~wIFV0LVpHr)F&v8>GxLr+6ecHUY=#GV<b{I41g#Ox+c
zzK^lin60$>$H5h(S>C6^-t(b;Tl8neEn+<|1!t7Vk_2q2vRh>_CyV21K1Na%`9VkX
zF?}NY0#Aa)Rr$pcrdx5Tt)p=S(`oC@wxqaTZ!Dz3BKN1j0*kIgsW~O<^SJiceVjVG
zhhWjDM-)@Nsn3ya1^80B<mCnuymF{9Xl49x<8b_Agd>it38Ao#S3`$RZv<)ALgtgf
z0E3f^25EpOMDJ4CejcH0x_=ZZTus8eCeOBYu9}A6o*5#VoRtXw`K_5PnSbu6f0by3
z{d#anu0A~R7|Q}g3(Lv*C%TbmhTL2YFN-hF3Dk(m-7ZjgsU@eBgoZFro36^7B+j_c
zWwY!u(0!K0EnnbR1cw#a(v-t!o{<a+U-gE1rYUaL9Z;ks0wEn{XG-5L6Nupaw~CcM
zmkt}=dG)lV70Si()YCupdu(~^#nv3r<UVGWf~~2pZRd~O>Da`8Hv*D)Xts%KH=>?G
zBPq%2s=5dGiG+T5JJvIOXC(H6o8Qg;K$JBxS=>~Lk4M=l^~wKcl8r>9x$N4e6$p7<
zW_-Ge0#3e6fyO0DvVgYwK^+%SJ_y~8I)<Rq)b;eeIn~UtOn(sPMg8sbqPu#N#yd({
zW9$f0fm1xBm1eJTc9EvGm$8w}x4uigbtQ(WB%o$Elc$iuGVdlYTr!Kc8l9SGma(Mg
zkdZW9I99s|u2q6q_DdCPO7Hd><OmtN_Su6fjVJl2Pt2q-rR+UFqfb`ydz5C5J|n(d
z9tJIBAC+Y?CT5T|ZE~CmKK>6gvuXEUh?d^qBUgP3hnp}*B`JY(nUq?>1<MS<#Hl8+
z7`k4Yg>D5W8<Ai7<s?18n%bo4U_rMN`|!lg!@0P(8C>`4M(S3)lt|6;yZn&oCTb{O
zlxKClO3@|#8qr<?>_-gKIjg{UG1)%Q^Ew_khVnR6g^J$CjOy!Vz<MG2qTFrW0cdLJ
z?GIzSvb=E(T%!0)Tz9PMvKf+D=`l$nK<QCXi$%FVHhKH(mmKKppSb(=fyWE-b@EBv
zZDp}|x=-fOGnR9aLZJSthOnfv_=LpBaLdUgyRDR@l&Vt%W=F8@9jMXSE0#RUDmDoP
z+h>Q<8F@Rp@)G^DX!XueLHPP>r3fBM_^2FI%LeWB49@zX06Y#01TH`KN}PcuHNORV
z&R1EJ1&4}Jgu^OP>;*o}aP&dCCS(%+KsF1UgAH)V_v#89&da%8PKqq=dke++S%=ka
z6UNX?`&#03YjjUuE$kOu`97&`qaD1I#(=nE%LE_SAhcBdH-C&+S+?DcWZl58TI01%
zvp~ZfFSD{MfhKPx15_`*KHhYvKnoPi%B!V{sJ$$Ij2EJ_C+mFJ$U2$|mnhjr>Gn5i
z153_vu?c!TFE+kPK7T%k{VcXZ@@ZGTOOQ(XO5{9O?wt%6!j$`)QF}ywu2mPJ83w11
zmJN-KT)v^t>@^Wq@-4VTSc>Zt(+Y$cDJh?A)PxC}0q95|+na~U-PGm9L>1tV);ex=
zfMNupCG|reey$8y_Bop}d2#&WIv#T>F>*eGtRqxrL~_{z3UP7uf`Yj6lb&wpz-@bv
zCD}aagMKT5I7i0)Qtzqy+Vrcp;UDO`jrjhyg0`jlo8CaPmkVJW0aN>2PE(Cd&BCsA
ztqHKp14hx3F>K>`@Ndt(%Ol(wUnr~Rf~wptiR14C-H;~nwmW|`ETh!$J7po3pPehV
z@+^#2sJUUrn0-2+=pTUXvx2PRJ=<Xj^yF1aHDc6<D@^4?>fLg=D=;e=6Dg#PNP#vM
zZi49blW+nyAUW+M!4_J<^~X%1(W)?~ZcWN_nlZo+PtlM}FYoUmD;D+zc@EH@eI{8c
zk~8OCiJd2Ds_U!IVSGu<?&N=SY1p92cgc@BxJH)nxHv5mud;BeRV=u+{+d_4BJ*r_
zFW1l+TSp*}W4@I}gi7`v6mfxp6F^t3^Q)75dJB~5Bl_2|I{f=j<$2bPd+ZAlST^vr
zoLcAtqoe$=01ncqLpR(Su(qGq>IF4@AfJV$aLJ`_1qvLW^Re@NJDFq6GoD2sNw|#%
zwpMQWQKP-*=Pu4SO7q25RbkFM4%-&{!OnD_w|j1?-e4@yrkrZxa))?f;ms=p6DxdU
zC6a{l9_N!bG~Y#6X9yAagt9cEg}0xASfnwKZ;d!QX|Y@d2elzXu0q-4d@T=YRBVoy
zA|ym?jOMmIp-m4_21$nqhI%lsd6cp0&l74pd(3;d10vXX<w@Z+K3SCX=b2b@bGFZC
z3R0bltpwz;0k_MEL=Hne5m-f89y>tHpt15*m}jo2_@X-4%r?mS7-@Dy9gA&QT>HZc
z!i2;;ACSLeT&NHn3n5v9Q8BR?ASC(21()jUFK#^c#j<52G!2uPn7qq--^@OqPAEf1
zqlzqLek@jyE1e>D-o>F4n;;7smMx82q;G!3!CB#G=thQKaQLBis<raX&?B&}nzpQ}
zcZM<N8`}a))jTc6cU0RFwiaRaWja4wMbI$duVg+s#hxw<c-AW+;r2-@<t<L&ezp%r
zKNFiPJN(rp<c2#QOmRy)<>}XiWg9cPy$K$?H1!Y)4b7jEUBi2g?WoD;yfif7C#En3
z%UtQOvVNKZ{%^?Z*Ws9^#h;uL(^kdTOoqTP^6R(s^piGd`pgtxtg|T?2Ww@?M{Pa>
zM0+M6H?ok&<RpEh;FTb(d#*Cp;T#?SL6;hrym~Dm<#7Tll^NbX^=MMLCPhDZ#@^*B
zDr|DsuCqE5$@lnL70>jzKgl1ivy*cyo>XmQp(h3^S4dw0CKl4dqm2B1_^b0Hl47u*
z2qQ5fbN1<<PS9byDlUKQ-1T5$dzht<8F~kv{oqO0o<Eg!?8Y2RC0u_;7%bL2tgGUl
zem8QX1e#w+J~*kTfT{8hq)ry^gqbFc6-Qv`^H5cJ_l|NB<j1aun;Rmk`Q9nY$paNd
zhwNZJ2_I}{JrET&61$mWK=t@Wj?``6*@p45cC(nlzWf4xF$F`SSe@ova|O_^BaxD0
zzR75W#3XwTm{^Aq^exwyR&FfvEa`>ruWTAkX2g>Fme7?5xA1Uy``dK4Pszt<5N;<w
zoJznO5_PzeJ9B>nEw+MqjbB7gX}^&W8M{^U6=uLxQ&9k@=}ZkLyWO01S)_+KpZRh1
zS&(zY%=!0U9wkq+<!tV-@yNaSL}_kv+6Y@S#n^hPz0J*eYTaJ6-a*p-KK63cUk7*`
z4Kvz@+snU<j)YUZdg*O8?LaBoIB+uL?XC2BfvgygTvAW(X>6u)o&?GO+nk)m>NP^X
z+u)>nh83VZEFw<eXaj%%z(gW5zp|`$UrB2nJhZqYnfn8h>oQ&ZkG$iAhx_rR&m8#T
zIg57I*{2bj>G!+IT_vLpSR(<Tb~&8{`VHcY34t2jT8B}wox#$2<_w|!n!x3F6<?Y7
z(PN`lp<e04R^D5}br9Sedc3%<T9u_cQ#*MRLgXZm(GX-=iz7LiD<?SLTjrp`8_XC!
z_a=P)pB>!6jf*f6CZGX?09|jbt7ca(Oe!N3)NA81S>682F@7gjLkM}LazV)#MHot%
zq`OrRPZD}Cu;Gz%EYZ@;`Xc%kyS>R|n3!jKy4o>+BzDsWw#{7BOd>;Q;{I}Cul&6<
zzo8y(djIX6z3;5&XvvyME47;q*Pg5uj(ybrXhTuhx1R{kowE0Xu-i`-MWS1$`lMcO
zfBw?0kDKtem*2*Wa!GUJX<|OVt4=8R?%s;LwC+WwbX%(0;+N$4tV9r_6eX6;aJZQ=
z;l388Ayw`g+@Jz{rJDDE^?HauYb$EGfc1?R?b-zajnOF!A4U=CBrs#;jndJd{%TZ9
zn5!wt&HdJxl+tq?ZgMZnz#(4g_Co-V;;i=89ut<bpL*4y4Dv+<?VuZg!>e-S&^y#q
zMn&Jc7I0VgPKy1|9=JwdEEZpR1GM=l9mC{JrrLl<s49@!E`mC^r8aTJwI8eEAgnqC
zG=;H*5x-MmF`YEFt4;%Z29MNWX62>k1iv2^P;|k$QLropV`f*7v;eC6jtXDG_nv_x
zrfA3ucDErKOHKK?hrOMk*a1Y;ZR?TwsVN2R5yUVq3dKnKI6n2rZyw`@fc9aQ)(neB
zguXoN-7OdS+9AF8HWNG6oszZwNd_YluBL>kJHE#k$Y6o2fysi;+J!l-wYIr}!oS4i
zOb3KC`#^&|8R>rly2+;!WkrHu7^acZo8!Z-F<=tdhVXO0=%PxSKfeo>@8lBU6Hmu~
z;owFVX_t``$|AT+|K30T{U<C`%o`ER@}A4Mdc;j)FJISzX>+iX`r6vm+_AO7p;Sq{
z@VHo=!GV#0{RLe7+5*>1Eq?<?qXh$Qm+%|Qv^^dXw_HF~Pb{jEv4<K!PU)Gcy!Vsl
z0$~RNy$U6o0{&Dxvgb~u5Cg<C5~VBLgT%bqZNNX{RiYGH$Yl^9Af-rugx3BOWBVPf
z>iA^mu*!w<US;6q(kUHOKsgqM3AM&$(@J_09m1rEZW<&e=PIvB#TgZ4gYkC3pO`4E
zC8kT#4MBl5?BjRd!cW*ey^UH(X7XwTmaI+CF-6^D$pN<^EsHTB;`kUC5P*h6UE+9c
z?0kK)w}<_B^tktn#1lx@h~W$tRdH?oB3(3Xb|NMXx!;7q<e*>#N7^~)sl(QTK8U?@
z|A?fou+0GnM%nxo<Wftz7HV)TxEKx({WJ(&U4}1Aj%*}@jt&%Q%Q@P=g%vdi>Q+t`
z9uiyfS7j1TLOl+3Wx_RWy=XU9;I{Yo=%^Cei1ztaX_X|<3At7cIBD3(<i$i>y`>vR
zRIT*`jsmMvpy$xD44#$Ga?32WlQ9Kc1|=+6`yq^U)QA%~HUxk8Au~+FZqnXUR$+PJ
z7ctmIM$4tn`5r^oNh>-EWwBtizz14J*5*&R+R00nX#p1Ci`@+wJ#aE0nME{Z<=_i~
z6Xgi>p;5Uh7(_Dq%F)@{Xb{QU16g9Cqi9yVn|Ngllgs;%D}e#ZQmYTaEn=*s%iy~d
z53h>{3^W}0yOG+)p$`vC<cSGl>zm-pvUOfXrK~@+>RcngwJcP-vOwW#ql}9)rjN5o
zmo?crnym#|`N#T=6O=C;T#!1LDTxfpT(edjx|2^GV%T2{K3b%QLvBm2)!qYKHyhk{
z^YdJB*#V1YhsyB0_Eo!>yXgyXt56XiLN7_WKi^w_w5It9_*^uGwRk<;AKaYIJ|O`q
zjWmbo5!P<?c=#x;^Ioqm9UG^ayCL0m)DJszweX7+8VCSE#Gfp8#mp1wG%}d97Y9TZ
zKd(q$Dh>(eqj*2bmwXc=bYy#Zd^e{)#+%W6K%NvsEIeUZ+?d$?&RSule;iu!rB-dg
zn=Ln$twIlQhQU$@hi~s0L@LbmBe54rB>0G<kSwGj3SaEVB2}^S?Nfes{e%n1;^HFu
zqFBbX+_iL&zj9(AjqT{xA%ql*&%<{Ui5t7Psqk<iv&?HLan&-XLy+d(Hp*$F$E8cX
zLc2@ih+eJ=I1#D&4Cnnqy3U1E9z0f>(1FkH{4MxjwC$9JB?(IMm%<XLDV#ur9E)Fk
zS6p*qx2)ZTGF>SJD#it@mTXIwk^I30+pGO5cg5JM#1!Xigo8tFHs22;+}k>439F`o
zA+CCJt-Sk2&|@(Ay-o%V;a<8CWCC&C!EXzAy<R^?D&9TJ=i<tH+B;q54zV~y4@Vzu
zBkx6PR&XGmVH;!wu(kc(KYCZ!k^H#ZfWI0?^;h3Zi7J+qFu!Sq{u2BA+=|^X{|G^0
z-s}6ekYn;}h1VLg^`k)WJhXB4=pE~B;NJFlGt(ijT6oxj=ZXE-^u!#jq+pbj$~Le~
z%{~9>o=0)5VjzZdY+W?;rh3w+<aNdW`d&k$jf?giSFor9aTbWCv14(g&M@Ih_=;D*
z`4yL5m8^comiSF()wH7dILKiZYp9h_+vaX%QMehMIM5!PW7c0d_GI8yQq9X;{nj%B
zABf*w{!O8ygJAoikR^<;sVG_Y6>}rqL$UHoAMo5>!Fh}ZbxyzJXJ!L(=dd->O!j9e
zp3_I`x*7}wWCRifgyz3O@r*1?tV}FSrdBSlj8^vM4$Kk&RdE#=B{dmE1tw<~*I2b4
z`&AZ%juU#A)2XWAQ=b}J`WnPTGn}an)s=iZ(kKdPXWfrC8s3Dj`QiJC5@ee`6vU0I
zjKtH1K9<ThwQX4u-@)AazcuOL7`qzjEKcvrd}glvUU6{}0WJ8G`udKt&AIqv!;|Bz
zhTk}14>C)5HKMcR@k3KgfZtlZL_20Q10?(I3zG_nYk^g&NjT{j2s09G5%BncoKVkW
z!zS_}9hqEOs2V2{<hY7i2qRa8N#a~Pk%6{uH~tgyjNvpgQ(Sfy5!ldN?+~ZkB+tMN
z9xD4ZeKCF%@<Gtu<Y9^7h^HTD@hWt)E?5tNcRm7W&2)j1@4+K++G4w~$lTxiR3<DR
zEu<Sf#y9dy?B|kc&>?=E$;co{r8z>a_Ot}|r$^D4RRdy3^^8Yjxqim=176(euMzki
z;+1$(pfC&HGEzeVd>s>hQo6A?e&skLMBjjBOMDHR<owwtyfF34&S{+5Q^;duIX4k&
zZgD+Bjo=hVi?eU1bn;DjN<fRb+HhmP0#+SXmI@7!U!qTWW1jE=sOjpOb0xnrQ!>K!
z8a}0&u3fcnS0QMnN<lrXdQsj#O}0!<b=8d%|NPTww`wPG(}8O2q#x?gQubVH%;F{8
zjCE9(>(Vj(7`!>$g5S$kY@k8;2UY?iqq<?=NKxlNXZ!qaf;<9dJ9e!t07YsHiQY+o
z($i?iVB<!tJaqre)DUl2Bp<QpgJOBHi<gdEI;xc87j(Y-Eu9_ymW{X4qadvV3Ul1v
ziEDZe7Mq)P1<Hv-wNH)y-dc`pgQ0EV;EFgX>x4{EvHIx5DbrU_Z?1_Y-%E-4*d}0y
zfU6sryj8Ig-ojfiLu9gF&(51A)=dW+OAglHzQci*x-&D7X<8?<^}Hp1VG>`|VJ<F#
zN$%)?t_X(o{g3<;-hTVoT2K%Wa&Qn3s(%~wc4n?drbeztOx7+A_OU8*@v|%_@AN5(
zB(+vYL@0vFhq4lF*5q{&;9}Er=~U)~{MQ9?>ib>nUnNS{yl;Kup9I*k%Me0y<MI5y
z*j%aFUxg0d5w6gT!mvWt>PIL4K>s|{7JH=g<sx+4PD00ok*jRM5|hnlp$=2|TZ0(B
zq@lrq@$AD!wzTNQ<o>5|7Iu%h!4OnM!%T<?8n2qz={&O^msM9&ZYx|L%26)1*@V06
z(qlqvlI>jyDeGef{S~Y<)i0&ll}WoJ{dC`a3WG*3+J@HOhvE>gkV%821&*RmrE)3;
zVOHcRu|lGDshH6C!IsE-qkTAY@cb=C-E7VC@ZWND7DZ9wsj?Lhaj$;Hz))O2IOCx6
zC3_ZOjuq=`<fV7`(RBHaMgQ{c8uN{CCc$Jp<^HZoDg5i@xVYFZ#!r(OD>lxK&#@5F
zEQ^c*DOVo@hdew8h}UpPs)B|_WKC#%w?c+@Wu9IsWIooMwLCr~g3*dt<;szQN2X?q
zdk|A@>-BaQ5L=3+vKS=n(sHUiElR&t4e8{n&l0`7lU9*2Dwr)uSkOeq2l~l2D$B2`
zm9hR|&fyXMpCV3d;m{2JcW1-?wtww(R|iJ}TQhevTP9aeS2<bvp9%`&Bimpg|HL&|
zLh0-MM*U?(zwJL#@c&Gl8qxrOJp80IaAF!!j*;%?_+-5b%N+Zbv*Lstqb$P+bDfH`
z><9x>Br|lG@)XMyd)*xS)E?aEB=htg!vZ1=qwK_pe4PpnEgf(lPDZ|2MVg6)Yj$F6
zQf?kNUcR^Ur(;CD99QMP2ev5;2ngxFIR*r%iAsp7iDs(<<9{pHjvEbxDe;-^l-UC%
zk;5jZdfHa$W1LGW!Sk6JO)~ie2;tNDu8SB`Rri{3d%rqf;){v#%&SctGsc3f0CD0Z
zPRdu^c1-$ZBUl}+Gy1Z|;il#RMbq`ds;`~QM!PjC{OTjp3n2U_L2tZB?jvfu^<PO1
z5l2NDNDvtoJ$9H^x7S9(lvZ%`Xt1Lt2e|B_N8O`o9{BE{Z=>an(v5BWU>_>aOam1Q
z-fjhk6zKH829^u_H!qnLD1^%4fFxgpxte#d#P^d;RBn(LBsiS>H~H)Q_58H`o-8OA
zv?b~CGxdcm$rLHcL^pRp8{G&8dZ<Rzz>?;e()w0*earOdt6wj0@{31P%RX7snLenZ
zSsx}}MAG>9F0b{>@H!x4Xd}%{9+ZE<WW7}Bv#`pL$Tr=KFP^4r(D1i$z-Mk#NIw|$
zSXVt6SL&5}i#E{5xjHX;AK)joS0GLRd@+zv4m{Qr`s$yb3XOS?OjqIXEkS8p{^n&t
zPPLJnB2W4_XtpF~h8yR@hl%vP>vmur$vbm+a{&g=1O#8_c58|+7A4W8HGparLCqJl
z)ZW4`iK5pMfMa<p0$WE8F^_`<&4#pv{?w1#v#8W4jcY=`3n>Ft7}MuMn&LL$(nEa=
zdR4+p+DHdd3FRcPQfRZ}o%BM#U{pbc`;3QkkC~@2v&(cOwg(F~raiyMv`ynv!_TAM
zou(_n<U>aW$t4>X%Qe#*#r{x-(TCu%;r^tZjhDnODDM<<^J0PUs=te*ZJjs>EfrV|
z&Rm@{-Inq;F^czEJ0A74?fT;F$VGD?mgzZNNlwU~Nmg6jz;>ki@vuZ(S<O7-i_H#+
zu^b7YU<1U*8ebt%5KH#H-?bFeM?F-+?GE<^Duiz&tW-55V)8*ApswlO7vSVm=SC9U
z@Cb*C@kzzDU7B<l08<tsA!_=_%Pr_~_ACYmhF#KoGH=v2m3%Clq?ogn61Zg*00_ZV
z>Lfk$CVmCJR^{k9CraH96oZv8`Spc0r&6k5?{bfaf{YD2x*J4@1UekuHKY&3HZylQ
zdz_}FM-FOMQOFVCQzmxhAYIp@c|M5_D2xg~b1tM3$cbQV`u+ijcx1y49Ak&tdPCd(
z%Ep(hep}?I%uh7j1f!%qkJV4(k=nM6>r8{<&0C=a=1mad?H910m1VFcHmKR7E)vjY
zZ6pZ-ka*DLj*D<*Zx@^w1@ESx{i!Zt%Q3Fnld70`Bw((X|2YK-m-O5W|6ay6f9p5m
zfBVx_0OE=&5`NP%@%c&^kXwF~cZz|DGKSOep%&l+N;~4yh+e}2lVDw){MnjzCFmX=
zPB+<m1jOst_;gXolXB&*mjd}(HA12oZEw>N&Xt*o=`#sxr5zqHub#<k==elYHfg0-
z9aj$}bgCfT(qRDsH(j+tvGg1<dP~Ay@ayCH5Dz8gwU?e=;R~)=@MB`F=rr0bB`sO?
z)IF|4h?1}ZeS(qkyOCd!%a0TgJSuJa4RXiML1>o>gxHs7g5I~5@YE8yT37`nT^Q~(
z`nVxvY$Hg{pam-PpT(i1Mm}}rTBl1aBFBd=6t>tJ{m7e(6V0a3_R*L@FEO~hzfrv}
z7E`5BPVlIID*?F%1cT<%L@W7DiKFi~j^v1-+6i9;${|S1$U*$HIY#oMi_J&<o<*5l
z9-{n_^g?V0K2m3f;B)2tE|~Bh;U4oeo^RM@Zn707fA1Cs<zJoqTn{fQ*~ngX5I7TG
zm~8^~CdSwY3TY`Kv9LHVzBw@HtV>fMF4m~qp#}Q|)HjrB;e=WydaiADK$d>~OV8s3
zy?-fwHB3njN!XJQ8XK~cVz^ztn9wO7T|S?h)<P2@W`L7pwjMrTXXE}onQ`yS>hD1S
z3WfpxSBmfdKk@hXi~lKwL4V!;vo8I28t|WlKl5?_w>=0*VNm%$2>-~={S)%%A<5qm
z9sK`t<3IlVJ~H`}@aJCSZvq#|--Q3O!2Yo_`IGvm*!!DGPyR2|e@MSSnSW}DznLVI
z|HAx-viOtvr=a+o>F{sN|B)Aevi{Tnf3skIOP~LA!T<S^|4{^g;{Kdy{>EL?{tNDZ
XryV6ZNT|OW!2Z7e+G#$}|5f{c1p53t

diff --git a/os/readterm.c b/os/readterm.c
index f7122186d..74d5e419b 100644
--- a/os/readterm.c
+++ b/os/readterm.c
@@ -904,7 +904,7 @@ static Term syntax_error(TokEntry *errtok, int sno, Term cmod, Int newpos, bool
       v_vnames = get_varnames(fe, tokstart);
     else
       v_vnames = 0L;
-    if (fe->t && trueGlobalPrologFlag(SINGLE_VAR_WARNINGS_FLAG))
+    if (fe->t && fe->reading_clause && trueGlobalPrologFlag(SINGLE_VAR_WARNINGS_FLAG))
       {
         warn_singletons(fe, tokstart);
       }
diff --git a/os/writeterm.c b/os/writeterm.c
index 972af199e..715d84e3c 100644
--- a/os/writeterm.c
+++ b/os/writeterm.c
@@ -680,12 +680,13 @@ static Int term_to_string(USES_REGS1) {
     }
     return Yap_unify(ARG2, MkStringTerm(s));
   } else if (!IsStringTerm(t2)) {
-    Yap_Error(TYPE_ERROR_STRING, t2, "string_to_ter®m/2");
+    Yap_Error(TYPE_ERROR_STRING, t2, "term_to_string/3");
     return false;
   } else {
     s = StringOfTerm(t2);
   }
-  return (rc = readFromBuffer(s, TermNil)) != 0L && Yap_unify(rc, ARG1);
+  yhandle_t y1 = Yap_InitHandle( t1 );
+  return (rc = readFromBuffer(s, TermNil)) != 0L && Yap_unify(rc, Yap_PopHandle(y1));
 }
 
 static Int term_to_atom(USES_REGS1) {
diff --git a/packages/python/swig/README.md b/packages/python/swig/README.md
index d609f6392..90f64fe05 100644
--- a/packages/python/swig/README.md
+++ b/packages/python/swig/README.md
@@ -1,14 +1,16 @@
+The YAP Prolog System     {#main}
+===========
 
-<center>
 ![The YAP Logo](docs/icons/yap_128x128x32.png)
 </center>
 
 NOTE: this version of YAP is still experimental, documentation may be out of date.
 
-## Introduction
+Introduction
+++++++++++
 
 This document provides User information on version 6.3.4 of
-YAP (<em>Yet Another Prolog</em>). The YAP Prolog System is a
+YAP (*Yet Another Prolog*). The YAP Prolog System is a
 high-performance Prolog compiler developed at Universidade do
 Porto.  YAP supports stream Input/Output, sockets, modules,
   exceptions, Prolog debugger, C-interface, dynamic code, internal
@@ -16,7 +18,6 @@ Porto.  YAP supports stream Input/Output, sockets, modules,
 
 We explicitly allow both commercial and non-commercial use of YAP.
 
-
 YAP is based on the David H. D. Warren's WAM (Warren Abstract Machine),
 with several optimizations for better performance. YAP follows the
 Edinburgh tradition, and was originally designed to be largely
@@ -47,47 +48,33 @@ different licenses.
 
 If you have a question about this software, desire to add code, found a
 bug, want to request a feature, or wonder how to get further assistance,
-please send e-mail to <yap-users AT lists.sourceforge.net>.  To
-subscribe to the mailing list, visit the page
-<https://lists.sourceforge.net/lists/listinfo/yap-users>.
+please send e-mail to `yap-users AT lists.sourceforge.net.  To
+subscribe to the mailing list, visit the [YAP Mailing list page](https://lists.sourceforge.net/lists/listinfo/yap-users).
 
 On-line documentation is available for [YAP](http://www.dcc.fp.pt/~vsc/yap/)
 
-
-
 The packages are, in alphabetical order:
 
-+ The CHR package developed by Tom Schrijvers,
-Christian Holzbaur, and Jan Wielemaker.
++ The CHR package developed by Tom Schrijvers, Christian Holzbaur, and Jan Wielemaker.
 
 + The CLP(BN) package and Horus toolkit developed by Tiago Gomes, and Vítor Santos Costa.
 
-+ The CLP(R) package developed by Leslie De Koninck, Bart Demoen, Tom
-Schrijvers, and Jan Wielemaker, based on the CLP(Q,R) implementation
-by Christian Holzbaur.
++ The CLP(R) package developed by Leslie De Koninck, Bart Demoen, Tom Schrijvers, and Jan Wielemaker, based on the CLP(Q,R) implementation by Christian Holzbaur.
 
-+ The CPLint package developed by Fabrizio Riguzzi's research
-laboratory at the [University of Ferrara](http://www.ing.unife.it/Docenti/FabrizioRiguzzi/)
++ The CPLint package developed by Fabrizio Riguzzi's research laboratory at the [University of Ferrara](http://www.ing.unife.it/Docenti/FabrizioRiguzzi/).
 
-+ The CUDA interface package developed by Carlos Martínez, Jorge
-Buenabad, Inês Dutra and Vítor Santos Costa.
++ The CUDA interface package developed by Carlos Martínez, Jorge Buenabad, Inês Dutra and Vítor Santos Costa.
 
 + The [GECODE](http://www.gecode.org) interface package developed by  Denys Duchier and Vítor Santos Costa.
 
 + The [JPL](http://www.swi-prolog.org/packages/jpl/) (Java-Prolog Library) package developed by .
 
- The minisat SAT solver interface developed by Michael Codish,
- Vitaly Lagoon, and Peter J. Stuckey.
++ The minisat SAT solver interface developed by Michael Codish, Vitaly Lagoon, and Peter J. Stuckey.
 
-+ The MYDDAS relational data-base interface developed at the
- Universidade do Porto by Tiago Soares, Michel Ferreira, and Ricardo Rocha.
++ The MYDDAS relational data-base interface developed at the Universidade do Porto by Tiago Soares, Michel Ferreira, and Ricardo Rocha.
 
-+ The [PRISM](http://rjida.meijo-u.ac.jp/prism/) logic-based
-programming system for statistical modeling developed at the Sato
-Research Laboratory, TITECH, Japan.
++ The [PRISM](http://rjida.meijo-u.ac.jp/prism/) logic-based programming system for statistical modeling developed at the Sato Research Laboratory, TITECH, Japan.
 
-+ The ProbLog 1 system developed by the [ProbLog](https://dtai.cs.kuleuven.be/problog) team in the
-DTAI group of KULeuven.
++ The ProbLog 1 system developed by the [ProbLog](https://dtai.cs.kuleuven.be/problog) team in the DTAI group of KULeuven.
 
-+ The [R](http://stoics.org.uk/~nicos/sware/packs/real/) interface package developed by 	Nicos Angelopoulos,
-Vítor Santos Costa, João Azevedo, Jan Wielemaker, and Rui Camacho.
++ The [R](http://stoics.org.uk/~nicos/sware/packs/real/) interface package developed by Nicos Angelopoulos, Vítor Santos Costa, João Azevedo, Jan Wielemaker, and Rui Camacho.
diff --git a/packages/python/swig/prolog/yapi.yap b/packages/python/swig/prolog/yapi.yap
index 37047c60e..5fca3bce8 100644
--- a/packages/python/swig/prolog/yapi.yap
+++ b/packages/python/swig/prolog/yapi.yap
@@ -75,20 +75,24 @@ python_query( Caller, String ) :-
 	write_query_answer( Bindings ),
 	nl(user_error),
 	Caller.answer := {},
-	maplist(in_dict(Caller.answer), Bindings).
+	maplist(in_dict(Caller.answer, Bindings), Bindings).
 
-
-in_dict(Dict, var([V0,V|Vs])) :- 
+/**
+ *
+ */
+in_dict(_Dict, _, var([_V0])) :- 
+	!.
+in_dict(Dict, Bindings, var([V0,V|Vs])) :- 
 	!,
-	atom_string(V0,S0),
-	atom_string(V,S),
+	atom_to_string(V0,S0),
+	atom_to_string(V,S),
 	Dict[S] := S0,
-	in_dict( Dict, var([V0|Vs])).
-in_dict(Dict, nonvar([V0|Vs], T)) :- 
+	in_dict( Dict, Bindings, var([V0|Vs])).
+in_dict(Dict, Bindings, nonvar([V0|Vs], T)) :- 
 	!,
-	atom_string(V0,S0),
-	atom_string(T,S),
+	atom_to_string(V0,S0),
+	term_to_string(T, S, _Bindings),
 	Dict[S0] := S,
-	in_dict( Dict, var([V0|Vs])).
-in_dict(_,_).
+	in_dict( Dict, Bindings, var([V0|Vs])).
+in_dict(_, _, _).
 
diff --git a/packages/python/yap_kernel/yap_ipython/core/interactiveshell.py b/packages/python/yap_kernel/yap_ipython/core/interactiveshell.py
index cd60ec2b2..626bddb55 100644
--- a/packages/python/yap_kernel/yap_ipython/core/interactiveshell.py
+++ b/packages/python/yap_kernel/yap_ipython/core/interactiveshell.py
@@ -2040,7 +2040,7 @@ class InteractiveShell(SingletonConfigurable):
         list where you want the completer to be inserted."""
 
         newcomp = types.MethodType(completer,self.Completer)
-        self.Completer.matchers.insert(pos,newcomp)
+        self.Completer.matches.insert(pos,newcomp)
 
     def set_completer_frame(self, frame=None):
         """Set the frame of the completer."""
diff --git a/packages/python/yap_kernel/yap_ipython/prolog/jupyter.yap b/packages/python/yap_kernel/yap_ipython/prolog/jupyter.yap
index 9a928589f..4b4be4e88 100644
--- a/packages/python/yap_kernel/yap_ipython/prolog/jupyter.yap
+++ b/packages/python/yap_kernel/yap_ipython/prolog/jupyter.yap
@@ -38,7 +38,7 @@ jupyter_cell( _Caller, _, Line ) :-
 	blank( Line ),
 	!.
 jupyter_cell(Caller, _, Line ) :-
-  Query = Caller,
+    Query = Caller,
     catch(
 	python_query(Query,Line),
 	error(A,B),
@@ -67,7 +67,7 @@ jupyter_consult(Cell) :-
 	(
 	    Options = [],
 	    open_mem_read_stream( Cell, Stream),
-	    load_files(user:'jupyter cell',[stream(Stream)| Options])
+	    load_files(Stream,[stream(Stream)| Options])
 	),
 	error(A,B),
 	(close(Stream), system_error(A,B))
@@ -88,11 +88,11 @@ blank(Text) :-
 
 
  streams(false) :-
-    %close(user_input),
+    close(user_input),
     close(user_output),
     close(user_error).
 streams( true) :-
-    %open('/python/input', read, _Input, [alias(user_input),bom(false),script(false)]),
+    open('/python/input', read, _Input, [alias(user_input),bom(false),script(false)]),
     open('/python/sys.stdout', append, _Output, [alias(user_output)]),
     open('/python/sys.stderr', append, _Error, [alias(user_error)]).
 
diff --git a/packages/python/yap_kernel/yap_ipython/yapi.py b/packages/python/yap_kernel/yap_ipython/yapi.py
index af65e8ee5..92735de00 100644
--- a/packages/python/yap_kernel/yap_ipython/yapi.py
+++ b/packages/python/yap_kernel/yap_ipython/yapi.py
@@ -739,12 +739,13 @@ class YAPRun(InteractiveShell):
                 # def f(self, cell, state):
                 #     state = self.jupyter_query( cell )
 
-                # run the new command using the given tracer
-                #
-                # tracer.runfunc(f,self,cell,state)
-                self.jupyter_query( cell )
-                # state = tracer.runfunc(jupyter_query( self, cell ) )
+            # run the new command using the given tracer
+            #
+            # tracer.runfunc(f,self,cell,state)
+            self.jupyter_query( cell )
+            # state = tracer.runfunc(jupyter_query( self, cell ) )
             self.shell.last_execution_succeeded = True
+            result.info += [self.answer]
             result.result = True
         except Exception as e:
             has_raised = True
@@ -773,7 +774,7 @@ class YAPRun(InteractiveShell):
             self.shell.execution_count += 1
 
         self.yapeng.mgoal(streams(False),"user", True)
-        return result
+        return result.result
 
     def    clean_end(self,s):
         """