X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fground_2%2Frelocation%2Fnstream.ma;h=3803c254be949ffde13f8470b65ad689e4fadc99;hb=a77d0bd6a04e94f765d329d47b37d9e04d349b14;hp=8d7dacc4ed7632a7270f33473076f238b6c20601;hpb=ad3d1cac216cf3882e4adf691b27c00838c6b9b1;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/ground_2/relocation/nstream.ma b/matita/matita/contribs/lambdadelta/ground_2/relocation/nstream.ma
index 8d7dacc4e..3803c254b 100644
--- a/matita/matita/contribs/lambdadelta/ground_2/relocation/nstream.ma
+++ b/matita/matita/contribs/lambdadelta/ground_2/relocation/nstream.ma
@@ -12,29 +12,29 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include "ground_2/notation/functions/lift_1.ma".
+include "ground_2/notation/functions/upspoon_1.ma".
 include "ground_2/lib/streams_tls.ma".
 
 (* RELOCATION N-STREAM ******************************************************)
 
 definition rtmap: Type[0] ≝ stream nat.
 
-definition push: rtmap → rtmap ≝ λf. 0@f.
+definition push: rtmap → rtmap ≝ λf. 0⨮f.
 
-interpretation "push (nstream)" 'Lift f = (push f).
+interpretation "push (nstream)" 'UpSpoon f = (push f).
 
 definition next: rtmap → rtmap.
-* #n #f @(⫯n@f)
-qed.
+* #n #f @(↑n⨮f)
+defined.
 
-interpretation "next (nstream)" 'Successor f = (next f).
+interpretation "next (nstream)" 'UpArrow f = (next f).
 
 (* Basic properties *********************************************************)
 
-lemma push_rew: ∀f. 0@f = ↑f.
+lemma push_rew: ∀f. 0⨮f = ⫯f.
 // qed.
 
-lemma next_rew: ∀f,n. (⫯n)@f = ⫯(n@f).
+lemma next_rew: ∀f,n. (↑n)⨮f = ↑(n⨮f).
 // qed.
 
 (* Basic inversion lemmas ***************************************************)
@@ -43,11 +43,11 @@ lemma injective_push: injective ? ? push.
 #f1 #f2 normalize #H destruct //
 qed-.
 
-lemma discr_push_next: ∀f1,f2. ↑f1 = ⫯f2 → ⊥.
+lemma discr_push_next: ∀f1,f2. ⫯f1 = ↑f2 → ⊥.
 #f1 * #n2 #f2 normalize #H destruct
 qed-.
 
-lemma discr_next_push: ∀f1,f2. ⫯f1 = ↑f2 → ⊥.
+lemma discr_next_push: ∀f1,f2. ↑f1 = ⫯f2 → ⊥.
 * #n1 #f1 #f2 normalize #H destruct
 qed-.
 
@@ -55,43 +55,43 @@ lemma injective_next: injective ? ? next.
 * #n1 #f1 * #n2 #f2 normalize #H destruct //
 qed-.
 
-lemma push_inv_seq_sn: ∀f,g,n. n@g = ↑f → 0 = n ∧ g = f.
+lemma push_inv_seq_sn: ∀f,g,n. n⨮g = ⫯f → 0 = n ∧ g = f.
 #f #g #n <push_rew #H destruct /2 width=1 by conj/
 qed-.
 
-lemma push_inv_seq_dx: ∀f,g,n. ↑f = n@g → 0 = n ∧ g = f.
+lemma push_inv_seq_dx: ∀f,g,n. ⫯f = n⨮g → 0 = n ∧ g = f.
 #f #g #n <push_rew #H destruct /2 width=1 by conj/
 qed-.
 
-lemma next_inv_seq_sn: ∀f,g,n. n@g = ⫯f → ∃∃m. m@g = f & ⫯m = n.
+lemma next_inv_seq_sn: ∀f,g,n. n⨮g = ↑f → ∃∃m. m⨮g = f & ↑m = n.
 * #m #f #g #n <next_rew #H destruct /2 width=3 by ex2_intro/
 qed-.
 
-lemma next_inv_seq_dx: ∀f,g,n. ⫯f = n@g → ∃∃m. m@g = f & ⫯m = n.
+lemma next_inv_seq_dx: ∀f,g,n. ↑f = n⨮g → ∃∃m. m⨮g = f & ↑m = n.
 * #m #f #g #n <next_rew #H destruct /2 width=3 by ex2_intro/
 qed-.
 
 lemma case_prop: ∀R:predicate rtmap.
-                 (∀f. R (↑f)) → (∀f. R (⫯f)) → ∀f. R f.
+                 (∀f. R (⫯f)) → (∀f. R (↑f)) → ∀f. R f.
 #R #H1 #H2 * * //
 qed-.
 
 lemma case_type0: ∀R:rtmap→Type[0].
-                  (∀f. R (↑f)) → (∀f. R (⫯f)) → ∀f. R f.
+                  (∀f. R (⫯f)) → (∀f. R (↑f)) → ∀f. R f.
 #R #H1 #H2 * * //
 qed-.
 
-lemma iota_push: ∀R,a,b,f. a f = case_type0 R a b (↑f).
+lemma iota_push: ∀R,a,b,f. a f = case_type0 R a b (⫯f).
 // qed.
 
-lemma iota_next: ∀R,a,b,f. b f = case_type0 R a b (⫯f).
+lemma iota_next: ∀R,a,b,f. b f = case_type0 R a b (↑f).
 #R #a #b * //
 qed.
 
 (* Specific properties ******************************************************)
 
-lemma tl_push: ∀f. f = ↓↑f.
+lemma tl_push: ∀f. f = ⫰⫯f.
 // qed.
 
-lemma tl_next: ∀f. ↓f = ↓⫯f.
+lemma tl_next: ∀f. ⫰f = ⫰↑f.
 * // qed.