LexiconAstPp: fixed syntax for include

[helm.git] / helm / software / components / lexicon / lexiconAstPp.ml

diff --git a/helm/software/components/lexicon/lexiconAstPp.ml b/helm/software/components/lexicon/lexiconAstPp.ml
index e49a66f607b7a305463b592ff9962564c8374269..ad317bec77ba62f39c677a20c2d265ba8df93594 100644 (file)
--- a/helm/software/components/lexicon/lexiconAstPp.ml
+++ b/helm/software/components/lexicon/lexiconAstPp.ml
@@ -35,8 +35,10 @@ let pp_l2_pattern = CicNotationPp.pp_term
 let pp_alias = function
   | Ident_alias (id, uri) -> sprintf "alias id \"%s\" = \"%s\"" id uri
   | Symbol_alias (symb, instance, desc) ->
-      sprintf "alias symbol \"%s\" (instance %d) = \"%s\""
-        symb instance desc
+      sprintf "alias symbol \"%s\" %s= \"%s\""
+        symb
+        (if instance=0 then "" else "(instance "^ string_of_int instance ^ ") ")
+        desc
   | Number_alias (instance,desc) ->
       sprintf "alias num (instance %d) = \"%s\"" instance desc
   
@@ -75,7 +77,11 @@ let pp_notation dir_opt l1_pattern assoc prec l2_pattern =
     (pp_l2_pattern l2_pattern)
     
 let pp_command = function
-  | Include (_,path) -> "include " ^ path
+  | Include (_,_,mode,path) -> (* not precise, since path is absolute *)
+      if mode = WithPreferences then
+        "include \"" ^ path ^ "\".\n"
+      else
+        "include' \"" ^ path ^ "\".\n"
   | Alias (_,s) -> pp_alias s
   | Interpretation (_, dsc, (symbol, arg_patterns), cic_appl_pattern) ->
       pp_interpretation dsc symbol arg_patterns cic_appl_pattern