X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2Fassembly%2Fcompiler%2Fpreast_to_ast.ma;h=a5db9536b9bfbb31c284fb9b65e7791ac3a87962;hb=92c1b82f32dd0db6af3cb1f56af23b78144fae9a;hp=141544c33b45a29a2910590582694c8c8878b66b;hpb=a8ad55eb789b38c85c5581089308e349e4b0f1a3;p=helm.git

diff --git a/helm/software/matita/contribs/assembly/compiler/preast_to_ast.ma b/helm/software/matita/contribs/assembly/compiler/preast_to_ast.ma
index 141544c33..a5db9536b 100755
--- a/helm/software/matita/contribs/assembly/compiler/preast_to_ast.ma
+++ b/helm/software/matita/contribs/assembly/compiler/preast_to_ast.ma
@@ -40,53 +40,53 @@ include "compiler/sigma.ma".
 
 (* operatore di cast *)
 definition preast_to_ast_expr_check ≝
-λe:aux_env_type.λsig:(Σt'.ast_expr e t').λt:ast_type.
+λd.λe:aux_env_type d.λsig:(Σt'.ast_expr d e t').λt:ast_type.
  match sig with [ sigma_intro t' expr ⇒
   match eq_ast_type t' t
-   return λx.eq_ast_type t' t = x → option (ast_expr e t)
+   return λx.eq_ast_type t' t = x → option (ast_expr d e t)
   with
-   [ true ⇒ λp:(eq_ast_type t' t = true).Some ? (eq_rect ? t' (λt.ast_expr e t) expr t (eqasttype_to_eq ?? p))
+   [ true ⇒ λp:(eq_ast_type t' t = true).Some ? (eq_rect ? t' (λt.ast_expr d e t) expr t (eqasttype_to_eq ?? p))
    | false ⇒ λp:(eq_ast_type t' t = false).None ?
    ] (refl_eq ? (eq_ast_type t' t))
   ].
 
 definition preast_to_ast_init_check ≝
-λe:aux_env_type.λsig:Σt'.ast_init e t'.λt:ast_type.
+λd.λe:aux_env_type d.λsig:Σt'.ast_init d e t'.λt:ast_type.
  match sig with [ sigma_intro t' expr ⇒
   match eq_ast_type t' t
-   return λx.eq_ast_type t' t = x → option (ast_init e t)
+   return λx.eq_ast_type t' t = x → option (ast_init d e t)
   with
-   [ true ⇒ λp:(eq_ast_type t' t = true).Some ? (eq_rect ? t' (λt.ast_init e t) expr t (eqasttype_to_eq ?? p))
+   [ true ⇒ λp:(eq_ast_type t' t = true).Some ? (eq_rect ? t' (λt.ast_init d e t) expr t (eqasttype_to_eq ?? p))
    | false ⇒ λp:(eq_ast_type t' t = false).None ?
    ] (refl_eq ? (eq_ast_type t' t))
   ].
 
 definition preast_to_ast_var_checkb ≝
-λe:aux_env_type.λt:ast_type.λsig:(Σb'.ast_var e b' t).λb:bool.
+λd.λe:aux_env_type d.λt:ast_type.λsig:(Σb'.ast_var d e b' t).λb:bool.
  match sig with [ sigma_intro b' var ⇒
   match eq_bool b' b
-   return λx.eq_bool b' b = x → option (ast_var e b t)
+   return λx.eq_bool b' b = x → option (ast_var d e b t)
   with
-   [ true ⇒ λp:(eq_bool b' b = true).Some ? (eq_rect ? b' (λb.ast_var e b t) var b (eqbool_to_eq ?? p))
+   [ true ⇒ λp:(eq_bool b' b = true).Some ? (eq_rect ? b' (λb.ast_var d e b t) var b (eqbool_to_eq ?? p))
    | false ⇒ λp:(eq_bool b' b = false).None ?
    ] (refl_eq ? (eq_bool b' b))
   ].
 
 definition preast_to_ast_var_checkt ≝
-λe:aux_env_type.λb:bool.λsig:(Σt'.ast_var e b t').λt:ast_type.
+λd.λe:aux_env_type d.λb:bool.λsig:(Σt'.ast_var d e b t').λt:ast_type.
  match sig with [ sigma_intro t' var ⇒
   match eq_ast_type t' t
-   return λx.eq_ast_type t' t = x → option (ast_var e b t)
+   return λx.eq_ast_type t' t = x → option (ast_var d e b t)
   with
-   [ true ⇒ λp:(eq_ast_type t' t = true).Some ? (eq_rect ? t' (λt.ast_var e b t) var t (eqasttype_to_eq ?? p))
+   [ true ⇒ λp:(eq_ast_type t' t = true).Some ? (eq_rect ? t' (λt.ast_var d e b t) var t (eqasttype_to_eq ?? p))
    | false ⇒ λp:(eq_ast_type t' t = false).None ?
    ] (refl_eq ? (eq_ast_type t' t))
   ].
 
 definition preast_to_ast_var_check ≝
-λe:aux_env_type.λsig:(Σb'.(Σt'.ast_var e b' t')).λb:bool.λt:ast_type.
- opt_map ?? (preast_to_ast_var_checkt e (sigmaFst ?? sig) (sigmaSnd ?? sig) t)
-  (λres1.opt_map ?? (preast_to_ast_var_checkb e t ≪(sigmaFst ?? sig),res1≫ b)
+λd.λe:aux_env_type d.λsig:(Σb'.(Σt'.ast_var d e b' t')).λb:bool.λt:ast_type.
+ opt_map ?? (preast_to_ast_var_checkt d e (sigmaFst ?? sig) (sigmaSnd ?? sig) t)
+  (λres1.opt_map ?? (preast_to_ast_var_checkb d e t ≪(sigmaFst ?? sig),res1≫ b)
    (λres2.Some ? res2)).
 
 (*
@@ -116,220 +116,220 @@ definition preast_to_ast_var_check ≝
  PREAST_EXPR_W32toW16: preast_expr → preast_expr
  PREAST_EXPR_ID: preast_var → preast_expr
 *)
-let rec preast_to_ast_expr (preast:preast_expr) (e:aux_env_type) on preast : option (Σt.ast_expr e t) ≝
+let rec preast_to_ast_expr (preast:preast_expr) (d:nat) (e:aux_env_type d) on preast : option (Σt.ast_expr d e t) ≝
  match preast with
-  [ PREAST_EXPR_BYTE8 val ⇒ Some ? ≪?,(AST_EXPR_BYTE8 e val)≫
-  | PREAST_EXPR_WORD16 val ⇒ Some ? ≪?,(AST_EXPR_WORD16 e val)≫
-  | PREAST_EXPR_WORD32 val ⇒ Some ? ≪?,(AST_EXPR_WORD32 e val)≫
+  [ PREAST_EXPR_BYTE8 val ⇒ Some ? ≪?,(AST_EXPR_BYTE8 d e val)≫
+  | PREAST_EXPR_WORD16 val ⇒ Some ? ≪?,(AST_EXPR_WORD16 d e val)≫
+  | PREAST_EXPR_WORD32 val ⇒ Some ? ≪?,(AST_EXPR_WORD32 d e val)≫
 
   | PREAST_EXPR_NEG subExpr ⇒
-   opt_map ?? (preast_to_ast_expr subExpr e)
-    (λsigmaRes:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr d e)
+    (λsigmaRes:(Σt.ast_expr d e t).
      match (sigmaFst ?? sigmaRes) with
       [ AST_TYPE_BASE bType ⇒
-       opt_map ?? (preast_to_ast_expr_check e sigmaRes (AST_TYPE_BASE bType))
-        (λres.Some ? ≪?,(AST_EXPR_NEG e ? res)≫)
+       opt_map ?? (preast_to_ast_expr_check d e sigmaRes (AST_TYPE_BASE bType))
+        (λres.Some ? ≪?,(AST_EXPR_NEG d e ? res)≫)
       | _ ⇒ None ? ])
   | PREAST_EXPR_NOT subExpr ⇒
-   opt_map ?? (preast_to_ast_expr subExpr e)
-    (λsigmaRes:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr d e)
+    (λsigmaRes:(Σt.ast_expr d e t).
      match (sigmaFst ?? sigmaRes) with
       [ AST_TYPE_BASE bType ⇒
-       opt_map ?? (preast_to_ast_expr_check e sigmaRes (AST_TYPE_BASE bType))
-        (λres.Some ? ≪?,(AST_EXPR_NOT e ? res)≫)
+       opt_map ?? (preast_to_ast_expr_check d e sigmaRes (AST_TYPE_BASE bType))
+        (λres.Some ? ≪?,(AST_EXPR_NOT d e ? res)≫)
       | _ ⇒ None ? ])
   | PREAST_EXPR_COM subExpr ⇒
-   opt_map ?? (preast_to_ast_expr subExpr e)
-    (λsigmaRes:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr d e)
+    (λsigmaRes:(Σt.ast_expr d e t).
      match (sigmaFst ?? sigmaRes) with
       [ AST_TYPE_BASE bType ⇒
-       opt_map ?? (preast_to_ast_expr_check e sigmaRes (AST_TYPE_BASE bType))
-        (λres.Some ? ≪?,(AST_EXPR_COM e ? res)≫)
+       opt_map ?? (preast_to_ast_expr_check d e sigmaRes (AST_TYPE_BASE bType))
+        (λres.Some ? ≪?,(AST_EXPR_COM d e ? res)≫)
       | _ ⇒ None ? ])
 
   | PREAST_EXPR_ADD subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE bType))
-          (λres2.Some ? ≪?,(AST_EXPR_ADD e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE bType))
+          (λres2.Some ? ≪?,(AST_EXPR_ADD d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
   | PREAST_EXPR_SUB subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE bType))
-          (λres2.Some ? ≪?,(AST_EXPR_SUB e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE bType))
+          (λres2.Some ? ≪?,(AST_EXPR_SUB d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
   | PREAST_EXPR_MUL subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE bType))
-          (λres2.Some ? ≪?,(AST_EXPR_MUL e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE bType))
+          (λres2.Some ? ≪?,(AST_EXPR_MUL d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
   | PREAST_EXPR_DIV subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE bType))
-          (λres2.Some ? ≪?,(AST_EXPR_DIV e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE bType))
+          (λres2.Some ? ≪?,(AST_EXPR_DIV d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
 
   | PREAST_EXPR_SHR subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE AST_BASE_TYPE_BYTE8))
-          (λres2.Some ? ≪?,(AST_EXPR_SHR e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE AST_BASE_TYPE_BYTE8))
+          (λres2.Some ? ≪?,(AST_EXPR_SHR d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
   | PREAST_EXPR_SHL subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE AST_BASE_TYPE_BYTE8))
-          (λres2.Some ? ≪?,(AST_EXPR_SHL e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE AST_BASE_TYPE_BYTE8))
+          (λres2.Some ? ≪?,(AST_EXPR_SHL d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
 
   | PREAST_EXPR_GT subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE bType))
-          (λres2.Some ? ≪?,(AST_EXPR_GT e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE bType))
+          (λres2.Some ? ≪?,(AST_EXPR_GT d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
   | PREAST_EXPR_GTE subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE bType))
-          (λres2.Some ? ≪?,(AST_EXPR_GTE e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE bType))
+          (λres2.Some ? ≪?,(AST_EXPR_GTE d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
   | PREAST_EXPR_LT subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE bType))
-          (λres2.Some ? ≪?,(AST_EXPR_LT e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE bType))
+          (λres2.Some ? ≪?,(AST_EXPR_LT d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
   | PREAST_EXPR_LTE subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE bType))
-          (λres2.Some ? ≪?,(AST_EXPR_LTE e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE bType))
+          (λres2.Some ? ≪?,(AST_EXPR_LTE d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
   | PREAST_EXPR_EQ subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE bType))
-          (λres2.Some ? ≪?,(AST_EXPR_EQ e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE bType))
+          (λres2.Some ? ≪?,(AST_EXPR_EQ d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
   | PREAST_EXPR_NEQ subExpr1 subExpr2 ⇒
-   opt_map ?? (preast_to_ast_expr subExpr1 e)
-    (λsigmaRes1:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr subExpr2 e)
-     (λsigmaRes2:(Σt.ast_expr e t).
+   opt_map ?? (preast_to_ast_expr subExpr1 d e)
+    (λsigmaRes1:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr subExpr2 d e)
+     (λsigmaRes2:(Σt.ast_expr d e t).
       match (sigmaFst ?? sigmaRes1) with
        [ AST_TYPE_BASE bType ⇒
-        opt_map ?? (preast_to_ast_expr_check e sigmaRes1 (AST_TYPE_BASE bType))
-         (λres1.opt_map ?? (preast_to_ast_expr_check e sigmaRes2 (AST_TYPE_BASE bType))
-          (λres2.Some ? ≪?,(AST_EXPR_NEQ e ? res1 res2)≫))
+        opt_map ?? (preast_to_ast_expr_check d e sigmaRes1 (AST_TYPE_BASE bType))
+         (λres1.opt_map ?? (preast_to_ast_expr_check d e sigmaRes2 (AST_TYPE_BASE bType))
+          (λres2.Some ? ≪?,(AST_EXPR_NEQ d e ? res1 res2)≫))
        | _ ⇒ None ? ]))
 
   | PREAST_EXPR_B8toW16 subExpr ⇒
-   opt_map ?? (preast_to_ast_expr subExpr e)
-    (λsigmaRes:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr_check e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_BYTE8))
-     (λres.Some ? ≪?,(AST_EXPR_B8toW16 e res)≫))
+   opt_map ?? (preast_to_ast_expr subExpr d e)
+    (λsigmaRes:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr_check d e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_BYTE8))
+     (λres.Some ? ≪?,(AST_EXPR_B8toW16 d e res)≫))
   | PREAST_EXPR_B8toW32 subExpr ⇒
-   opt_map ?? (preast_to_ast_expr subExpr e)
-    (λsigmaRes:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr_check e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_BYTE8))
-     (λres.Some ? ≪?,(AST_EXPR_B8toW32 e res)≫))
+   opt_map ?? (preast_to_ast_expr subExpr d e)
+    (λsigmaRes:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr_check d e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_BYTE8))
+     (λres.Some ? ≪?,(AST_EXPR_B8toW32 d e res)≫))
   | PREAST_EXPR_W16toB8 subExpr ⇒
-   opt_map ?? (preast_to_ast_expr subExpr e)
-    (λsigmaRes:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr_check e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_WORD16))
-     (λres.Some ? ≪?,(AST_EXPR_W16toB8 e res)≫))
+   opt_map ?? (preast_to_ast_expr subExpr d e)
+    (λsigmaRes:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr_check d e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_WORD16))
+     (λres.Some ? ≪?,(AST_EXPR_W16toB8 d e res)≫))
   | PREAST_EXPR_W16toW32 subExpr ⇒
-   opt_map ?? (preast_to_ast_expr subExpr e)
-    (λsigmaRes:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr_check e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_WORD16))
-     (λres.Some ? ≪?,(AST_EXPR_W16toW32 e res)≫))
+   opt_map ?? (preast_to_ast_expr subExpr d e)
+    (λsigmaRes:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr_check d e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_WORD16))
+     (λres.Some ? ≪?,(AST_EXPR_W16toW32 d e res)≫))
   | PREAST_EXPR_W32toB8 subExpr ⇒
-   opt_map ?? (preast_to_ast_expr subExpr e)
-    (λsigmaRes:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr_check e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_WORD32))
-     (λres.Some ? ≪?,(AST_EXPR_W32toB8 e res)≫))
+   opt_map ?? (preast_to_ast_expr subExpr d e)
+    (λsigmaRes:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr_check d e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_WORD32))
+     (λres.Some ? ≪?,(AST_EXPR_W32toB8 d e res)≫))
   | PREAST_EXPR_W32toW16 subExpr ⇒
