Stupid bug of mine fixed: sometimes (Some ~-1) was used in place of None.

[helm.git] / helm / matita / matita.ml

diff --git a/helm/matita/matita.ml b/helm/matita/matita.ml
index 0a83b737ebe54e7ee4dd7db23c9bd1eb824bd0e1..016d69336313f372ed419b3a720b09580f54cc7d 100644 (file)
--- a/helm/matita/matita.ml
+++ b/helm/matita/matita.ml
@@ -23,6 +23,8 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 open Printf
 
 open MatitaGtkMisc
@@ -41,7 +43,6 @@ let script =
   let s = 
     MatitaScript.script 
       ~source_view:gui#sourceView
-      ~init:(Lazy.force MatitaEngine.initial_status) 
       ~mathviewer:(MatitaMathView.mathViewer ())
       ~urichooser:(fun uris ->
         try
@@ -74,16 +75,21 @@ let _ =
   cic_math_view#set_href_callback
     (Some (fun uri -> (MatitaMathView.cicBrowser ())#load
       (`Uri (UriManager.uri_of_string uri))));
-  let browser_observer _ = MatitaMathView.refresh_all_browsers () in
-  let sequents_observer status =
+  let browser_observer _ _ = MatitaMathView.refresh_all_browsers () in
+  let sequents_observer _ grafite_status =
     sequents_viewer#reset;
-    match status.proof_status with
+    match grafite_status.proof_status with
     | Incomplete_proof ({ stack = stack } as incomplete_proof) ->
         sequents_viewer#load_sequents incomplete_proof;
         (try
-          script#setGoal (Continuationals.Stack.find_goal stack);
-          sequents_viewer#goto_sequent script#goal
-        with Failure _ -> script#setGoal ~-1);
+          script#setGoal (Some (Continuationals.Stack.find_goal stack));
+          let goal =
+           match script#goal with
+              None -> assert false
+            | Some n -> n
+          in
+           sequents_viewer#goto_sequent goal
+        with Failure _ -> script#setGoal None);
     | Proof proof -> sequents_viewer#load_logo_with_qed
     | No_proof -> sequents_viewer#load_logo
     | Intermediate _ -> assert false (* only the engine may be in this state *)
@@ -118,9 +124,9 @@ let _ =
       List.iter (fun (u,_,_) -> 
         prerr_endline (UriManager.string_of_uri u)) 
         (CicEnvironment.list_obj ()));
-    addDebugItem "print selections" (fun () ->
+(*     addDebugItem "print selections" (fun () ->
       let cicMathView = MatitaMathView.cicMathView_instance () in
-      List.iter HLog.debug (cicMathView#string_of_selections));
+      List.iter HLog.debug (cicMathView#string_of_selections)); *)
     addDebugItem "dump script status" script#dump;
     addDebugItem "dump configuration file to ./foo.conf.xml" (fun _ ->
       Helm_registry.save_to "./foo.conf.xml");
@@ -138,19 +144,20 @@ let _ =
     addDebugItem "print top-level grammar entries"
       CicNotationParser.print_l2_pattern;
     addDebugItem "dump moo to stderr" (fun _ ->
-      let status = (MatitaScript.current ())#status in
-      let moo, metadata = status.moo_content_rev in
-      List.iter (fun cmd -> prerr_endline
-        (GrafiteAstPp.pp_cic_command cmd)) (List.rev moo);
-      List.iter (fun m -> prerr_endline
-        (GrafiteAstPp.pp_metadata m)) metadata);
+      let grafite_status = (MatitaScript.current ())#grafite_status in
+      let moo = grafite_status.moo_content_rev in
+      List.iter
+        (fun cmd ->
+          prerr_endline (GrafiteAstPp.pp_command ~obj_pp:(fun _ -> assert false)
+            cmd))
+        (List.rev moo));
     addDebugItem "print metasenv goals and stack to stderr"
       (fun _ ->
         prerr_endline ("metasenv goals: " ^ String.concat " "
           (List.map (fun (g, _, _) -> string_of_int g)
             (MatitaScript.current ())#proofMetasenv));
         prerr_endline ("stack: " ^ Continuationals.Stack.pp
-          (GrafiteTypes.get_stack (MatitaScript.current ())#status)));
+          (GrafiteTypes.get_stack (MatitaScript.current ())#grafite_status)));
 (*     addDebugItem "ask record choice"
       (fun _ ->
         HLog.debug (string_of_int
@@ -180,7 +187,8 @@ let _ =
 
 let set_matita_mode () =
   let matita_mode =
-    if Filename.basename Sys.argv.(0) = "cicbrowser"
+    if Filename.basename Sys.argv.(0) = "cicbrowser" || 
+       Filename.basename Sys.argv.(0) = "cicbrowser.opt"
     then "cicbrowser"
     else "matita"
   in