- some depend files

- bug fix in grafiteAstPp.ml
- some assertions in matitaEngine.ml

diff --git a/matita/components/extlib/.depend b/matita/components/extlib/.depend
index f6168c1bc823d387308d6a448108d3e09ae7641f..6f707effcd8f40c3cca0262be1d045e17b98c5d2 100644 (file)
--- a/matita/components/extlib/.depend
+++ b/matita/components/extlib/.depend
@@ -19,8 +19,8 @@ hLog.cmo: hLog.cmi
 hLog.cmx: hLog.cmi 
 trie.cmo: trie.cmi 
 trie.cmx: trie.cmi 
-discrimination_tree.cmo: trie.cmi discrimination_tree.cmi 
-discrimination_tree.cmx: trie.cmx discrimination_tree.cmi 
+discrimination_tree.cmo: trie.cmi hExtlib.cmi discrimination_tree.cmi 
+discrimination_tree.cmx: trie.cmx hExtlib.cmx discrimination_tree.cmi 
 hTopoSort.cmo: hTopoSort.cmi 
 hTopoSort.cmx: hTopoSort.cmi 
 graphvizPp.cmo: graphvizPp.cmi 

diff --git a/matita/components/grafite/grafiteAstPp.ml b/matita/components/grafite/grafiteAstPp.ml
index eda934d68bdebadbc5ca4d4ac3d7e8c4d04e143f..c4eacfb5a36d18940f4b04050339e0ffe8e4a484 100644 (file)
--- a/matita/components/grafite/grafiteAstPp.ml
+++ b/matita/components/grafite/grafiteAstPp.ml
@@ -54,7 +54,7 @@ let pp_tactic_pattern status ~map_unicode_to_tex (what, hyp, goal) =
 let rec pp_ntactic status ~map_unicode_to_tex =
  let pp_tactic_pattern = pp_tactic_pattern ~map_unicode_to_tex in
  function
-  | NApply (_,t) -> "napply " ^ NotationPp.pp_term status t
+  | NApply (_,t) -> "@" ^ NotationPp.pp_term status t
   | NSmartApply (_,t) -> "fixme"
   | NAuto (_,(None,flgs)) ->
       "nautobatch" ^
@@ -169,7 +169,7 @@ let pp_ncommand status = function
   | NUnivConstraint (_) -> "not supported"
   | NCoercion (_) -> "not supported"
   | NObj (_,obj) -> NotationPp.pp_obj (NotationPp.pp_term status) obj
-  | NQed (_) -> "nqed"
+  | NQed (_) -> "qed"
   | NCopy (_,name,uri,map) -> 
       "copy " ^ name ^ " from " ^ NUri.string_of_uri uri ^ " with " ^ 
         String.concat " and " 

diff --git a/matita/components/grafite_parser/.depend b/matita/components/grafite_parser/.depend
index b8b65a8c0e3da3caf2c210780184bc484807aca6..e5cd5f2b357785b3a6ea40ea0ec42b06723ecd31 100644 (file)
--- a/matita/components/grafite_parser/.depend
+++ b/matita/components/grafite_parser/.depend
@@ -1,8 +1,5 @@
-dependenciesParser.cmi: 
 grafiteParser.cmi: 
 print_grammar.cmi: grafiteParser.cmi 
-dependenciesParser.cmo: dependenciesParser.cmi 
-dependenciesParser.cmx: dependenciesParser.cmi 
 grafiteParser.cmo: grafiteParser.cmi 
 grafiteParser.cmx: grafiteParser.cmi 
 print_grammar.cmo: print_grammar.cmi 

diff --git a/matita/components/library/.depend b/matita/components/library/.depend
index 975c9e8da23e2873132c03c24be55dd65827dc92..edb2abe955afe4357fc9126c8296ddf87dd7247c 100644 (file)
--- a/matita/components/library/.depend
+++ b/matita/components/library/.depend
@@ -5,5 +5,5 @@ librarian.cmo: librarian.cmi
 librarian.cmx: librarian.cmi 
 libraryMisc.cmo: libraryMisc.cmi 
 libraryMisc.cmx: libraryMisc.cmi 
-libraryClean.cmo: libraryMisc.cmi libraryClean.cmi 
-libraryClean.cmx: libraryMisc.cmx libraryClean.cmi 
+libraryClean.cmo: libraryClean.cmi 
+libraryClean.cmx: libraryClean.cmi 