-   opt_map ?? (preast_to_ast_expr subExpr e)
-    (λsigmaRes:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr_check e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_WORD32))
-     (λres.Some ? ≪?,(AST_EXPR_W32toW16 e res)≫))
+   opt_map ?? (preast_to_ast_expr subExpr d e)
+    (λsigmaRes:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr_check d e sigmaRes (AST_TYPE_BASE AST_BASE_TYPE_WORD32))
+     (λres.Some ? ≪?,(AST_EXPR_W32toW16 d e res)≫))
 
    | PREAST_EXPR_ID var ⇒
-   opt_map ?? (preast_to_ast_var var e)
-    (λsigmaRes:(Σb.(Σt.ast_var e b t)).
+   opt_map ?? (preast_to_ast_var var d e)
+    (λsigmaRes:(Σb.(Σt.ast_var d e b t)).
      match sigmaRes with [ sigma_intro b sigmaRes' ⇒
       match sigmaRes' with [ sigma_intro t _ ⇒
-        opt_map ?? (preast_to_ast_var_check e sigmaRes b t)
-         (λres.Some ? ≪?,(AST_EXPR_ID e ?? res)≫)]])
+        opt_map ?? (preast_to_ast_var_check d e sigmaRes b t)
+         (λres.Some ? ≪?,(AST_EXPR_ID d e ?? res)≫)]])
   ]
 (*
  PREAST_VAR_ID: aux_str_type → preast_var
  PREAST_VAR_ARRAY: preast_var → preast_expr → preast_var
  PREAST_VAR_STRUCT: preast_var → nat → preast_var
 *)
