From 58087f01e01502c1544c4186507089a1013b5153 Mon Sep 17 00:00:00 2001
From: Ferruccio Guidi <ferruccio.guidi@unibo.it>
Date: Sun, 23 Aug 2009 15:15:26 +0000
Subject: [PATCH] - alpha convertibility test disabled for now (it needs better
 implementation) - some icons related to lambda-delta are now available

---
 .../lambda-delta/basic_rg/brgReduction.ml         |  14 +++++++-------
 helm/software/lambda-delta/icons/basic-32.png     | Bin 0 -> 587 bytes
 helm/software/lambda-delta/icons/crux-32.png      | Bin 0 -> 224 bytes
 helm/software/lambda-delta/icons/helena-32.png    | Bin 0 -> 549 bytes
 4 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 helm/software/lambda-delta/icons/basic-32.png
 create mode 100644 helm/software/lambda-delta/icons/crux-32.png
 create mode 100644 helm/software/lambda-delta/icons/helena-32.png

diff --git a/helm/software/lambda-delta/basic_rg/brgReduction.ml b/helm/software/lambda-delta/basic_rg/brgReduction.ml
index 26663cf5f..4b1d287d9 100644
--- a/helm/software/lambda-delta/basic_rg/brgReduction.ml
+++ b/helm/software/lambda-delta/basic_rg/brgReduction.ml
@@ -84,11 +84,11 @@ let rec step f ?(delta=false) ?(rt=false) m x =
    | B.GRef (a, uri)         ->
       let f = function
          | _, _, B.Abbr v when delta ->
-            P.add ~gdelta:1 ();
-	    step f ~delta ~rt m v
-         | _, _, B.Abst w when rt   ->
-            P.add ~grt:1 ();
-	    step f ~delta ~rt m w	 
+	    P.add ~gdelta:1 (); step f ~delta ~rt m v
+         | _, _, B.Abst w when rt    ->
+            P.add ~grt:1 (); step f ~delta ~rt m w	 
+	 | _, _, B.Void              ->
+	    assert false
 	 | e, _, b                   ->
 	    f m (Some (e, b)) x
       in
@@ -102,7 +102,7 @@ let rec step f ?(delta=false) ?(rt=false) m x =
             P.add ~lrt:1 ();
             step f ~delta ~rt {m with c = c} w
 	 | B.Void            ->
-	    f {m with c = c} None x
+	    assert false
 	 | b                 ->
 	    let f e = f {m with c = c} (Some (e, b)) x in 
 	    B.apix C.err f a
@@ -221,7 +221,7 @@ let assert_conversion f ?(si=false) ?(rt=false) mw u w v =
          if r then begin L.unbox level; f () end else error3 mw.c v w u
       in
       let g r = if r then f r else ac f ~si true mu u mw w in
-      if S.eq mu mw then are_alpha_convertible g u w else g false
+(*      if S.eq mu mw then are_alpha_convertible g u w else *) g false
    in
    if rt then domain f mw u else f mw u
 
diff --git a/helm/software/lambda-delta/icons/basic-32.png b/helm/software/lambda-delta/icons/basic-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..350f6bcb064467398060e29a75acc9ea2b37fc13
GIT binary patch
literal 587
zcmV-R0<`^!P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXW0
z4K^^NM)4{D000_vMObu0Z*6U5Zgc=bVRLC?AZ%f6Vq{@0WMyo0VM_!tQvd(~rAb6V
zR9M5sma$I4P!xtgZXy&Pz&IG<)WN~Up>ZKGA^H?uTzmkXd;lkW02ULTp_2^>35#K1
zVPIf^!GV=UiVVl$UXlW#meBToNtdQQ|9}2-?`=yWBBW#n41obK0=|JVa0XlfH^4P;
zPI^lJ8CU^b;2ro)S+op119!m5F$TVXSB~QixINUs3TOf$*>DfM>`7zCzz^_b=9?uK
zKnplcGOz+3a}bZ4_}EH9#UE(qD2}P!+`6aY3oayoLZh`Yf|Xe)MG~4(D9k=Dnr=LS
zhXW3otSAGYfSOql$7s#~HN+l6Kn*M!7yxQy(ZDFp*D!Aswh`AA0XvuLio)~kb?<p7
z8V!2}8V!)i#NG%d6Vbb%T7@VowtL5c#lq}@R;&2<jiyduxzvt|B#NL?F$q*E5Cp}E
z2Z7cEkT|}d|HAYA4arRdQ6#w@Os=an_8Jfona}ev;kvr^7P|)4Nn|+=-{0vx*}$40
zI9@ym5+#xitkY<>MI0x+sN?8&_H-TRu>XPS6nZ`AbfDjd@mQZ9wHkPyKHKYcxV%hV
Z@(<rm1Ms>qdG-JR002ovPDHLkV1gng==uNv

literal 0
HcmV?d00001

diff --git a/helm/software/lambda-delta/icons/crux-32.png b/helm/software/lambda-delta/icons/crux-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe369d292805b2f1283d8e86a6486e6120839a0f
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`uqAoByD<C*
z!3BGlPX>x`7I;J!Gca%qgD@k*tT_@uLG}_)Usv{<9O9g&+;*9d1%W~WC9V-A&iT2y
zsd*&~AsML(&PAmaskT9(Ksgsr7sn8f<8Ln=<UODuz<khF%KLS|%*rK<6)HkWf4^m>
zyzG*jHkrL4YX5?dg)Bg@jzR0>L+%@r6Smu)(iajC5cnZJqi;FqkAwG(U4Z5>c)I$z
JtaD0e0szEXL;L^$

literal 0
HcmV?d00001

diff --git a/helm/software/lambda-delta/icons/helena-32.png b/helm/software/lambda-delta/icons/helena-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a065aefeb25bcd05aaa7198ed14115dc7daa52d
GIT binary patch
literal 549
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Y)RhkE)4%c
zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmPyhnSe0qD@Lj8&HU^#5JPCIX^cy
zHLrxhBQ+;AFY&0!sv|)2yFFbTLn00*rz9l&IDhcqL4$x9orw(xS1?CtT)cDd-oXPv
zaN*`n$NvH^-p^-9pFTZ2!F*0<ry1W2yIQukh`Kt)TBn46e^@P^Ub<`?@Z<l#zl+x~
zPt%WYJhXnznuLs;90$Sfe*Xo&9BbnDGq%P@bZ``XagmUdbBtxrxxbIOb^gqmjSJHr
z9pTidssGRL$|B+aKW2?TM_leW+7zp0Jt`^xzTgbw@&5S^58d5__-?gw2MVv;yO+6=
z&!YYx6PLY#LBorR*quVA8)waqp75;U_4WJ(A8c)HJ<i>iHeaL`Ra?vaNTvX2rpUg<
zi<xg8eRFQ^iq7!Z*kq0?ZCzbl6~&C247TET_Ea|S5V&yV%7JJ;0p<&*8@t8zCrsn!
z;pP1>t>p(pm1o7LC!C*7F?xG*?<r+8Ylst<v8ia-G)cf#d_s`)qUTJTUNe0uYMAkj
zp~}*sFt;O4=ux)d!s$S*$}9geIlWAHc!+h&TaemIYXZG|svDlIO{&pV+Vz!NOIv$E
hq2(=8=|g-B43D1HUH;(9_YN3g44$rjF6*2Ung9<N;UEA2

literal 0
HcmV?d00001

-- 
2.39.2