diff --git a/matita/components/syntax_extensions/.depend b/matita/components/syntax_extensions/.depend
index 119f13093a98003e4d06ea0244ce7aae7f76e6e3..25e67131fca0487c4390d310d8307722b5058067 100644 (file)
--- a/matita/components/syntax_extensions/.depend
+++ b/matita/components/syntax_extensions/.depend
@@ -1,5 +1,5 @@
-utf8Macro.cmi:
-utf8MacroTable.cmo:
-utf8MacroTable.cmx:
-utf8Macro.cmo: utf8MacroTable.cmo utf8Macro.cmi
-utf8Macro.cmx: utf8MacroTable.cmx utf8Macro.cmi
+utf8Macro.cmi: 
+utf8MacroTable.cmo: 
+utf8MacroTable.cmx: 
+utf8Macro.cmo: utf8MacroTable.cmo utf8Macro.cmi 
+utf8Macro.cmx: utf8MacroTable.cmx utf8Macro.cmi 

diff --git a/matita/matita/.depend b/matita/matita/.depend
index b2221fe0bf78f6db8aca7443f37fccd9a9f1e3b0..8325fc357798820709bd68a79978a177d2111b7e 100644 (file)
--- a/matita/matita/.depend
+++ b/matita/matita/.depend
@@ -10,10 +10,12 @@ lablGraphviz.cmo: lablGraphviz.cmi
 lablGraphviz.cmx: lablGraphviz.cmi 
 matitaclean.cmo: matitaMisc.cmi matitaInit.cmi matitaclean.cmi 
 matitaclean.cmx: matitaMisc.cmx matitaInit.cmx matitaclean.cmi 
-matitac.cmo: matitaclean.cmi matitaMisc.cmi matitaInit.cmi matitaEngine.cmi 
-matitac.cmx: matitaclean.cmx matitaMisc.cmx matitaInit.cmx matitaEngine.cmx 
-matitaEngine.cmo: matitaEngine.cmi 
-matitaEngine.cmx: matitaEngine.cmi 
+matitac.cmo: matitaclean.cmi matitaMisc.cmi matitaInit.cmi matitaExcPp.cmi \
+    matitaEngine.cmi 
+matitac.cmx: matitaclean.cmx matitaMisc.cmx matitaInit.cmx matitaExcPp.cmx \
+    matitaEngine.cmx 
+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: 
@@ -23,27 +25,27 @@ matitaGtkMisc.cmo: matitaTypes.cmi matitaGeneratedGui.cmo buildTimeConf.cmo \
 matitaGtkMisc.cmx: matitaTypes.cmx matitaGeneratedGui.cmx buildTimeConf.cmx \
     matitaGtkMisc.cmi 
 matitaGui.cmo: matitaTypes.cmi matitaScript.cmi matitaMisc.cmi \
-    matitaMathView.cmi matitaGtkMisc.cmi matitaGeneratedGui.cmo \
-    matitaExcPp.cmi buildTimeConf.cmo matitaGui.cmi 
+    matitaMathView.cmi matitaGuiTypes.cmi matitaGtkMisc.cmi \
+    matitaGeneratedGui.cmo matitaExcPp.cmi buildTimeConf.cmo matitaGui.cmi 
 matitaGui.cmx: matitaTypes.cmx matitaScript.cmx matitaMisc.cmx \
-    matitaMathView.cmx matitaGtkMisc.cmx matitaGeneratedGui.cmx \
-    matitaExcPp.cmx buildTimeConf.cmx matitaGui.cmi 
+    matitaMathView.cmx matitaGuiTypes.cmi matitaGtkMisc.cmx \
+    matitaGeneratedGui.cmx matitaExcPp.cmx buildTimeConf.cmx matitaGui.cmi 
 matitaInit.cmo: matitaExcPp.cmi buildTimeConf.cmo matitaInit.cmi 
 matitaInit.cmx: matitaExcPp.cmx buildTimeConf.cmx matitaInit.cmi 
 matitaMathView.cmo: virtuals.cmi matitaTypes.cmi matitaMisc.cmi \
