From: Ferruccio Guidi Date: Tue, 26 Jan 2016 16:09:51 +0000 (+0000) Subject: lexicon commands must tbe parsed before grafite commands rather than X-Git-Tag: make_still_working~657 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=7d8ebeb7b6f21204b88786c738c67f52f3703c5b;p=helm.git lexicon commands must tbe parsed before grafite commands rather than after (why?) --- diff --git a/matita/components/grafite_parser/grafiteParser.ml b/matita/components/grafite_parser/grafiteParser.ml index fd9c2946d..25024f26d 100644 --- a/matita/components/grafite_parser/grafiteParser.ml +++ b/matita/components/grafite_parser/grafiteParser.ml @@ -505,7 +505,8 @@ EXTEND ]]; grafite_ncommand: [ [ - IDENT "qed" ; i = index -> G.NQed (loc,i) + lc = lexicon_command -> lc + | IDENT "qed" ; i = index -> G.NQed (loc,i) | IDENT "defined" ; i = index -> G.NQed (loc,i) (* FG: presentational qed for definitions *) | src = source; nflavour = ntheorem_flavour; name = IDENT; params = LIST0 protected_binder_vars; SYMBOL ":"; typ = term; (* FG: params added *) @@ -576,7 +577,6 @@ EXTEND m = LIST0 [ u1 = URI; SYMBOL <:unicode>; u2 = URI -> u1,u2 ] -> G.NCopy (loc,s,NUri.uri_of_string u, List.map (fun a,b -> NUri.uri_of_string a, NUri.uri_of_string b) m) - | lc = lexicon_command -> lc ]]; lexicon_command: [ [ diff --git a/matita/matita/.depend.opt b/matita/matita/.depend.opt index 2df448773..be904cca8 100644 --- a/matita/matita/.depend.opt +++ b/matita/matita/.depend.opt @@ -18,28 +18,24 @@ matitaEngine.cmo : applyTransformation.cmi matitaEngine.cmi matitaEngine.cmx : applyTransformation.cmx matitaEngine.cmi matitaExcPp.cmo : matitaEngine.cmi matitaExcPp.cmi matitaExcPp.cmx : matitaEngine.cmx matitaExcPp.cmi -matitaGeneratedGui.cmo : -matitaGeneratedGui.cmx : -matitaGtkMisc.cmo : matitaTypes.cmi matitaGeneratedGui.cmx buildTimeConf.cmx \ - matitaGtkMisc.cmi -matitaGtkMisc.cmx : matitaTypes.cmx matitaGeneratedGui.cmx buildTimeConf.cmx \ - matitaGtkMisc.cmi +matitaGtkMisc.cmo : matitaTypes.cmi buildTimeConf.cmx matitaGtkMisc.cmi +matitaGtkMisc.cmx : matitaTypes.cmx buildTimeConf.cmx matitaGtkMisc.cmi matitaGui.cmo : matitaTypes.cmi matitaScript.cmi matitaMisc.cmi \ - matitaMathView.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi \ - matitaGeneratedGui.cmx matitaExcPp.cmi buildTimeConf.cmx matitaGui.cmi + matitaMathView.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi matitaExcPp.cmi \ + buildTimeConf.cmx matitaGui.cmi matitaGui.cmx : matitaTypes.cmx matitaScript.cmx matitaMisc.cmx \ - matitaMathView.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx \ - matitaGeneratedGui.cmx matitaExcPp.cmx buildTimeConf.cmx matitaGui.cmi + matitaMathView.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx matitaExcPp.cmx \ + buildTimeConf.cmx matitaGui.cmi matitaInit.cmo : matitaExcPp.cmi buildTimeConf.cmx matitaInit.cmi matitaInit.cmx : matitaExcPp.cmx buildTimeConf.cmx matitaInit.cmi matitaMathView.cmo : virtuals.cmi matitaTypes.cmi matitaMisc.cmi \ - matitaGuiTypes.cmi matitaGtkMisc.cmi matitaGeneratedGui.cmx \ - matitaExcPp.cmi lablGraphviz.cmi cicMathView.cmi buildTimeConf.cmx \ - applyTransformation.cmi matitaMathView.cmi + matitaGuiTypes.cmi matitaGtkMisc.cmi matitaExcPp.cmi lablGraphviz.cmi \ + cicMathView.cmi buildTimeConf.cmx applyTransformation.cmi \ + matitaMathView.cmi matitaMathView.cmx : virtuals.cmx matitaTypes.cmx matitaMisc.cmx \ - matitaGuiTypes.cmi matitaGtkMisc.cmx matitaGeneratedGui.cmx \ - matitaExcPp.cmx lablGraphviz.cmx cicMathView.cmx buildTimeConf.cmx \ - applyTransformation.cmx matitaMathView.cmi + matitaGuiTypes.cmi matitaGtkMisc.cmx matitaExcPp.cmx lablGraphviz.cmx \ + cicMathView.cmx buildTimeConf.cmx applyTransformation.cmx \ + matitaMathView.cmi matitaMisc.cmo : matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi matitaMisc.cmx : matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi matita.cmo : predefined_virtuals.cmi matitaScript.cmi matitaMisc.cmi \ @@ -66,9 +62,9 @@ lablGraphviz.cmi : matitaclean.cmi : matitaEngine.cmi : applyTransformation.cmi matitaExcPp.cmi : -matitaGtkMisc.cmi : matitaGeneratedGui.cmx +matitaGtkMisc.cmi : matitaGui.cmi : matitaGuiTypes.cmi -matitaGuiTypes.cmi : matitaGeneratedGui.cmx applyTransformation.cmi +matitaGuiTypes.cmi : applyTransformation.cmi matitaInit.cmi : matitaMathView.cmi : matitaTypes.cmi matitaGuiTypes.cmi matitaMisc.cmi : matitaGuiTypes.cmi