now destruct takes an optional list of term rather than a sigle optional term

[helm.git] / components / lexicon / lexiconAst.ml

diff --git a/components/lexicon/lexiconAst.ml b/components/lexicon/lexiconAst.ml
index 50f0061eebb0e894b9a1173dda6538348df14c5e..5a09d590a86c9c66e5affa57559b88eea5a94b63 100644 (file)
--- 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,12 +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 * inclusion_mode
+  | 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 *