X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=components%2Flexicon%2FlexiconAst.ml;h=5a09d590a86c9c66e5affa57559b88eea5a94b63;hb=b0a6c05decc9f0e731f70cfc5ae5350ae4046b79;hp=aed4b0b152365ea8ee0e191f96ab1aabfbee5bda;hpb=7f2444c2670cadafddd8785b687ef312158376b0;p=helm.git

diff --git a/components/lexicon/lexiconAst.ml b/components/lexicon/lexiconAst.ml
index aed4b0b15..5a09d590a 100644
--- a/components/lexicon/lexiconAst.ml
+++ b/components/lexicon/lexiconAst.ml
@@ -27,7 +27,7 @@
 
 type direction = [ `LeftToRight | `RightToLeft ]
 
-type loc = Token.flocation
+type loc = Stdpp.location
 
 type alias_spec =
   | Ident_alias of string * string        (* identifier, uri *)
@@ -36,10 +36,12 @@ type alias_spec =
 
 (** To be increased each time the command type below changes, used for "safe"
  * marshalling *)
-let magic = 5
+let magic = 6
+
+type inclusion_mode = WithPreferences | WithoutPreferences (* aka aliases *)
 
 type command =
-  | Include of loc * string
+  | Include of loc * string * inclusion_mode * string (* _,buri,_,path *)
   | Alias of loc * alias_spec
       (** parameters, name, type, fields *) 
   | Notation of loc * direction option * CicNotationPt.term * Gramext.g_assoc *