-    matitaGuiTypes.cmi matitaGtkMisc.cmi matitaExcPp.cmi lablGraphviz.cmi \
-    cicMathView.cmi buildTimeConf.cmo applyTransformation.cmi \
-    matitaMathView.cmi 
+    matitaGuiTypes.cmi matitaGtkMisc.cmi matitaGeneratedGui.cmo \
+    matitaExcPp.cmi lablGraphviz.cmi cicMathView.cmi buildTimeConf.cmo \
+    applyTransformation.cmi matitaMathView.cmi 
 matitaMathView.cmx: virtuals.cmx matitaTypes.cmx matitaMisc.cmx \
-    matitaGuiTypes.cmi matitaGtkMisc.cmx matitaExcPp.cmx lablGraphviz.cmx \
-    cicMathView.cmx buildTimeConf.cmx applyTransformation.cmx \
-    matitaMathView.cmi 
+    matitaGuiTypes.cmi matitaGtkMisc.cmx matitaGeneratedGui.cmx \
+    matitaExcPp.cmx lablGraphviz.cmx cicMathView.cmx buildTimeConf.cmx \
+    applyTransformation.cmx matitaMathView.cmi 
 matitaMisc.cmo: matitaGuiTypes.cmi buildTimeConf.cmo matitaMisc.cmi 
 matitaMisc.cmx: matitaGuiTypes.cmi buildTimeConf.cmx matitaMisc.cmi 
 matita.cmo: predefined_virtuals.cmi matitaScript.cmi matitaInit.cmi \
-    matitaGui.cmi matitaGtkMisc.cmi buildTimeConf.cmo 
+    matitaGui.cmi matitaGtkMisc.cmi buildTimeConf.cmo applyTransformation.cmi 
 matita.cmx: predefined_virtuals.cmx matitaScript.cmx matitaInit.cmx \
-    matitaGui.cmx matitaGtkMisc.cmx buildTimeConf.cmx 
+    matitaGui.cmx matitaGtkMisc.cmx buildTimeConf.cmx applyTransformation.cmx 
 matitaScript.cmo: virtuals.cmi matitaTypes.cmi matitaMisc.cmi \
     matitaMathView.cmi matitaGtkMisc.cmi matitaEngine.cmi cicMathView.cmi \
     buildTimeConf.cmo matitaScript.cmi 
@@ -60,12 +62,11 @@ applyTransformation.cmi:
 cicMathView.cmi: matitaGuiTypes.cmi applyTransformation.cmi 
 lablGraphviz.cmi: 
 matitaclean.cmi: 
-matitaEngine.cmi: 
+matitaEngine.cmi: applyTransformation.cmi 
 matitaExcPp.cmi: 
 matitaGtkMisc.cmi: matitaGeneratedGui.cmo 
 matitaGui.cmi: matitaGuiTypes.cmi 
-matitaGuiTypes.cmi: matitaTypes.cmi matitaGeneratedGui.cmo \
-    applyTransformation.cmi 
+matitaGuiTypes.cmi: matitaGeneratedGui.cmo applyTransformation.cmi 
 matitaInit.cmi: 
 matitaMathView.cmi: matitaTypes.cmi matitaGuiTypes.cmi 
 matitaMisc.cmi: matitaGuiTypes.cmi 

diff --git a/matita/matita/matitaEngine.ml b/matita/matita/matitaEngine.ml
index 5d16763fc36ad6db0b685937e47e53fdc11e2c5b..01f070e2be3a0d5237e297f60147173be28025f8 100644 (file)
--- a/matita/matita/matitaEngine.ml
+++ b/matita/matita/matitaEngine.ml
@@ -71,15 +71,17 @@ let cut prefix s =
   String.sub s lenp (lens-lenp)
 ;;
 
-let print_string =
+let print_string = 
  let indent = ref 0 in
  let print_string ~right_justify s =
   let ss =
    match right_justify with
       None -> ""
     | Some (ss,len_ss) ->
+       assert (80 - !indent - len_ss - String.length s >= 0);
        String.make (80 - !indent - len_ss - String.length s) ' ' ^ ss
   in
+   assert (!indent >=0);
    print_string (String.make !indent ' ' ^ s ^ ss) in
  fun enter ?right_justify s ->
   if enter then (print_string ~right_justify s; incr indent) else (decr indent; print_string ~right_justify s)