Many changes

[helm.git] / helm / software / matita / library / datatypes / bool.ma

diff --git a/helm/software/matita/library/datatypes/bool.ma b/helm/software/matita/library/datatypes/bool.ma
index dc397a1b2d978996f32ca319b8b3befe2cad1493..f78264d687b9b72ba098447002059550cf6df589 100644 (file)
--- a/helm/software/matita/library/datatypes/bool.ma
+++ b/helm/software/matita/library/datatypes/bool.ma
@@ -12,8 +12,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-set "baseuri" "cic:/matita/datatypes/bool/".
-
 include "logic/equality.ma".
 include "higher_order_defs/functions.ma".
 
@@ -46,7 +44,10 @@ definition notb : bool \to bool \def
  match b with 
  [ true \Rightarrow false
  | false \Rightarrow true ].
- 
+
+(* FG: interpretation right after definition *)
+interpretation "boolean not" 'not x = (notb x).
+
 theorem notb_elim: \forall b:bool.\forall P:bool \to Prop.
 match b with
 [ true \Rightarrow P false
@@ -68,17 +69,13 @@ apply eq_f.
 assumption.
 qed.
 
-(*CSC: the URI must disappear: there is a bug now *)
-interpretation "boolean not" 'not x = (cic:/matita/datatypes/bool/notb.con x).
-
 definition andb : bool \to bool \to bool\def
 \lambda b1,b2:bool. 
  match b1 with 
  [ true \Rightarrow b2
  | false \Rightarrow false ].
 
-(*CSC: the URI must disappear: there is a bug now *)
-interpretation "boolean and" 'and x y = (cic:/matita/datatypes/bool/andb.con x y).
+interpretation "boolean and" 'and x y = (andb x y).
 
 theorem andb_elim: \forall b1,b2:bool. \forall P:bool \to Prop.
 match b1 with
@@ -119,6 +116,9 @@ definition orb : bool \to bool \to bool\def
  [ true \Rightarrow true
  | false \Rightarrow b2].
 
+(* FG: interpretation right after definition *)
+interpretation "boolean or" 'or x y = (orb x y).
+
 theorem orb_elim: \forall b1,b2:bool. \forall P:bool \to Prop.
 match b1 with
 [ true \Rightarrow P true
@@ -126,9 +126,6 @@ match b1 with
 intros 3.elim b1.exact H. exact H.
 qed.
 
-(*CSC: the URI must disappear: there is a bug now *)
-interpretation "boolean or" 'or x y = (cic:/matita/datatypes/bool/orb.con x y).
-
 definition if_then_else : bool \to Prop \to Prop \to Prop \def 
 \lambda b:bool.\lambda P,Q:Prop.
 match b with
@@ -196,4 +193,4 @@ intros.
 rewrite > H.
 rewrite > H1.
 reflexivity.
-qed.
\ No newline at end of file
+qed.