-and preast_to_ast_var (preast:preast_var) (e:aux_env_type) on preast : option (Σb.(Σt.ast_var e b t)) ≝
+and preast_to_ast_var (preast:preast_var) (d:nat) (e:aux_env_type d) on preast : option (Σb.(Σt.ast_var d e b t)) ≝
  match preast with
   [ PREAST_VAR_ID name ⇒
-   match checkb_desc_env e name
-    return λx.checkb_desc_env e name = x → option (Σb.(Σt.ast_var e b t))
+   match checkb_desc_env d e name
+    return λx.checkb_desc_env d e name = x → option (Σb.(Σt.ast_var d e b t))
    with
-    [ true ⇒ λp:(checkb_desc_env e name = true).
-     let desc ≝ get_desc_env e name in
+    [ true ⇒ λp:(checkb_desc_env d e name = true).
+     let desc ≝ get_desc_env d e name in
      let b ≝ get_const_desc desc in
      let t ≝ get_type_desc desc in
-     Some ? ≪b,≪t,(AST_VAR_ID e b t (AST_ID e name (checkbdescenv_to_checkdescenv e name p)))≫≫     
-    | false ⇒ λp:(checkb_desc_env e name = false).None ?
-    ] (refl_eq ? (checkb_desc_env e name))
+     Some ? ≪b,≪t,(AST_VAR_ID d e b t (AST_ID d e name (checkbdescenv_to_checkdescenv d e name p)))≫≫     
+    | false ⇒ λp:(checkb_desc_env d e name = false).None ?
+    ] (refl_eq ? (checkb_desc_env d e name))
 
   | PREAST_VAR_ARRAY subVar expr ⇒
-   opt_map ?? (preast_to_ast_var subVar e)
-    (λsigmaResV:(Σb.(Σt.ast_var e b t)).
+   opt_map ?? (preast_to_ast_var subVar d e)
+    (λsigmaResV:(Σb.(Σt.ast_var d e b t)).
      match sigmaResV with [ sigma_intro b sigmaResV' ⇒
       match sigmaResV' with [ sigma_intro t _ ⇒
        match t with
         [ AST_TYPE_ARRAY subType dim ⇒
-         opt_map ?? (preast_to_ast_var_check e sigmaResV b (AST_TYPE_ARRAY subType dim))
+         opt_map ?? (preast_to_ast_var_check d e sigmaResV b (AST_TYPE_ARRAY subType dim))
           (λresVar.
            (* ASSERTO:
               1) se l'indice e' un'espressione riducibile ad un valore deve essere gia'
@@ -343,30 +343,30 @@ and preast_to_ast_var (preast:preast_var) (e:aux_env_type) on preast : option (
                   | PREAST_EXPR_WORD32 val ⇒ (λx.ltb (nat_of_word32 val) dim)
                   | _ ⇒ (λx.true) ]) expr with
             [ true ⇒
-             opt_map ?? (preast_to_ast_expr expr e)
-              (λsigmaResE:(Σt.ast_expr e t).
+             opt_map ?? (preast_to_ast_expr expr d e)
+              (λsigmaResE:(Σt.ast_expr d e t).
                match sigmaFst ?? sigmaResE with
                 [ AST_TYPE_BASE bType ⇒
-                 opt_map ?? (preast_to_ast_expr_check e sigmaResE (AST_TYPE_BASE bType))
-                  (λresExpr.Some ? ≪b,≪subType,(AST_VAR_ARRAY e b subType dim resVar (AST_BASE_EXPR e bType resExpr))≫≫)
+                 opt_map ?? (preast_to_ast_expr_check d e sigmaResE (AST_TYPE_BASE bType))
+                  (λresExpr.Some ? ≪b,≪subType,(AST_VAR_ARRAY d e b subType dim resVar (AST_BASE_EXPR d e bType resExpr))≫≫)
                 | _ ⇒ None ? ])
             | false ⇒ None ? ])
         | _ ⇒ None ? ]]])
 
   | PREAST_VAR_STRUCT subVar field ⇒
-   opt_map ?? (preast_to_ast_var subVar e)
-    (λsigmaRes:(Σb.(Σt.ast_var e b t)).
+   opt_map ?? (preast_to_ast_var subVar d e)
+    (λsigmaRes:(Σb.(Σt.ast_var d e b t)).
      match sigmaRes with [ sigma_intro b sigmaRes' ⇒
       match sigmaRes' with [ sigma_intro t _ ⇒
        match t with
         [ AST_TYPE_STRUCT nelSubType ⇒
-         opt_map ?? (preast_to_ast_var_check e sigmaRes b (AST_TYPE_STRUCT nelSubType))
+         opt_map ?? (preast_to_ast_var_check d e sigmaRes b (AST_TYPE_STRUCT nelSubType))
           (λresVar.
            match ltb field (len_neList ? nelSubType)
-            return λx.(ltb field (len_neList ? nelSubType) = x) → option (Σb.(Σt.ast_var e b t))
+            return λx.(ltb field (len_neList ? nelSubType) = x) → option (Σb.(Σt.ast_var d e b t))
            with
             [ true ⇒ λp:(ltb field (len_neList ? nelSubType) = true).
-             Some ? ≪b,≪(abs_nth_neList ? nelSubType field),(AST_VAR_STRUCT e b nelSubType field resVar p)≫≫
+             Some ? ≪b,≪(abs_nth_neList ? nelSubType field),(AST_VAR_STRUCT d e b nelSubType field resVar p)≫≫
             | false ⇒ λp:(ltb field (len_neList ? nelSubType) = false).None ?
             ] (refl_eq ? (ltb field (len_neList ? nelSubType)))
           )
@@ -385,7 +385,7 @@ definition preast_to_ast_init_val_aux_array :
 λt:ast_type.λn:nat.λx:Prod (aux_ast_init_type t) (aux_ast_init_type (AST_TYPE_ARRAY t n)).x.
 
 definition preast_to_ast_init_val_aux_struct :
-Πt.Πnel.Prod (aux_ast_init_type t) (aux_ast_init_type (AST_TYPE_STRUCT nel)) → (aux_ast_init_type (AST_TYPE_STRUCT («t£»&nel))) ≝
+Πt.Πnel.Prod (aux_ast_init_type t) (aux_ast_init_type (AST_TYPE_STRUCT nel)) → (aux_ast_init_type (AST_TYPE_STRUCT («£t»&nel))) ≝
 λt:ast_type.λnel:ne_list ast_type.λx:Prod (aux_ast_init_type t) (aux_ast_init_type (AST_TYPE_STRUCT nel)).x.
 
 let rec preast_to_ast_init_val_aux (preast:preast_init_val) on preast : option (Σt.aux_ast_init_type t) ≝
@@ -439,7 +439,7 @@ let rec preast_to_ast_init_val_aux (preast:preast_init_val) on preast : option (
      [ ne_nil h ⇒
       opt_map ?? (preast_to_ast_init_val_aux h)
        (λsigmaRes:(Σt.aux_ast_init_type t).match sigmaRes with [ sigma_intro t res ⇒
-        Some (Σt.aux_ast_init_type t) ≪(AST_TYPE_STRUCT (« t £»)),res≫ ])
+        Some (Σt.aux_ast_init_type t) ≪(AST_TYPE_STRUCT («£t»)),res≫ ])
      | ne_cons h tl ⇒ 
       opt_map ?? (preast_to_ast_init_val_aux h)
        (λsigmaRes1:(Σt.aux_ast_init_type t).opt_map ?? (aux tl)
@@ -452,7 +452,7 @@ let rec preast_to_ast_init_val_aux (preast:preast_init_val) on preast : option (
               return λx.(eq_ast_type t2 (AST_TYPE_STRUCT nelSubType) = x) → option (Σt.aux_ast_init_type t)
              with
               [ true ⇒ λp:(eq_ast_type t2 (AST_TYPE_STRUCT nelSubType) = true).
-               Some (Σt.aux_ast_init_type t) ≪(AST_TYPE_STRUCT («t1£»&nelSubType)),
+               Some (Σt.aux_ast_init_type t) ≪(AST_TYPE_STRUCT («£t1»&nelSubType)),
                                               (preast_to_ast_init_val_aux_struct ??
                                                (pair (aux_ast_init_type t1) (aux_ast_init_type (AST_TYPE_STRUCT nelSubType))
                                                      res1
@@ -467,17 +467,17 @@ let rec preast_to_ast_init_val_aux (preast:preast_init_val) on preast : option (
  PREAST_INIT_VAR: preast_var → preast_init
  PREAST_INIT_VAL: preast_init_val → preast_init
 *)
-definition preast_to_ast_init : preast_init → Πe.option (Σt.ast_init e t) ≝
-λpreast:preast_init.λe:aux_env_type.match preast with
+definition preast_to_ast_init : preast_init → Πd.Πe:aux_env_type d.option (Σt.ast_init d e t) ≝
+λpreast:preast_init.λd.λe:aux_env_type d.match preast with
  [ PREAST_INIT_VAR var ⇒
-  opt_map ?? (preast_to_ast_var var e)
-   (λsigmaRes:(Σb.(Σt.ast_var e b t)).
-    Some ? ≪?,(AST_INIT_VAR e ?? (sigmaSnd ?? (sigmaSnd ?? sigmaRes)))≫)
+  opt_map ?? (preast_to_ast_var var d e)
+   (λsigmaRes:(Σb.(Σt.ast_var d e b t)).
+    Some ? ≪?,(AST_INIT_VAR d e ?? (sigmaSnd ?? (sigmaSnd ?? sigmaRes)))≫)
 
  | PREAST_INIT_VAL val ⇒
   opt_map ?? (preast_to_ast_init_val_aux val)
    (λsigmaRes:(Σt.aux_ast_init_type t).
-    Some ? ≪?,(AST_INIT_VAL e ? (sigmaSnd ?? sigmaRes))≫)
+    Some ? ≪?,(AST_INIT_VAL d e ? (sigmaSnd ?? sigmaRes))≫)
  ].
 
 (*
@@ -485,75 +485,75 @@ definition preast_to_ast_init : preast_init → Πe.option (Σt.ast_init e t) 
  PREAST_STM_WHILE: preast_expr → preast_decl → preast_stm
  PREAST_STM_IF: ne_list (Prod preast_expr preast_decl) → option preast_decl → preast_stm
 *)
-definition preast_to_ast_base_expr : preast_expr → Πe.option (ast_base_expr e) ≝
-λpreast:preast_expr.λe:aux_env_type.
- opt_map ?? (preast_to_ast_expr preast e)
-  (λsigmaRes:(Σt.ast_expr e t).
+definition preast_to_ast_base_expr : preast_expr → Πd.Πe:aux_env_type d.option (ast_base_expr d e) ≝
+λpreast:preast_expr.λd.λe:aux_env_type d.
+ opt_map ?? (preast_to_ast_expr preast d e)
+  (λsigmaRes:(Σt.ast_expr d e t).
    match sigmaFst ?? sigmaRes with
     [ AST_TYPE_BASE bType ⇒
-     opt_map ?? (preast_to_ast_expr_check e sigmaRes (AST_TYPE_BASE bType))
-      (λres.Some ? (AST_BASE_EXPR e ? res))
+     opt_map ?? (preast_to_ast_expr_check d e sigmaRes (AST_TYPE_BASE bType))
+      (λres.Some ? (AST_BASE_EXPR d e ? res))
     | _ ⇒ None ? ]).
 
-let rec preast_to_ast_stm (preast:preast_stm) (e:aux_env_type) on preast : option (ast_stm e) ≝
+let rec preast_to_ast_stm (preast:preast_stm) (d:nat) (e:aux_env_type d) on preast : option (ast_stm d e) ≝
  match preast with
   [ PREAST_STM_ASG var expr ⇒
-   opt_map ?? (preast_to_ast_var var e)
-    (λsigmaResV:(Σb.(Σt.ast_var e b t)).
+   opt_map ?? (preast_to_ast_var var d e)
+    (λsigmaResV:(Σb.(Σt.ast_var d e b t)).
     match sigmaResV with [ sigma_intro _ sigmaResV' ⇒
      match sigmaResV' with [ sigma_intro t _ ⇒
-      opt_map ?? (preast_to_ast_var_check e sigmaResV false t)
-       (λresVar.opt_map ?? (preast_to_ast_expr expr e)
-        (λsigmaResE:(Σt.ast_expr e t).opt_map ?? (preast_to_ast_expr_check e sigmaResE t)
-         (λresExpr.Some ? (AST_STM_ASG e t resVar resExpr)
+      opt_map ?? (preast_to_ast_var_check d e sigmaResV false t)
+       (λresVar.opt_map ?? (preast_to_ast_expr expr d e)
+        (λsigmaResE:(Σt.ast_expr d e t).opt_map ?? (preast_to_ast_expr_check d e sigmaResE t)
+         (λresExpr.Some ? (AST_STM_ASG d e t resVar resExpr)
          )))]])
 
   | PREAST_STM_WHILE expr decl ⇒
-   opt_map ?? (preast_to_ast_base_expr expr e)
-    (λresExpr.opt_map ?? (preast_to_ast_decl decl (enter_env e))
-     (λresDecl.Some ? (AST_STM_WHILE e resExpr resDecl)))
+   opt_map ?? (preast_to_ast_base_expr expr d e)
+    (λresExpr.opt_map ?? (preast_to_ast_decl decl (S d) (enter_env d e))
+     (λresDecl.Some ? (AST_STM_WHILE d e resExpr resDecl)))
 
   | PREAST_STM_IF nelExprDecl optDecl ⇒
-   opt_map ?? (fold_right_neList ?? (λh,t.opt_map ?? (preast_to_ast_base_expr (fst ?? h) e)
-                                     (λresExpr.opt_map ?? (preast_to_ast_decl (snd ?? h) (enter_env e))
+   opt_map ?? (fold_right_neList ?? (λh,t.opt_map ?? (preast_to_ast_base_expr (fst ?? h) d e)
+                                     (λresExpr.opt_map ?? (preast_to_ast_decl (snd ?? h) (S d) (enter_env d e))
                                       (λresDecl.opt_map ?? t
-                                       (λt'.Some ? («(pair ?? resExpr resDecl)£»&t')))))
-                                    (Some ? (ne_nil ? (pair ?? (AST_BASE_EXPR e AST_BASE_TYPE_BYTE8 (AST_EXPR_BYTE8 e 〈x0,x0〉)) (AST_NO_DECL (enter_env e) (nil ?)))))
+                                       (λt'.Some ? («£(pair ?? resExpr resDecl)»&t')))))
+                                    (Some ? (ne_nil ? (pair ?? (AST_BASE_EXPR d e AST_BASE_TYPE_BYTE8 (AST_EXPR_BYTE8 d e 〈x0,x0〉)) (AST_NO_DECL (S d) (enter_env d e) (nil ?)))))
                                     nelExprDecl)
     (λres.match optDecl with
-     [ None ⇒ Some ? (AST_STM_IF e (cut_last_neList ? res) (None ?))
-     | Some decl ⇒ opt_map ?? (preast_to_ast_decl decl (enter_env e))
-      (λresDecl.Some ? (AST_STM_IF e (cut_last_neList ? res) (Some ? resDecl)))
+     [ None ⇒ Some ? (AST_STM_IF d e (cut_last_neList ? res) (None ?))
+     | Some decl ⇒ opt_map ?? (preast_to_ast_decl decl (S d) (enter_env d e))
+      (λresDecl.Some ? (AST_STM_IF d e (cut_last_neList ? res) (Some ? resDecl)))
      ])
   ]
 (* 
  PREAST_NO_DECL: list preast_stm → preast_decl
  PREAST_DECL: bool → aux_str_type → ast_type → option preast_init → preast_decl → preast_decl
 *)
-and preast_to_ast_decl (preast:preast_decl) (e:aux_env_type) on preast : option (ast_decl e) ≝
+and preast_to_ast_decl (preast:preast_decl) (d:nat) (e:aux_env_type d) on preast : option (ast_decl d e) ≝
  match preast with
   [ PREAST_NO_DECL lPreastStm ⇒
-    opt_map ?? (fold_right_list ?? (λh,t.opt_map ?? (preast_to_ast_stm h e)
+    opt_map ?? (fold_right_list ?? (λh,t.opt_map ?? (preast_to_ast_stm h d e)
                                     (λh'.opt_map ?? t
                                      (λt'.Some ? ([h']@t')))) (Some ? (nil ?)) lPreastStm)  
-     (λres.Some ? (AST_NO_DECL e res))
+     (λres.Some ? (AST_NO_DECL d e res))
 
   | PREAST_DECL constFlag decName decType optInitExpr subPreastDecl ⇒
-   match checkb_not_already_def_env e decName
-    return λx.(checkb_not_already_def_env e decName = x) → option (ast_decl e)
+   match checkb_not_already_def_env d e decName
+    return λx.(checkb_not_already_def_env d e decName = x) → option (ast_decl d e)
    with
-    [ true ⇒ λp:(checkb_not_already_def_env e decName = true).
-     opt_map ?? (preast_to_ast_decl subPreastDecl (add_desc_env e decName constFlag decType))
+    [ true ⇒ λp:(checkb_not_already_def_env d e decName = true).
+     opt_map ?? (preast_to_ast_decl subPreastDecl d (add_desc_env d e decName constFlag decType))
       (λdecl.match optInitExpr with
-       [ None ⇒ Some ? (AST_DECL e constFlag decName decType
-                                 (checkbnotalreadydefenv_to_checknotalreadydefenv e decName p) (None ?) decl)
+       [ None ⇒ Some ? (AST_DECL d e constFlag decName decType
+                                 (checkbnotalreadydefenv_to_checknotalreadydefenv d e decName p) (None ?) decl)
        | Some initExpr ⇒
-        opt_map ?? (preast_to_ast_init initExpr e)
-         (λsigmaRes:(Σt:ast_type.ast_init e t).opt_map ?? (preast_to_ast_init_check e sigmaRes decType)
-          (λresInit.Some ? (AST_DECL e constFlag decName decType
-                                     (checkbnotalreadydefenv_to_checknotalreadydefenv e decName p) (Some ? resInit) decl)))])
-    | false ⇒ λp:(checkb_not_already_def_env e decName = false).None ?
-    ] (refl_eq ? (checkb_not_already_def_env e decName))
+        opt_map ?? (preast_to_ast_init initExpr d e)
+         (λsigmaRes:(Σt:ast_type.ast_init d e t).opt_map ?? (preast_to_ast_init_check d e sigmaRes decType)
+          (λresInit.Some ? (AST_DECL d e constFlag decName decType
+                                     (checkbnotalreadydefenv_to_checknotalreadydefenv d e decName p) (Some ? resInit) decl)))])
+    | false ⇒ λp:(checkb_not_already_def_env d e decName = false).None ?
+    ] (refl_eq ? (checkb_not_already_def_env d e decName))
   ].
 
 (*
@@ -561,25 +561,5 @@ and preast_to_ast_decl (preast:preast_decl) (e:aux_env_type) on preast : option
 *)
 definition preast_to_ast ≝
 λpreast:preast_root.match preast with
- [ PREAST_ROOT decl ⇒ opt_map ?? (preast_to_ast_decl decl empty_env)
+ [ PREAST_ROOT decl ⇒ opt_map ?? (preast_to_ast_decl decl O empty_env)
                        (λres.Some ? (AST_ROOT res)) ].
-
-(* mini test
-definition prova ≝
-PREAST_ROOT (
- PREAST_DECL true [ ch_Q ] (AST_TYPE_ARRAY (AST_TYPE_BASE AST_BASE_TYPE_BYTE8) 2) (None ?) (
-  PREAST_NO_DECL [
-   PREAST_STM_WHILE (PREAST_EXPR_BYTE8 〈x0,x0〉) (
-    PREAST_DECL false [ ch_P ] (AST_TYPE_STRUCT «(AST_TYPE_BASE AST_BASE_TYPE_BYTE8)£(AST_TYPE_BASE AST_BASE_TYPE_WORD16)») (None ?) (
-     PREAST_NO_DECL [
-      PREAST_STM_ASG (PREAST_VAR_STRUCT (PREAST_VAR_ID [ ch_P ]) 1) (PREAST_EXPR_ID (PREAST_VAR_ARRAY (PREAST_VAR_ID [ ch_Q ]) (PREAST_EXPR_BYTE8 〈x0,x1〉))) 
-     ]
-    )
-   )
-  ]
- )
-).
-
-lemma checkprova : None ? = preast_to_ast prova.
-normalize;
-*)