From 6686ac3a4671abce7c053c9fee7696eeb2182583 Mon Sep 17 00:00:00 2001
From: Cosimo Oliboni <??>
Date: Thu, 21 Jan 2010 02:16:45 +0000
Subject: [PATCH]  freescale porting, work in progress

---
 .../contribs/ng_assembly/common/theory.ma     | 35 +------------------
 .../matita/contribs/ng_assembly/depends       | 30 ++++++++--------
 .../contribs/ng_assembly/num/bool_lemmas.ma   |  6 ++--
 3 files changed, 19 insertions(+), 52 deletions(-)

diff --git a/helm/software/matita/contribs/ng_assembly/common/theory.ma b/helm/software/matita/contribs/ng_assembly/common/theory.ma
index b6a84d6af..3223b1d45 100644
--- a/helm/software/matita/contribs/ng_assembly/common/theory.ma
+++ b/helm/software/matita/contribs/ng_assembly/common/theory.ma
@@ -44,7 +44,7 @@ nlemma absurd : ∀A,C:Prop.A → ¬A → C.
  #A; #C; #H;
  nnormalize;
  #H1;
- nelim (H1 H);
+ nelim (H1 H).
 nqed.
 
 nlemma not_to_not : ∀A,B:Prop. (A → B) → ((¬B) → (¬A)).
@@ -527,36 +527,3 @@ ndefinition symmetricT: ∀A,T:Type.∀R:relationT A T.Prop ≝
 
 ndefinition associative : ∀A:Type.∀R:relationT A A.Prop ≝
 λA.λR.∀x,y,z:A.R (R x y) z = R x (R y z).
