Réforme de l'interprétation des termes :

- Le parsing se fait maintenant via "constr_expr" au lieu de "Coqast.t"
- "Coqast.t" reste pour l'instant pour le pretty-printing. Un deuxième
  pretty-printer dans ppconstr.ml est basé sur "constr_expr".
- Nouveau répertoire "interp" qui hérite de la partie interprétation qui
  se trouvait avant dans "parsing" (constrintern.ml remplace astterm.ml;
  constrextern.ml est l'équivalent de termast.ml pour le nouveau
  printer; topconstr.ml; contient la définition de "constr_expr";
  modintern.ml remplace astmod.ml)
- Libnames.reference tend à remplacer Libnames.qualid


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@3235 85f007b7-540e-0410-9357-904b9bb8a0f7

2 files changed, 14 insertions, 5 deletions

diff --git a/dev/base_include b/dev/base_include
index 83d967ce44..cadbc5cf10 100644
--- a/dev/base_include
+++ b/dev/base_include
@@ -3,6 +3,15 @@
    This file is loaded by include *)
 
 #cd".";;
+#directory "parsing";;
+#directory "interp";;
+#directory "toplevel";;
+#directory "library";;
+#directory "kernel";;
+#directory "pretyping";;
+#directory "lib";;
+#directory "proofs";;
+#directory "tactics";;
 #use "top_printers.ml";;
 
 #install_printer  (* identifier *) prid;;
@@ -32,7 +41,7 @@ let parse_ast = parse_com;;
 (* build a term of type rawconstr without type-checking or resolution of 
    implicit syntax *)
 
-let e s = Astterm.interp_rawconstr Evd.empty (Global.env()) (parse_ast s);;
+let e s = Constrintern.interp_rawconstr Evd.empty (Global.env()) (parse_ast s);;
 
 (* For compatibility *)
 let raw_constr_of_string = e;;
@@ -41,7 +50,7 @@ let raw_constr_of_string = e;;
    implicit syntax *)
 
 let constr_of_string s = 
-  Astterm.interp_constr Evd.empty (Global.env()) (parse_ast s);;
+  Constrintern.interp_constr Evd.empty (Global.env()) (parse_ast s);;
 
 (* get the body of a constant *)
 
@@ -59,7 +68,7 @@ let get_nth_goal n = nth_goal_of_pftreestate n (Pfedit.get_pftreestate ());;
 let current_goal () = get_nth_goal 1;;
 
 let pf_e gl s = 
-    Astterm.interp_constr (project gl) (pf_env gl) (parse_ast s);;
+    Constrintern.interp_constr (project gl) (pf_env gl) (parse_ast s);;
 
 open Toplevel
 let go = loop
diff --git a/dev/top_printers.ml b/dev/top_printers.ml
index b74cd395a0..e936fc40f3 100644
--- a/dev/top_printers.ml
+++ b/dev/top_printers.ml
@@ -277,7 +277,7 @@ let _ =
        | [VARG_CONSTR c] -> 
 	   (fun () ->
               let (evmap,sign) = Command.get_current_context () in
-  	      constr_display (Astterm.interp_constr evmap sign c))
+  	      constr_display (Constrintern.interp_constr evmap sign c))
        | _ -> bad_vernac_args "PrintConstr")
 
 let _ =
@@ -286,7 +286,7 @@ let _ =
        | [VARG_CONSTR c] -> 
 	   (fun () ->
               let (evmap,sign) = Command.get_current_context () in
-  	      print_pure_constr (Astterm.interp_constr evmap sign c))
+  	      print_pure_constr (Constrintern.interp_constr evmap sign c))
        | _ -> bad_vernac_args "PrintPureConstr")
 *)