From 90e09b9fa074453c6b6f7788e45c0154c33df7e8 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Thu, 22 Oct 2009 17:24:57 +0200
Subject: [PATCH] WIP trying to get ahed with the problem of issuing queries

---
 doc/devel/uml/fig137733.png                   | Bin 11049 -> 13015 bytes
 tests/43session.tests                         |   4 +
 .../mobject/session/query-resolver-test.cpp   |  93 +++++++++
 uml/lumiera/131077                            | 189 ++++++++++++------
 uml/lumiera/137733.diagram                    |  55 +++--
 uml/lumiera/5.session                         |   5 +-
 6 files changed, 259 insertions(+), 87 deletions(-)
 create mode 100644 tests/components/proc/mobject/session/query-resolver-test.cpp

diff --git a/doc/devel/uml/fig137733.png b/doc/devel/uml/fig137733.png
index 5fcfafd28c5154ac7f6629b691045243613ce25b..23b1a0f442ddbe1be289b6bd8be9495d52ab745d 100644
GIT binary patch
literal 13015
zcmd6uWmwhg*6t?=N=cU@u;}h?orKZ?(hY(jEhUYT(jC%LN_VG}!UUwdySrg>9^7m1
zwf26`b>8=!Plpe1UGtj%cw#)`9=~z(>7~N+hiH${AP~qy=@$~p5C|d>1cFe9f(Sn0
z9ylt4K>mP8OFVn^K6z)xMF;<6sq3I0f^PKr5>FTx=Lk_UL->pEccBUld6jl_Nv>X>
zSHkoNvRp6{;mfxlO*hA=uqv8n6RTsRvJ)1cnMHm164}kuES9s^8P7x<Ka(;ub~KRL
zwHq+e?`}FXa|T;GN_-?8XMzCnX5`JWhCrUSy}*HZyJn$4o{A_VLDI<>5Fsza@ev?j
zp9eu8!&H(G$YvxZ1ak8K!Pin#zL7wPW2vQctUsFnD6`z8ZQ+chED<bo|1~Vn&MSS$
z<A`Tax;}vT=gVh4M=wE(jEwB|+26MvszM_4H^xbK2zqR+QDUHSz;=9wb#&k&M6(jN
zFol$W$$%Ks*A`HZ&Vq&di52cQRYfY`%H7$~QH${yIRS$Kartb%HI0KqKUK)N@)z#&
zE><Xt^x?yYx}yaXzapvDP${l&+I+DY7^-pcqNl3K=ju*`tR@@mS79_OD^bfrhTm~1
zB#QO+a<itjD$L4r*COKe9`9@jEYCO_`(mS_N{foxG@mbiEz+f%X}n4|ph@B*4+<BH
zi;m8>QEtU;p?-lgZxhd|3*OH2s5h`XmT9<HKmQkQBf>pFask{%_X{VA_R&HvKWtXk
zzSdTyV4`rLchrKc)|2}S_Q&YXJCn+qu#S$4$;#oH8uRDjolgWS%;49d(7+6Fu~Z(5
z^HO73L_|R{p;P--naN5Er&U;X7^yfR>vT+Ns*)M10WR(uWozDxs8_=ml=f@Z8kL**
zBl)=^x9)9UWPGusmYI4U(EQ}%JM*TN?pE=rRT$$C5_+yVI66uz<kozco1A=8RYe*@
zQ*ABMV7JuDsLHtMP=!ut8MWf$<U~p)I$bz)!!wor3*1Xnb7E_BCrQ}l;&i86tIC0`
zA}g@)G&C^qB^g&8W}8tM;eLFpkG{(>Jr^}~=UlV=%Lx6IZUVHpW!<J<L-RA!Z`-^2
zt%tv!_9i(mE`@LOSXshFcd;<8_q$^qNAgsqW$H3Qe%9C5lZkm2SxuSB##`rWl)7ic
zQq#<6R9Q|bis>eDty!@ZyZXgJIzb$G*}codC*)=4<~A70v2i_16}6dNH|^adU}o4{
zdHA@7nl87qQ-PG<Hb>!2d~B?Uy{T=6tiSK^#-Pa}S3keY`{9G*0wL#J|5zrva59m(
zS-rF4p_Q>>tYYnI(<YfXwmEn&AF6TZaZu3XZ&~VhtGzz((UBqNIa6A4vW~WP(xPn0
zDk_P1IAJ$t=GM~%G`Lg}BNR=y5|!lMa>oOl|C_koqUkxjz95;IzMLGdaJJtP@`6i=
z>tfS$aA-!kpWHT{PQDu9VN!jRrTSEJ{%uH!9tVeZ+jlj&l*j8Us%#V#49u2(K0emN
z^j_j4Uh^%8nsL!l))?fXbTlh!JCh?As$2%5{DdD)v`P$?J|gcm+``kzM6{a0AD1I3
zrn8Xl`YSf+rca-Knwy{9Ttjzugm}!bYi#DQE={1~@ej$aBh&QF>Ya@Ju!Wq-sw;Q)
zr)<o-Ej&CLr>eb*?AHi+d3nRaFp-%eO<ab*UWA3|Ca37@H@pwVUOe6i?oA5+wIRrB
z$v>Z8tgvjgLt-O$c0x+$d%hUl2)3EB${yhyqj6(!iBlFz!B{L4pNIS7t+b|N<>;Px
zFD8edKYol457(;~73_`V>ppG4xM9f}9OAl<wJYdgR^1lRKilB)=IWFxMUbahvpnxm
zJzJ=!w{Wk-a3(pKk)U811Xs3fb)hC6Araq6`==vlAceRopT+6+M0q~qJt1Ty*!ydK
z**X7bK6Rc~I};TZSM^RQ>ywqLC!4B4HmaHp#!sIeo3*;u){gLdUh9;bo`5%QI-5mP
zAKR>aE3l&bR4n134XZg>)MKC{yZZ3>@?@&pCn4d$$*C%w{Eg~2WxJj@aUrKCH|I;$
z$82I=o|Vi!;Lz~8IVlMjeXLZ1OGLD0x8xe&E3vlP-P$_ihb?yNPQz-QS6^>oX7*G<
z!cwN2#ly<evoP<~w-T$Vh2myW98wWDxwgr=Gdlef2E;8MPxrluhy?BG-P-!GiTbmv
ze07^J(kp*#Xs!LuXkoz6;9x8bh{4J6am#UR&%@V7(C;+hvB5+tzS!O2m0<6*c=wf?
zdU)>5lEdLv$0r~X8E@lF1Xx%a4QQPAL~FdnjBnu=U>Fb4wQ(Lj8m=jw`tFxRtGL^2
z*anx0P0ds7+1MOOlCe5Ht%KhPdF;1t!eHBEB6^oyY6zXr!U+q;g!Yb;IjGDo4oMr`
z6mO6EyF4z>$wb}NP?V~zL#=1rFON~@8n1**erlF~G|?>5t?xfS2o@3E#BZp6{xV|j
zWUJck)Ka_D=)&Dg*;*nYiHWEn>+MLcm6cUPgTH(ld?MtLxF2?DsY+jR?J_vUkNVFF
z^vU&#l09bg?myggJ=yG?ZPaJgZ_<(0LMBEy6ZCatfa?WR+vExfs4`lm)YjIH70(rE
zSI>o!l3!dj?n~@2kxXx4n*^i~&D$_iN}wF{urU-B*|@$R-k7fSYfVB*5a^Wjrc*7R
z<sxD$Dpbi8yoXx?%|hAFauBS)Jh4cuBk(r=m5Kb%^bKYKlZX!qBM|??2!m-(aW*Bt
zlG9(w@qd@uO)tN1vhNVE|DlYe7H}j9x%cHc`oAA7EqRY@TMP!Xvb)05&>!lWenmr&
z|3lJX1f1Vi5w5tnQM=PF^GieLr#r{xZ`eq(6rSQGWFqIUu8*7ijEd+Nom!bszgh|p
zxVdu914r&`Zbk+|)N;PumNFSNEp7A7X#)&qDUCZYu+-SNg-&5))O37iL*=`FW`jq1
zvvRnCCs(iQJrF@z;)F-XD&q1^Gn&@=(W7uew%MpX^VSs~pUgOxr1=d^K86jcX3xl6
z1r{Rc_QcW5@73x};(IJ6IypWCxy$wz)h0a;$UQ1f;Wrp=ZuKAT)vvnc>C45Lth9c@
zTT9}7s7y9B2_K<LPQI=$w>P1X05KXBtrA*~?9BjFhZD&0nx#g{weL>j+2+h99o8c#
zikCe;M;=sSQ&KG{DGxfDxbRg!J~${R;mPwjT1`1WH<mH%2nxd@7cF|(da%&eMZgrt
zH_-`^dLGm=$zwJ@m^bnxH;wgnU1>F0fQpN&{794liuAzQ>!3r4R7kX#nVdw(alR!{
zFhy5Q?G%>SDq|Q-7|N=1Ug>h=zt*pBF)=vvn&cjFN|u<ygMts#(k6DuF*P;CHq$SX
z1bJ*%VLU}eBM&gQjrLWAQKb)mC)9v|fTRkR5^mTrGDf=Btpc4wvfDBJ(eSr+Z||@i
zYfJ;-EEEF>c;c(!A4hA&l9Hhn<>fq%_K+n*9VGS;|A!Vyb*SE`w#@&Mjd%O5+7j_@
z-#Pvisubbm9Q0*DV7@1!^-mR<T#pG<+(EXF<bnngI~fg>TAI^Q9O6SE385Mw_rs<x
zp#~4dxDYHu!PUS}MxwX(3%mOiBMaqaRnQ{^x)%lr39N`Q8MyvP`r>9pza=XfOUu{w
z?;riZP5xA@#6&>Fc9s53*%A}jR~Q)nrDRvl5Fo=#8h?|$AwdFKCG3BxVfzYjH@m+E
z7X*>&c*3GV{FhV~xEmHf;ok&vCJ-phKrsFph+R)ufWUqd{Fj>cR^oV$PU!zHk!>7C
z2-J7jzh3+WPRmyiHR$61Qs5lVd$crcpQEK2w)k$#%|M95naQ~w@h}vl+~sGGTJi?|
z4EvDokM)FxDL_1|N=ivFVtsFGlb^zEL9=82NJ+r6Tw>6gv#7tmN4~mr<OB}-wrW)G
zL<-55SpitiL|SCHxVqQq)mB39j?F@XgY6%2%N!*r-3PCsQTYH19`fnpaJn|%FOFZ(
z2?zQj%EoNH%(T}(?1_LP%EBHwt?vuz+Sr7I>86|W(ZV_Nq16<wH>?b7@zisucyTBc
zt|zWyG%KTDB$Gr$0ve77%@q47_L@kjd|$kHad_Zz)j{;!aYt}tcjf^y(?r9?OZV$i
zAbmWd(c&QN<XM5Sbq*V@FJ2rc*+{)A(#i0=(ejI1e@Oi6;z#8AN>4R9MU{05gRiZf
z9VTX&R>S-0NU8xlyCHw9v`qaPi?O(FBcO`Min2R9<b_<hSAS(l9<ABnLorA%4+=Ef
z!b!Dpv40(mm!_es4HoH^gBN$)CN8sG$T>a^fyzP>u=)fm2&1Ss`iT;SoZIqL^$Ybx
zb}rUP2vsS4BdGN?Md_uRYHJ@*ODm^t_BhssO-u-MM^#nvPE1_Iimfbf0~wRfT<f^C
z5K4lj_DxwSw_LZxAex!HqI_$Af5AFsx7eK2PmR*|M|Zbgwe{Tc&z@?Vw2`uGw+xy~
zDJcmF`fwhOI#y}-4FjcwOq0<2Se`2bnXrfmVy|1?XU{xinbheuqMR?Fbh&l4BZ1**
zGhdZ<lKA%8yU2&)r^c^6yh(`97h;*V@>KJqVjRRDMLRn?ivWQ!Rn;5EI->^C9Fz&D
z;!?|rsx;3!&NqEidU_{lEC>d)FK{fDmtO(RXJBU5k|RHNyer}{+c41kd4x$rdANs!
z+g4gZAv82a&~{!frH_?~$!!%j4~@q_-5AR5X@8Sycewv`X+zU_clsfdx&oPqYg1$6
z?nZ7;F-Vrx*1hhr%=%3?NjA8hAsYk)Jj&9=A88=42M@+ZDQ&{lL<IzD!7O&f6U&>E
zWY&TZ|IS{AskF~G`3gsQJx_j|7;+o9NB6sQWoPtv`d4fl2zP%#3812nIo8jyezCzm
zM8y8+X3x(vkD5kJ?~5cjT{w}~CRB`iX&(3DDuXjfp&!b@eR*J@^VeDMOnRoyk&WKW
zX(Uf%dq=3!Mog4p!#_yIdQPFbd@Ft0V)<}|gn+Su(`vFAV@CODeg!`_G$>tScjhWn
zK8ZuUcs3-AjEIPjM?{2*-mEIf6-dO!>$0;Z53%Ld)%(aE(-j-#k&(~t+ps_~K@d`s
zd)9RJ7Iw}y9)UXSK9WPor$=7b=K>V%+BUtU!sk>J?T0H<q@?w)O-%Hg+?V`_W~-|A
zvYH)7KJ(P?YzxXIl)MJX0UF3RYj(C2F1@gjkBiG%sLiMARg44Ck^rwZS~x}Y_;GqO
z`y#oQ@OATTKD{r${pw&3n;R+xCh29VDic;ppLKhnqM+kj&;9w21WZow%dI_VVCHkL
z!HsQ3HD)oVZ4xL7*mclAEHRy<VlVl3_W6co@`$i-!d&xGl0aN(`9_tDkD1s;{i%CR
z7qkl?lc?)^FwoJRZBO*<OuGCmb6<Z6H85BM_0ZnbSsR!R*yod4?C*VjYAANc>-|3W
z9YX_&zq~quaVhkRUde$B54787OE(BH3d2X-g9CG6*W>G7zr3lQd)`&jDJeVIvidsp
zPDdc4f_*mEbn`-{yD(nw?csc@I7K_CYm0O)Sh%?IO?&gs_TF3{55;~{xp$%}@_v79
zB%iM<Y{#Uo5W#@`*epXrt?={W`ueZt+Xoh-+q*+uW3zhBx1LhHpH)E;-&y0k_?3Y~
z;Tx`KtUmTuJiy6f%zC@Q<@WTzoYI%yg_DDiuNu^omw8QByHIQEU34~XUXb5cWrFQ1
zYQ{1u=~wjv7_U#YwZQ!zs!m1E>jjihM`bn6y$+L1_fM2SfkXpY)}mv!`&1%=65>tw
z?9U7UKC%lVTnpB~`3*TB8jqFRgNSW&iZA|nj4*Vk(qPDUscO{k&!pmA`)lzD%U@Y4
zu}RHWy3{*y=<d_@AloJsh!4Oc{}6YpAMcXb7BooX+s8K4p`06wzT}h3T=}H?x;6V2
z9L2rr;<LHYv@CZghS@r&4>y6g0F`9HFrXzzu^3OrO?D<lx|e`D5a3^b%#){^_ZT1W
z4Ch_p{R4CNE2qne^7w~?S}ihnV_-1KenMK$tXo%T(o;QI;nFqbrtxZ65Gz~|XnFg!
zA~XtKYhhyIaZQv`vjJ0(BiI_bCx`5R)bDjJ=Y!28VY6pgs1=HV_PLNP{L{tYTyrS)
zcYpvKj^m|f81JN%M)4=Scu<auxbt8Bh)kH)(Y$u#FH=V;HR%CqLlA|cNLMyAILYbQ
z43;4tyxKpPQ0#w)Km_d1e@6FQ9v_Sl?M@u&_QdT%16O-Vb|#Ke26!KMOWQUDo=ldl
z_=JmUx!rpDH#W|+e9-m7zPWTX8#0A?Bc!CHFpU*xs-g^3S(UpS!F97`BvbmT3?2ey
zwl$dThyBI4YxVN`^70(`B05E$dT~^8^4qLX1m=&_(x116DJ2WWPIsQG6(qbWO1@d?
z;rq->dZ#9V_H=e0138p_MiUy?(t=g2qp4n~6`Pes0`N(<x_C6Lqw^lT$jv$J-UEd#
zbS5<i_w#)_KeXRMQ=_!upz47)Lj>h${<C}WYK2mwHx3ui!#USrkG|n!J|5;_-}gD$
z%4Jd%hh92ta2_PSNfs8~eD6A%0y3R1s>caWfd&Ty|9b_A_B^#h;bT7*E$%wog)uNS
zsbXI88<U6ztrgD4NRB|n^%1;WTx@Exqq5o@Zb{@CtEp2X=P!{>EK-Par=p~c=~`G=
zFsWmOAam4V-rJgM9s)v}Or%@bk&)w%^vrKb_tGsRDcRXU9$|dDd~r1P<%`th1OX>4
zR!bB+D`K0)cuCC=0Rp}x2&aEjTp&D(gk=97F)x)bnbKcG6<43JvlScmi;}QA@7^CF
zV63M8>1Ie^Er-a|)re{M6AJxu65gMznHW)WxWCXblv~XCs&YC3=@+GPyNvX|Nu0?4
zls2doYDLom=7Y+baaX6I*Q-fLUbpNN5_k3U!!qW%n#k3~MV<AYqnQSY<=RI^v-Om#
zg>fX&cPFt%@!z1GgstuHV#iY0lTTs6NxbgoPbk`dWz4YZ!&#`QbAZlaYu>JO+>)d4
zje2xP94kxB=gL;JhjOtPk5`aw^pw9gjJz|(eR?-1&NHq&R+j}$c&C6pfbeAq2lXmo
zbJTu*58oej4Di`lGn{L!d=H!Ra9$Wu&qccL#Cm@Ck&o?S4?Xxg%J%LyFL1VEouBmg
z7D~BaZ%c)~oojHR6NM*WQ_|7#F<W+oJbIRq(E~pzmi8O{)!@<wXo+7_!+fu-FE*&d
zqN0k3M##YQn&B`YQuqe`yDl)Gka#s*r><wtW396XzYz-z7dzd|XX7=S2a&M3sik|%
zC>_Q4%9i=}z;K^T-`t79?Q{1g)vf%MPHJz$;>_$uLUGc}8GQ*JM?TsGIAsa7mK=`M
zm?3Ko2WmP<>@Z|LS_E$AKPZWbK4>n0YgR$A$bC^nk<pPN^i&)uV@aj^bg|1X$;=ME
zOO$A7UDv#0Hj+Hlb8V+25Nwu2#SMGm%?Xae;0Ccwz>aAxr6(8|8BuW4x9@7}RcP>)
z;FDnd=Np;BxAmL#%)M3Z-78xvqeetr=>ktyi9U%&(7j&fW1rg$@<MBQxjq0*eCb&!
z@E9T^8La<Exg9rQicYb4$p-cZgQ@P5K!`~IJ_ByE(B|^hPhJ;5RoW2={XMv44MeXd
zB`ez#SeTEe9gkdsA?R)D==W8w*(!f}b;-{{S||rHRkIrEE25}f+}zw;Tt@QM_saW4
z@t{A-8q5YL6%`fP*ot%Hlcb(M-}1^>Tv|$V+pQ(id%sY-mO54bMlmCHZFyNPO?0NM
zt!-$iTr!xDPBE3aNkKYlv`|~U#Bf#IJoXj0;bt7yBvuUSBgr3EtLx-IcGN0o%ak#*
z>C}{XT%Ce!8+nIqc2?r`)jW?)G@YEB6l7$gOfHT$hWdq%<T7IWQ$?;q`DWjr?`JUg
zyy;6e|CRnsK|z7T5sgC7aWf`1Hn!Ms6(&4oo?3{AuXXMIwzxw|g<bNUz5UtFlzQb`
zRn53GkJE|rH~pJLpi(gVmHy$d2GAARIA&=@#s1#jo0Bnp^uh*(6v5`}!(jMExEMSk
zF;P=41sX^r8&{y$sKvT%Z<?AWd}JAG+4=BZ#rXpFP^yvry33ENzV#`U+IK4n2?_9<
zt1X8*vD<5v+#!aQ#Kc5Jk&{<yYH`?$0Nu&Pv(7Yod4)dap`@gA_wYbhvo<!4PE0g^
zb0#*1NuL8I4G7!eMz^!#X1G@F(8`s1W>>SX+<EOHISNfi$6ncm9zw^oHE!x&+UUs0
z$#*~W)YR1OA#@_v;cqI>U6Laru<`Jye8<7Mq=|Z1&(x`wRB2Vd)dkaS*yi6obT;e8
z#?N1qAn1pUiHQj&UboydG@}|;m#}Paa-go_pJB!dMataD3ndkD+8!@;-kT+WPB*%#
zyX0M)UmkDFxgUj6OIKQqRaIB3qj7O^9yYnR2jWE2%3mJ!i}_*CdEMRs<Zl7kxLisQ
zg}A>v{9+B6B(p=24ANuJ)I~|Few~qhcr{yPrA<PTw7tDOKR?f5+)3}H)#!S%K9CtZ
zR-{v_%wP%dsFBeZ_=-xdg2!ItSwlku=u@n%uh)3qxTYwm%cY>DDDWAyc;8%|k+^F2
z_!5TqBE-ZcdiK*ubGn4bQC~dX@2z#%P`<f5d8nF1n_w7}uxU>t-GqaK)4c?mI7@sG
zEkpmg&t4MYagj0Rz6ouwk$R=&<l?CHZ@h{dc~wuU)xXK0M8-MYMl13Xm&JNdP)P=5
z)ruh6XMW<_Z~1_Hb=H47)=b;cMJ_AN@S05G+jO0y4d7Y#&56?q02BUPT<m;x+V8kK
z{k^lZb6|jiWv3}k|7)X1?)`^|XFFHVP$+s1zbYL89nLS*-1Po{FmmmOI10sYqJ23D
zdIPM!W<#r_c$TQlA8Ah;4=E&>KM;z!m_j%D-T~Ndsli8=D-#)6`t6%DNaS<*>h<2<
zk3hW$ic?nII;-B#B{enQ0EJ;|s*+DKMWMhX595`YLMU%}Qb=iTm(WvSw)jx^Ke+DS
zk?`2om`!~Re>lmQ5H+<RpE@SyZt7X(YO|v^P6TDg&nqD_>uQa)oUQu{ySsVU`f)22
z6%KsWp8-`T;q^@uPE3ff{R!GcpbiIGd3#RGt1B$i(2$9e%Ev)a=&r+b2YAs7k4|?S
zz(AyCFf`EQx7}96gYY++RiMombGf%KzrZ#^LPGGNz5xM5*H2?~QD3Q03h=3?@-XqU
z@3&1>UJV!NvM|2QDlC*A$y1z~oP6){u)H+V6h_SG`&GMIs@huA<I?wRbA(l21k~+-
zTFtq08380rJC4zU592<AEx6-2@^iH$+clxUk_p2liFF@9>@#XnZ~(fQmyV#MXG&JW
z(zpi%FwBqetnoMUfgMX~a`f9lt%;F|<L)a{b8t+w8AmXa%gNR^za3G>qdR5!nGbUM
zqbI^|+5^Yp*wP~Q6r+~i;MZ?g9Lg7C--iA|+I2($hsl**$B=Tk+BepOI@gok&5?Y|
z>G$khTs{02ND!v1Z2SRz_R4ub_1K;Qe}7hz-=!NUG_Xiz0)vxIyU4L_kJ412fkU}$
zb@f=x>P1Hp6y>p#Y6asPtD|G1RX))w;h?z6EMBf0%TfEfFCzzw&(@+s8(ie4@E#mg
z4q9hR(Axi=-;KDj@yO?aGXb<fw?0=IubNd?>v;WOaI(_P54*M1KGm(Lb)jtlWCkU|
z+1jJ=<)1ffIvPi_Za$QhY8zvNwf4c9<^GDvHOKv8<gxCdkp1O~n!W4~c99>^^xmtw
zVB>Mkf}$*Lg~!54zh*x_RNjrkH#4)%=Ybde+<34%He+`7B#GNDI7o}m_x(z&+AaL7
zRkuE@rz{yXEsNcke~^_icZO=aFG*>kj%l1~V?a!0+!)?nIZ+VlHNNMNM9H{L_d1*L
zLnrc_sdv^Z)KUPQKNhWqN~@_zTKVZ!nC9(ny^Zzk^;j%kSD5Y-Jgz3)dQ&F#-O1Xc
znkM*4k25Hw<Jk0z)L3#Y#*}5tr0`{emwX{Iva%vtm*_ctp9z?I-tA0!bcXA1FDP}5
zo_bXo^?shIv{2vrwIBdgb&h=6$$@!;(@rXlEHsQ<Y;EbN3f|`c8Y6R_ZmDT=%hS_3
z6z#E0%?vBI7yUm=N(j)2!t5Lz=ocO%wEO{P%Oqzkocm{``iV+VS{826?At!M@eNom
zVw{Ydh}JK(qlQkNwP1+9WIt?fdPbMWRRs?c_Y6q2KN)0q&?Bce2<-fK`!pnl;Q|7|
zjk@y!-0fMIvqK7kG=$x2HHq>u={oK8G0Yx-!Zyx1e1vX94lMhe4i7c}>Z$k6z={5w
zvEI+zqG$R%m5rE=2=L>bR?!39B$;pZsj-Chg&#OON>RFl2#Z%<3e!NDZR)-048hqB
z%l@DVs4M-m?>MO49|^^@!1I#X5RW4F>g6LKuAnL|(13+oW_)-yMwtGGr1v7eJ?vRT
z%lzHwn?$s{e=<-gxxe~ViOlpoD7`?VrQf3URJ%nA!Cx|*5R!n-avB+R=O2JoKM!Uo
z*LvQMW$+NjEm?EQ2toyn!1a!>MuLFVdP0ZvQfpMmDv}||q?dBeFnF3i0gJ`6rQld2
zi~3D80t6n(lk=h}xcqaS0HLgX{VT|;k~(~b<HZ76ODxE`x!qh(ow9FmIik0rrc#it
zof_2=3v$7S%B&w^eeQp}fFvXndifR5NXiUOeeECvGs|KjjYCZS4dXw~iLARx>Ow_`
zA^hhg{>g()B!BO&U{GV*XZ)W0yZZTK*_RGGC?s1l2y$0-H~j-g<3H0J_#Lm5zYBW1
zxx1@?ry{+;%q|)GsX6de7_fpV1Xta;EMBTr@GGFC-|Y)_BCY8&a1~^8BC!skL?eot
zpwc)SgJSbGk6eja6%}ItG^k}9El0N1fL<Eaz$Iwnj8psgj%456rrRuDCKzuM0bL4w
ziQBmalQ@*Hne?9n$PTGXt*9x#ufeX2)EUR8>$E$)v2*vsA{}*@u3c>nhr_$|O*BuB
zj)H@Oxs+rPjE5FW(oRid9|aM<88(+y+Oy4Ax%{4-oLpr!rSO^i+nfH>Bt9Fxve!Rn
z8{K->@;kcjo5%!{v+q=nzpOYfHhC1Jh(pm{Yrm%Fwo_>X8azNM&Vm5+x&IJ;up-s=
z=hyoLB_ic`N(O4|mVo@IFdHy}C2(9&B9&Nv4#sXR4g98UI7%%IyaFaK4|*gEw)VWj
zU@*A{4+6k%AS|w<q&mCq{|FdxOrQdCm_niz1!r<v^ByxX1EMikTE@GUX|sc=XF)B@
zwil95Ghg7Cg%CQALViyY{|`vemkyf;TpkD-Y?xN)s(I{GlIa{;)0#d4Oi3Htk7=cw
zvb9plScpm7yu4{Z%YruIY+A&+4%6)ONort^^pD%Gus+?}u9M5(q!tM3&^d3T{nAqQ
zoXd!$@<C684PZ$D^&_)%)8(z6n^oTC403kfAbf)yoSut=%7u;dKA;tx=3bWJYr!S}
zB4VEH0VZ>Vi2%b!Cva~lD_f5g>GqbKh=J0*rKK<13M`gyC_@dJ$In9TGg^5qK|7;4
zWuAHRyH17I!O4mB9K5zKMSFaFoL^8dD|_bb2)(j;Z#ezgJiu)z6t6YOc-}T;8WX))
z8zW+y1?<Y>(&%WF%AqdoAqnRBW<H*ah1*i-MpM(0FSfpW=~!Qp_}k5ytFv2x*}~8F
z4q972aDm2sBiuECxd*66**5=ssji!`3@W0r)N}3aud|~b^S~7^`bR1!g9wD~yatm_
zw(m9%76L4MvFF^QUl!|mJqYM4ZW5#s5fMkp(DzGi%5vV@fClnf%^n<~Ta8&4U>mLV
zEdkGn=M~G2^ei_xBjI0;No#9QNO=pAqE)j0qgNlYy`2oQ0MP1Hrt%s()5CaledrYa
z7>P3lcjZG78pbw0Hv7`S60?UDV2n4XQ{}*c;JhO^P-&45a`>{gZoQM9zWV_jP#8cA
ztpEoF<`c2^wyl}Z6J6pD_KCBuoo_C8QiQ_gQ>Smg`|<2G^3hWo#bO&R|ENVkAXQA&
zak@CPx%i%${!i&fCRj1G(Due=wxQhPDpDckGay7KU@*Vec&)!U&g5b+d#kva>~!Ec
zmFM|F{GBMMIaY(a-dtM!zxC>y<~L&=`(h_1PN1U3s}*6KoEFVxeY$I)ANMSiUVHsV
zqGs|vUx|-t@|fbYy4<d{&#ozT2q!DdfAy^f@G?@NFwg4)Z5l7b3;<lbn``RpK|k8%
zWQ52>Q$beN**<>)z%CL#UYi*~kc55!;W*nUwma89-s}bUMYWNVEX0FyTW?o^R!V#O
z^4G79v5X?B`Ek)ryl!r~x9}9va|1_HQ>Sn;HUga#YUxYO?USvs&thInXLGl>I5^s`
zjygf&$NpuvJFO)Dd016ubHvSbXR;CSMZh;aE;quWESGksHZU>k08;7yd~(s~=5>Bm
z&2TWKa+g)%0f#-QNlg9!sRTxI{@<GU2TZzEmft_z%hj$X^8o$@NftbSDR!#YE-vKz
zdV2|=I<<#WgV}pU`pv}vaDum`{UhD@ARjcQoE!_`t4TP}!1O<wfkp>7yvnHKkj7Od
z$h0wfF7f;}{7^nS-o&N#qdYp1wTuFM1_V!yU1L}Ho-QHX7yBlZkWTkLqDOqzz~iy&
zaaDDDxfKnE@7=(!M)OqDSTh}0R#)|!J?pJ!JcXRxm)FjqP0ewq=s#*uWEg2pEi}f1
z0QPQd*rcHbJgCst_E+fR6`M^bgt(TedUy;&&x41bRqLH96~$6sI^j^>Z3}#?@Mo#1
zjzZ4X2g{WpM}I>`=VjH{?+e5!Mx_ACU}sy$1vGXtr7q}bY2DsqC_AlF|2(_C80qVa
zeSmRpJJ&?MIsC23a>6%^G)+A&k^7rII7a5Ynv)_A)<F*r7<~2yjJ0ICJL!@s5jDKQ
z%%uMzwp5U>*Z782Pe(gf!BI$Pimo`+4ku>#znXPE9#O>}f(~7)PyJ)3xI1mUvAsD~
zoIUhtmHwkKPE1UacIZ-9KaYhP8_&tE+g_oqV_~YZV9*cyZ|!&2KH%V3+S#@w7whAk
zXBLO#NCu^6b%yVe;^NwGjfyy*3A&wmdI2Lxsqq{(l-`XStU1{9>TwSC`R2yP<%Z$_
z7=HpmrlXV0rYDC3r4Q)$PccDhsVLx<j7gM)RWrmo&u##iP-(lcs_%8vs8z}MUu`JB
zX_Qj7T%g(d;RE?-(M+z>&RZoVDl4la=j8jy7c5#8wV*ApDB6Sl9-7_AfOl9rh(E9t
zCQU;pJqYkDo!t4AvNf=kpi@{{S~~3}7sgnQ?~gUK*fi@VpH=Se7F}M%0JBMV))m4%
z8D~wwbmoMga{5O~lNyz$_zN0Y#J9wy3JS5WURjK5`a|S;WK?|j*(uukIFSsrV8=WS
z$moQ`B~@QAQLb-pJlx%tm6b7SSeMwh|1n|2dM{oC;*6GAO;u$+53j4KAvV;7yu??Q
z2z`J>*52NpEaY5d@Ts}E8Jm)Z#ssYSoaa>`_TrGDSZGK{47E9c6@^-rho`6T-TFOW
z>`$LQ?MzkMfW})AuT@{NKy)=6paej;s^5+<($l|SU~pK_Yjn-d$^xiCKvYzej_&#G
zA!r%Clv-D%PXVB&qrDv%Nid1o(>-r4k!7o_X8=<S4({<rxHnp)I|Wn=NQ!Jt=YZsV
zaXZ@$CS;jx^0?YxXanSh^vRP3%Lz_^m9nz3z~w1|jxx=08R7wbsUr2@%k@q>L7|}p
zQ2e@m0Lgx{n4WmH+vR9Q*VAo**FPd;Vi^HsVb%Y%xnqJ$?Y(ICU4j7yI6B}e`Rc`<
z0ICEt;@pZnqyaX`i?y_H&^P6`TLi+1M!FjY8{TjTCl@PvnE?ghNg=lf)Lwc<78XgM
zv5=6kzOaxX>;WiRnJpkzuQgd~Y@4EW%gV~YoA9|DE`w>Swwx&Y6*b5?vZ7F%!xrLS
z3-??6++<?1Ki>*WhiIs%2WMwkXlQvlweMPSZ@z<yzqsMBJN=nYj$GoGm?!+U>0tiA
zFddzpiJ&#LwH;kud~b)>S9_BV4i2Cwpk=&5)ZNo#ake`H$~7_DdGEu?kLYW$F)<b3
z$!VUK=3vG2^z?vfk{*98cv)qV45d?2ruFAf24-f<z1c<{aJQNIGeGDxN+eJQz>}Ak
zUsFgld)`DvN4uSFe`~l7W@|DV$r}M!Oua~l0RZGs;Hos(8ZC4?URTOhNNHfwDmCh;
zFdx#YvaB`k(&uAiGF@2di3j$=D}bT^#2N!Dy}h%89!I>;i(rt#FRac+N7pqvTJ<$*
zdU{$>?B*Dj$kh|af@d;;r|iy^iX@_iOmMXK^*D6>HgAuSK@~Lw=Dw?JB3dIGdw_qP
z-KSk<(E3qP^kR9w)u($XH`TS9y4TwdUoQS*>&qzIr}pauj7)o=;TKB6_n6o6tMJWI
zIOSe;NK^zo9&|M3*|Jc$pH2*^pH9a<AS9$FtP&_;1T_`^s%_JY3~?Nphy=y(h>Hp&
zc1~ra4vvv^*VHaaDZg4|RPOF4PO;pf_y}_0%-pdJd+x7aXQ66;(G3Z1nO-4z#n;bq
z+7LQXYoA;F`v<sgeE>ORAkw&Fz}stUL_|byzQiHk?<_@u>CQHGxa(?|5>UH>r2|V*
zj}48YUKvaj5D);Ndvgd{z^B`_COvU580?wP{lvONZ^H=6r-|j2mAYWUEs7gYzoWCs
zC32dK73p3ah9i*K8(8PoyhUa}ELVeJ*VWyNq!V*zsPOlKd3OSn!z0ctfRv3pLjdn>
z#j8SKC*MZMc(H1ajPDVFfB7`V)S(W>ySYL+dg9#1$;AaCFGf~~sF^yQ;z@8izbPjw
z=bpL$g%Oqh*95MWvIJx*3HImcT2evjFHCt*%g*OCJzxo&YZ`bQ_hXQOYYm#P5UW&k
zO<91zfEfG*>6503w6s}Kt2bG|LWx`lY@2g(-Sy`H#r>T{4WziA)2`JJS;?RlBlEA$
z!S`_P3`DY~6%@|$uL)ifCTyVhyh(Oxap~f%*$^yvVC-5#dD|Q1lcV7X$2&ymc?$eZ
zC|7dct^bWHzQq+J=9w{lEPIFT#pPk+>+|)l@N&5s%BODp&ZMJE^y^E@%fqVqIRHSi
zaXTdX`0Or)&v80tLP9}_p~fg8Vmwx~l;#BoDV-F!BP#8Tm(khYgTrmh1{YKkz(6Y_
z4J<gVK4MY-trHf7;*izmd*QthfBX-zb&gx9*k7da_*ORZi<`y)f&4<Kpx93=T(eba
z@eP=vwaaOlS*<rgbIuQ2+#hB=3K;ksb>#a_XebF8dw42wY)4iQ7(_&?L>VM{KWtzy
z1&0H`P+BLdQk|JV<uZBoIv2+L!<P!!=2GVgChDiY-dG=>dUOhK4$A0EzXJFLH1Pui
z$75o&UE=vRPa(A5OHm45Wy>f6KP0>DJdCaRnpg0$r+O~c`Dm3irB4B+6j*40i7?jL
zkOmj{ESBImAvafRiV6FspodH$vD9gOC!OTv!h*EazYVJVw#<^1+<y|>;tHAw%Z6=V
zE>Dt_O1~^=+nl_=y?G{>V)YN!NHkfmTDds{%qDtzZI+f<kGTBND2$AAF-QnkHUzS)
zXFhL@1;jJGu{jQf$b~SqwbjK;c#PfJHR?Pfi~B@&=kWTo#{RosvP({1gY<?+0U|5_
zKuy;xE|1V=<rb9xfeCYi@c&@K{L4uOxC+>>`E6O+E#5D1G>A0gPQt0EsN~0STR8u+
sg3_&sv^;>MzxubH>HqlOI&Q>1EF66iWl7ox|F8m)mQ;`^f*O4MUjqAbSpWb4

literal 11049
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

diff --git a/tests/43session.tests b/tests/43session.tests
index 170382dee..30fd58a08 100644
--- a/tests/43session.tests
+++ b/tests/43session.tests
@@ -71,6 +71,10 @@ PLANNED "Query focus management" QueryFocus_test <<END
 END
 
 
+PLANNED "issuing typed queries" QueryResolver_test <<END
+END
+
+
 PLANNED "RebuildFixture_test" RebuildFixture_test <<END
 END
 
diff --git a/tests/components/proc/mobject/session/query-resolver-test.cpp b/tests/components/proc/mobject/session/query-resolver-test.cpp
new file mode 100644
index 000000000..91f0df2fe
--- /dev/null
+++ b/tests/components/proc/mobject/session/query-resolver-test.cpp
@@ -0,0 +1,93 @@
+/*
+  QueryResolver(Test)  -  issuing typed queries over a generic interface
+ 
+  Copyright (C)         Lumiera.org
+    2009,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+* *****************************************************/
+
+
+#include "lib/test/run.hpp"
+//#include "lib/lumitime.hpp"
+//#include "proc/mobject/placement-ref.hpp"
+//#include "proc/mobject/session/test-scopes.hpp"
+//#include "proc/mobject/placement-index.hpp"
+#include "proc/mobject/session/query-resolver.hpp"
+//#include "lib/access-casted.hpp"
+//#include "lib/variant.hpp"
+//#include "lib/meta/typelist.hpp"
+//#include "lib/util.hpp"
+
+#include <iostream>
+#include <string>
+
+
+
+namespace mobject {
+namespace session {
+namespace test    {
+  
+  //using util::isSameObject;
+  //using lumiera::Time;
+  using std::string;
+  using std::cout;
+  using std::endl;
+  
+  namespace { // a test query resolving facility
+    
+  
+    struct TypeMatchFilter
+      {
+        
+      };
+  
+  }
+  
+  
+  /***********************************************************************************
+   * @test verify the mechanism for issuing typed queries through a generic interface,
+   *       without disclosing the facility actually answering those queries. 
+   *       Results are to be retrieved through a Lumiera Forward Iterator.
+   *       
+   * @see  mobject::session::QueryResolver
+   * @see  mobject::session::ScopeLocate usage example
+   * @see  mobject::session::ContentsQuery typed query example
+   * @see  contents-query-test.cpp
+   */
+  class QueryResolver_test : public Test
+    {
+      
+      virtual void
+      run (Arg) 
+        {
+          Iterator ii = subF2.query<TestSubMO21>();
+          while (ii)
+            {
+              subF2.attach(*ii);
+              cout << string(subF2) << endl;
+              ii = subF2.query<TestSubMO21>();
+            }
+        }
+          
+    };
+  
+  
+  /** Register this test class... */
+  LAUNCHER (QueryResolver_test, "unit session");
+  
+  
+}}} // namespace mobject::session::test
diff --git a/uml/lumiera/131077 b/uml/lumiera/131077
index 9fd8e46ec..e64895446 100644
--- a/uml/lumiera/131077
+++ b/uml/lumiera/131077
@@ -1,6 +1,6 @@
 format 58
 "ConfigQuery" // CommonLib::ConfigQuery
-  revision 4
+  revision 12
   modified_by 5 "hiv"
   // class settings
   //class diagram settings
@@ -450,7 +450,7 @@ ${inlines}
     end
 
     classdiagram 137733 "Query Interface"
-      draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default
+      draw_all_relations no hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default
       size A4
     end
 
@@ -473,6 +473,104 @@ ${members}};
 "
       explicit_switch_type ""
       
+      operation 141317 "issue"
+	public explicit_return_type ""
+	nparams 1
+	  param in name "query" type class_ref 156805 // QuerY
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name} ${(}${)}${const}${volatile} ${throw}${abstract};"
+	cpp_def "${comment}${inline}${type}
+${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl}
+{
+  ${body}
+}
+
+"
+	
+	
+	
+	
+      end
+    end
+
+    class 156805 "QuerY"
+      abstract visibility public stereotype "interface"
+      cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+      java_decl ""
+      php_decl ""
+      python_2_2 python_decl ""
+      idl_decl ""
+      explicit_switch_type ""
+      
+      class 156933 "Result"
+	visibility package 
+	cpp_decl "${comment}${template}class ${name}${inherit}
+  {
+${members}  };
+${inlines}
+"
+	java_decl ""
+	php_decl ""
+	python_2_2 python_decl ""
+	idl_decl ""
+	explicit_switch_type ""
+	
+      end
+
+      operation 140037 "isValid"
+	public explicit_return_type "bool"
+	nparams 1
+	  param in name "pos" type class_ref 156933 // Result
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name} ${(}${)}${const}${volatile} ${throw}${abstract};"
+	cpp_def "${comment}${inline}${type}
+${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl}
+{
+  ${body}
+}
+
+"
+	
+	
+	
+	
+      end
+
+      operation 140165 "nextResult"
+	public return_type class_ref 156933 // Result
+	nparams 0
+	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name} ${(}${)}${const}${volatile} ${throw}${abstract};"
+	cpp_def "${comment}${inline}${type}
+${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl}
+{
+  ${body}
+}
+
+"
+	
+	
+	
+	
+      end
+
+      classrelation 181765 // <dependency>
+	relation 171653 -_->
+	  a default
+	    cpp default "#include in source"
+	    classrelation_ref 181765 // <dependency>
+	  b parent class_ref 156933 // Result
+      end
+
+      classrelation 182533 // <unidirectional association>
+	relation 172165 --->
+	  a role_name "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
+"
+	    classrelation_ref 182533 // <unidirectional association>
+	  b parent class_ref 156933 // Result
+      end
     end
 
     class 155141 "Query"
@@ -507,45 +605,41 @@ ${inlines}
 	idl_decl ""
 	explicit_switch_type ""
 	
+	classrelation 183685 // <generalisation>
+	  relation 173317 ---|>
+	    a public
+	      cpp default "${type}"
+	      classrelation_ref 183685 // <generalisation>
+	    b parent class_ref 156933 // Result
+	end
       end
 
-      operation 140037 "isValid"
-	public explicit_return_type "bool"
-	nparams 0
-	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name} ${(}${)}${const}${volatile} ${throw}${abstract};"
-	cpp_def "${comment}${inline}${type}
-${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl}
-{
-  ${body}
-}
-
-"
-	
-	
-	
-	
+      classrelation 181125 // <realization>
+	relation 171141 -_-|>
+	  a public
+	    cpp default "${type}"
+	    classrelation_ref 181125 // <realization>
+	  b parent class_ref 156805 // QuerY
       end
 
-      operation 140165 "nextResult"
-	public return_type class_ref 155269 // Cursor
-	nparams 0
-	cpp_decl "    ${comment}${friend}${static}${inline}${virtual}${type} ${name} ${(}${)}${const}${volatile} ${throw}${abstract};"
-	cpp_def "${comment}${inline}${type}
-${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl}
-{
-  ${body}
-}
-
+      classrelation 184837 // <unidirectional association>
+	relation 174469 --->
+	  stereotype "type-def"
+	  a role_name "" protected
+	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
 "
-	
-	
-	
-	
+	    classrelation_ref 184837 // <unidirectional association>
+	  b parent class_ref 155397 // IterAdapter
       end
     end
 
     class 155397 "IterAdapter"
       visibility package 
+      nformals 2
+      formal name "POS" type "class" explicit_default_value ""
+        explicit_extends ""
+      formal name "CON" type "class" explicit_default_value ""
+        explicit_extends ""
       cpp_decl "${comment}${template}class ${name}${inherit}
   {
 ${members}  };
@@ -580,41 +674,8 @@ ${inlines}
 	  b parent class_ref 153989 // QueryResolver
       end
 
-      classrelation 179973 // <unidirectional association>
-	relation 169989 --->
-	  stereotype "generate"
-	  a role_name "" protected
-	    cpp default "    ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value};
-"
-	    classrelation_ref 179973 // <unidirectional association>
-	  b parent class_ref 155653 // ActualQuery
-      end
     end
 
-    class 155653 "ActualQuery"
-      visibility package 
-      nactuals 1
-      actual class class_ref 155141 // Query
-        rank 0 explicit_value ""
-      cpp_decl "${comment}${template}class ${name}${inherit}
-  {
-${members}  };
-${inlines}
-"
-      java_decl ""
-      php_decl ""
-      python_2_2 python_decl ""
-      idl_decl ""
-      explicit_switch_type ""
-      
-      classrelation 179845 // <generalisation>
-	relation 169861 ---|>
-	  a public
-	    cpp default "${type}"
-	    classrelation_ref 179845 // <generalisation>
-	  b parent class_ref 155141 // Query
-      end
-    end
   end
 
   usecaseview 128389 "query use"
diff --git a/uml/lumiera/137733.diagram b/uml/lumiera/137733.diagram
index f1e7265ed..89c4838d1 100644
--- a/uml/lumiera/137733.diagram
+++ b/uml/lumiera/137733.diagram
@@ -6,45 +6,56 @@ classcanvas 128005 class_ref 153989 // QueryResolver
 end
 classcanvas 128133 class_ref 155141 // Query
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default
-  xyz 137 195 2000
-end
-classcanvas 128261 class_ref 155269 // Cursor
-  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default
-  xyz 225 271 2004
+  xyz 180 332 2000
 end
 classcanvas 128517 class_ref 155397 // IterAdapter
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default
-  xyz 62 298 2000
+  xyz 50 241 2000
 end
 classcanvas 128645 class_ref 155525 // ResolvingFacility
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default
-  xyz 480 293 2000
+  xyz 427 339 2000
 end
-classcanvas 129157 class_ref 155653 // ActualQuery
+classcanvas 129797 class_ref 156805 // QuerY
   draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default
-  xyz 386 431 2000
+  xyz 163 150 2000
+end
+classcanvas 131077 class_ref 156933 // Result
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default
+  xyz 250 241 2000
+end
+classcanvas 131205 class_ref 155269 // Cursor
+  draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default
+  xyz 251 378 2005
 end
 line 128389 ---+
-  from ref 128261 z 1999 to ref 128133
-relationcanvas 128773 relation_ref 169733 // <realization>
-  geometry VHV
-  from ref 128645 z 1999 to point 526 191
-  line 128901 z 1999 to point 292 191
-  line 129029 z 1999 to ref 128005
+  from ref 131077 z 1999 to ref 129797
+line 131845 ---+
+  from ref 131205 z 1999 to ref 128133
+relationcanvas 132101 relation_ref 173317 // <generalisation>
+  from ref 131205 z 1999 to ref 131077
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
-relationcanvas 129285 relation_ref 169861 // <generalisation>
-  geometry VHV
-  from ref 129157 z 1999 to point 420 350
-  line 129413 z 1999 to point 168 350
-  line 129541 z 1999 to ref 128133
+relationcanvas 132229 relation_ref 171141 // <realization>
+  from ref 128133 z 1999 to ref 129797
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
-relationcanvas 129669 relation_ref 169989 // <unidirectional association>
-  from ref 128645 z 1999 stereotype "<<generate>>" xyz 469 379 3000 to ref 129157
+relationcanvas 132357 relation_ref 169733 // <realization>
+  geometry VHV unfixed
+  from ref 128645 z 1999 to point 473 166
+  line 132485 z 1999 to point 292 166
+  line 132613 z 1999 to ref 128005
   no_role_a no_role_b
   no_multiplicity_a no_multiplicity_b
 end
+relationcanvas 133125 relation_ref 174469 // <unidirectional association>
+  geometry VHr
+  from ref 128133 z 1999 stereotype "<<type-def>>" xyz 100 358 3000 to point 81 356
+  line 133381 z 1999 to ref 128517
+  no_role_a no_role_b
+  no_multiplicity_a no_multiplicity_b
+end
+preferred_whz 629 529 1
 end
diff --git a/uml/lumiera/5.session b/uml/lumiera/5.session
index 761455ae6..c9ca3b9b5 100644
--- a/uml/lumiera/5.session
+++ b/uml/lumiera/5.session
@@ -7,7 +7,7 @@ diagrams
   classdiagram_ref 136581 // MObjectRef
     651 533 100 4 0 38
   active  classdiagram_ref 137733 // Query Interface
-    688 570 100 4 0 0
+    629 529 100 4 0 0
 end
 show_stereotypes
 selected 
@@ -28,7 +28,10 @@ open
   classview_ref 129541 // InterfaceSystem
   classview_ref 129285 // StreamType
   class_ref 153989 // QueryResolver
+  class_ref 156933 // Result
+  classrelation_ref 181765 // <dependency>
   class_ref 155141 // Query
+  class_ref 155525 // ResolvingFacility
   classview_ref 132229 // Custom holders
   classview_ref 128266 // SmartPointers
 end