-
-(* aggiunta per bypassare i punti in cui le dimostrazioni sono equivalenti *)
-(*
-ninductive peqv (A:Prop) (x:A) : A → Prop ≝
- prefl_eqv : peqv A x x.
-
-interpretation "prop equivalence" 'preqv t x y = (peqv t x y).
-*)
-(* \equiv *)
-(*
-notation > "hvbox(a break ≡ b)" 
-  non associative with precedence 45
-for @{ 'preqv ? $a $b }.
-
-nlemma symmetric_peqv: ∀A:Prop. symmetric A (peqv A).
- #A;
- nnormalize;
- #x; #y; #H;
- napply (peqv_ind A x (λ_.?) ? y H);
- napply prefl_eqv.
-nqed.
-
-nlemma peqv_ind_r: ∀A:Prop.∀x:A.∀P:A → Prop.P x → ∀y:A.y ≡ x → P y.
- #A; #x; #P; #H; #y; #H1;
- napply (peqv_ind A x (λ_.?) H y (symmetric_peqv … H1)).
-nqed.
-
-naxiom peqv_ax : ∀P:Prop.∀Q,R:P.Q ≡ R.
-*)
-(* uso P x → P y, H e' P x
-   nrewrite > cioe' napply (peqv_ind ? x (λ_.?) H y (dimostrazione di x ≡ y));
-   nrewrite < cioe' napply (peqv_ind_r ? x ? H y (dimostrazione y ≡ x)));
-*)
diff --git a/helm/software/matita/contribs/ng_assembly/depends b/helm/software/matita/contribs/ng_assembly/depends
index 7690f37b4..d69d373ee 100644
--- a/helm/software/matita/contribs/ng_assembly/depends
+++ b/helm/software/matita/contribs/ng_assembly/depends
@@ -2,36 +2,36 @@ freescale/multivm_lemmas.ma common/nat_lemmas.ma freescale/multivm.ma
 freescale/status.ma freescale/memory_abs.ma freescale/opcode_base.ma
 freescale/memory_bits.ma freescale/memory_trees.ma
 common/prod_lemmas.ma common/prod.ma num/bool_lemmas.ma
-freescale_tests/micro_tests10.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
 num/bool.ma common/theory.ma
+freescale_tests/micro_tests10.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
 freescale/table_HCS08_tests.ma freescale/opcode.ma freescale/table_HCS08.ma
 compiler/preast_tree.ma common/string.ma compiler/ast_type.ma num/word32.ma
 freescale/multivm.ma freescale/load_write.ma
 common/nat_to_num.ma common/nat.ma num/word32.ma
-common/nat.ma num/bool.ma
-common/string_lemmas.ma common/ascii_lemmas.ma common/list_utility_lemmas.ma common/string.ma
 freescale/opcode_base_lemmas.ma freescale/opcode_base.ma num/bool_lemmas.ma
 freescale_tests/medium_tests_tools.ma freescale/multivm.ma
+common/string_lemmas.ma common/ascii_lemmas.ma common/list_utility_lemmas.ma common/string.ma
+common/nat.ma num/bool.ma
 compiler/ast_type_lemmas.ma common/list_utility_lemmas.ma compiler/ast_type.ma
 freescale_tests/micro_tests3.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
 num/quatern.ma num/bool.ma
-freescale/table_HC05_tests.ma freescale/opcode.ma freescale/table_HC05.ma
 num/exadecim.ma common/nat.ma common/prod.ma num/bool.ma num/oct.ma num/quatern.ma
+freescale/table_HC05_tests.ma freescale/opcode.ma freescale/table_HC05.ma
 num/bitrigesim_lemmas.ma num/bitrigesim.ma num/bool_lemmas.ma
 num/byte8.ma num/bitrigesim.ma num/exadecim.ma
 freescale/memory_func.ma common/list.ma common/option.ma freescale/memory_struct.ma num/word16.ma
 freescale/load_write.ma freescale/model.ma freescale/translation.ma
 freescale_tests/micro_tests4bis.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
-common/nat_lemmas.ma common/nat.ma num/bool_lemmas.ma
 freescale/table_RS08.ma common/list.ma freescale/opcode_base.ma
-common/list_utility_lemmas.ma common/list_lemmas.ma common/list_utility.ma
+common/nat_lemmas.ma common/nat.ma num/bool_lemmas.ma
 freescale_tests/micro_tests6.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
+common/list_utility_lemmas.ma common/list_lemmas.ma common/list_utility.ma
 freescale/table_RS08_tests.ma freescale/opcode.ma freescale/table_RS08.ma
 freescale/translation.ma common/option.ma freescale/table_HC05.ma freescale/table_HC08.ma freescale/table_HCS08.ma freescale/table_RS08.ma
 freescale/translation_lemmas.ma freescale/translation.ma num/byte8_lemmas.ma
 freescale/memory_abs.ma freescale/memory_bits.ma freescale/memory_func.ma freescale/memory_trees.ma
-freescale_tests/micro_tests9.ma common/nat_to_num.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
 num/word32_lemmas.ma num/word16_lemmas.ma num/word32.ma
+freescale_tests/micro_tests9.ma common/nat_to_num.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
 test_errori.ma 
 freescale_tests/micro_tests2.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
 compiler/environment.ma common/string.ma compiler/ast_type.ma
@@ -42,20 +42,20 @@ freescale/table_HC05.ma common/list.ma freescale/opcode_base.ma
 common/string.ma common/ascii.ma common/list_utility.ma
 common/theory.ma 
 compiler/ast_type.ma common/list_utility.ma
-common/prod.ma num/bool.ma
 num/word16.ma num/byte8.ma
 freescale_tests/micro_tests5.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
 freescale/memory_trees.ma common/list.ma common/option.ma freescale/memory_struct.ma num/word16.ma
-num/word16_lemmas.ma num/byte8_lemmas.ma num/word16.ma
+common/prod.ma num/bool.ma
 num/exadecim_lemmas.ma num/bool_lemmas.ma num/exadecim.ma
+num/word16_lemmas.ma num/byte8_lemmas.ma num/word16.ma
 freescale_tests/medium_tests.ma common/list_utility.ma common/nat_to_num.ma freescale_tests/medium_tests_tools.ma
+num/bool_lemmas.ma num/bool.ma
 freescale/opcode_base_lemmas1.ma freescale/opcode_base_lemmas_instrmode.ma freescale/opcode_base_lemmas_opcode.ma num/word16_lemmas.ma
 freescale/table_HC08.ma common/list.ma freescale/opcode_base.ma
-num/bool_lemmas.ma num/bool.ma
 num/oct_lemmas.ma num/bool_lemmas.ma num/oct.ma
 freescale/table_HCS08.ma common/list.ma freescale/opcode_base.ma
-common/ascii.ma num/bool.ma
 num/word32.ma num/word16.ma
+common/ascii.ma num/bool.ma
 freescale_tests/micro_tests8.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
 freescale/opcode_base.ma num/word16.ma
 freescale/status_lemmas.ma common/option_lemmas.ma common/prod_lemmas.ma freescale/opcode_base_lemmas1.ma freescale/status.ma num/word16_lemmas.ma
@@ -63,18 +63,18 @@ freescale_tests/micro_tests_tools.ma common/list.ma num/word16.ma
 num/quatern_lemmas.ma num/bool_lemmas.ma num/quatern.ma
 freescale_tests/micro_tests1.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
 freescale/table_HC08_tests.ma freescale/opcode.ma freescale/table_HC08.ma
-common/option_lemmas.ma common/option.ma num/bool_lemmas.ma
 common/option.ma num/bool.ma
+common/option_lemmas.ma common/option.ma num/bool_lemmas.ma
 num/byte8_lemmas.ma num/byte8.ma num/exadecim_lemmas.ma
 freescale/opcode_base_lemmas_opcode.ma freescale/opcode_base.ma num/bool_lemmas.ma
-common/list_lemmas.ma common/list.ma
-common/sigma.ma 
 freescale_tests/micro_tests4.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
+common/sigma.ma 
+common/list_lemmas.ma common/list.ma
 universe/universe.ma common/list.ma common/nat_lemmas.ma common/prod.ma
 num/bitrigesim.ma num/bool.ma
 common/list_utility.ma common/list.ma common/nat_lemmas.ma common/option.ma
 freescale/opcode_base_lemmas_instrmode.ma freescale/opcode_base.ma num/bitrigesim_lemmas.ma num/exadecim_lemmas.ma num/oct_lemmas.ma
-common/list.ma common/theory.ma
 num/oct.ma num/bool.ma
+common/list.ma common/theory.ma
 freescale/opcode.ma common/list.ma freescale/opcode_base.ma
 freescale_tests/micro_tests7.ma freescale/multivm.ma freescale/status_lemmas.ma freescale_tests/micro_tests_tools.ma
diff --git a/helm/software/matita/contribs/ng_assembly/num/bool_lemmas.ma b/helm/software/matita/contribs/ng_assembly/num/bool_lemmas.ma
index b7b9096e8..fddf6d832 100755
--- a/helm/software/matita/contribs/ng_assembly/num/bool_lemmas.ma
+++ b/helm/software/matita/contribs/ng_assembly/num/bool_lemmas.ma
@@ -26,7 +26,7 @@ include "num/bool.ma".
 (* BOOLEANI *)
 (* ******** *)
 
-ndefinition bool_destruct_aux ≝
+(*ndefinition bool_destruct_aux ≝
 Πb1,b2:bool.ΠP:Prop.b1 = b2 →
  match eq_bool b1 b2 with [ true ⇒ P → P | false ⇒ P ].
 
@@ -36,7 +36,7 @@ ndefinition bool_destruct : bool_destruct_aux.
  nelim b1;
  nnormalize;
  napply (λx.x).
-nqed.
+nqed.*)
 
 nlemma symmetric_eqbool : symmetricT bool bool eq_bool.
  #b1; #b2;
@@ -103,7 +103,7 @@ nlemma eqbool_to_eq : ∀b1,b2:bool.(eq_bool b1 b2 = true) → (b1 = b2).
  ncases b2;
  nnormalize;
  ##[ ##1,4: #H; napply refl_eq
- ##| ##*: #H; napply (bool_destruct … H)
+ ##| ##*: #H; ndestruct (*napply (bool_destruct … H)*)
  ##]
 nqed.
 
-- 
2.39.2