huge commit regarding the grafite_status:

[helm.git] / helm / software / components / grafite_engine / grafiteEngine.ml

diff --git a/helm/software/components/grafite_engine/grafiteEngine.ml b/helm/software/components/grafite_engine/grafiteEngine.ml
index 6d7632f7572ce7548f6c697a4e65d40bbbbea412..1e777ab83a148ab1c863b06ab7db83d0b142fde0 100644 (file)
--- a/helm/software/components/grafite_engine/grafiteEngine.ml
+++ b/helm/software/components/grafite_engine/grafiteEngine.ml
@@ -773,7 +773,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
       (match status.GrafiteTypes.ng_status with
        | GrafiteTypes.ProofMode
           { NTacStatus.istatus =
-             {NTacStatus.pstatus = pstatus; lstatus=lexicon_status} } ->
+             { NTacStatus.pstatus = pstatus; estatus = estatus } } ->
             let uri,height,menv,subst,obj_kind = pstatus in
              if menv <> [] then
               raise
@@ -798,7 +798,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
                in
                 {status with 
                  GrafiteTypes.ng_status = 
-                  GrafiteTypes.CommandMode lexicon_status },`New uris
+                  GrafiteTypes.CommandMode estatus },`New uris
        | _ -> raise (GrafiteTypes.Command_error "Not in proof mode"))
   | GrafiteAst.Relation (loc, id, a, aeq, refl, sym, trans) -> 
      Setoids.add_relation id a aeq refl sym trans;
@@ -809,12 +809,13 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
       NCicEnvironment.add_constraint strict [false,u1] [false,u2];
       status, `New [u1;u2]
   | GrafiteAst.NObj (loc,obj) ->
-     let lexicon_status =
+     let estatus =
        match status.GrafiteTypes.ng_status with
        | GrafiteTypes.ProofMode _ -> assert false
-       | GrafiteTypes.CommandMode ls -> ls in
-     let lexicon_status,obj =
-      GrafiteDisambiguate.disambiguate_nobj lexicon_status
+       | GrafiteTypes.CommandMode es -> es 
+     in
+     let estatus,obj =
+      GrafiteDisambiguate.disambiguate_nobj estatus
        ~baseuri:(GrafiteTypes.get_baseuri status) (text,prefix_len,obj) in
      let uri,height,nmenv,nsubst,nobj = obj in
      let ninitial_stack = Continuationals.Stack.of_nmetasenv nmenv in
@@ -824,7 +825,7 @@ let rec eval_command = {ec_go = fun ~disambiguate_command opts status
           GrafiteTypes.ProofMode
            (subst_metasenv_and_fix_names
             { NTacStatus.gstatus = ninitial_stack; 
-             istatus = { NTacStatus.pstatus = obj; lstatus = lexicon_status}})
+             istatus = { NTacStatus.pstatus = obj; estatus = estatus}})
              }
      in
      (match nmenv with