1) Matitaweb now disambiguates scripts as it runs them

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

diff --git a/matitaB/matita/matitadaemon.ml b/matitaB/matita/matitadaemon.ml
index d98a21e9b1e59a56536818617d66409f74cb7d96..9e6b11c6f2b6189b07af5dfb007363f342214645 100644 (file)
--- a/matitaB/matita/matitadaemon.ml
+++ b/matitaB/matita/matitadaemon.ml
@@ -51,6 +51,17 @@ let eval_statement include_paths (* (buffer : GText.buffer) *) status (* script
   (status, parsed_text, unparsed_txt'),"",(*parsed_text_len*)
     utf8_length parsed_text
 
+(*let save_moo status = 
+  let script = MatitaScript.current () in
+  let baseuri = status#baseuri in
+  match script#bos, script#eos with
+  | true, _ -> ()
+  | _, true ->
+     GrafiteTypes.Serializer.serialize ~baseuri:(NUri.uri_of_string baseuri)
+      status
+  | _ -> clean_current_baseuri status 
+;;*)
+    
 let sequent_size = ref 40;;
 
 let include_paths = ref [];;
@@ -127,6 +138,23 @@ let output_status s =
   String.concat "\n\n" txt
 ;; *)
 
+let html_of_matita s =
+  prerr_endline ("input: " ^ s);
+  let patt1 = Str.regexp "\005" in
+  let patt2 = Str.regexp "\006" in
+  let patt3 = Str.regexp "<" in
+  let patt4 = Str.regexp ">" in
+  let res = Str.global_replace patt4 "&gt;" s in
+  prerr_endline ("output: " ^ res);
+  let res = Str.global_replace patt3 "&lt;" res in
+  prerr_endline ("output: " ^ res);
+  let res = Str.global_replace patt2 ">" res in
+  prerr_endline ("output: " ^ res);
+  let res = Str.global_replace patt1 "<" res in
+  prerr_endline ("output: " ^ res);
+  res
+;;
+
 let heading_nl_RE = Pcre.regexp "^\\s*\n\\s*";;
 
 let first_line s =
@@ -177,8 +205,10 @@ let retrieve (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
     let filename = libdir uid ^ "/" ^ (cgi # argument_value "file") in
     prerr_endline ("reading file " ^ filename);
     let body = 
-      Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false () 
-        (read_file filename) in
+     (* Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false ()
+        (html_of_matita (read_file filename)) in
+     *)
+        html_of_matita (read_file filename) in
     prerr_endline ("sending:\nBEGIN\n" ^ body ^ "\nEND");
     let body = "<file>" ^ body ^ "</file>" in
     let baseuri, incpaths = 
@@ -212,14 +242,24 @@ let retrieve (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
 let advance0 sid text =
   let status = MatitaAuthentication.get_status sid in
   let history = MatitaAuthentication.get_history sid in
+  let status = status#reset_disambiguate_db () in
   let (st,new_statements,new_unparsed),(* newtext TODO *) _,parsed_len =
-       (* try *)
+       try
          eval_statement !include_paths (*buffer*) status (`Raw text)
-       (* with End_of_file -> raise Margin *)
+        with 
+        | HExtlib.Localized (_,e) -> raise e
+        (*| End_of_file -> raise Margin *)
      in
+  let stringbuf = Ulexing.from_utf8_string new_statements in
+  let interpr = GrafiteDisambiguate.get_interpr st#disambiguate_db in
+  let outstr = ref "" in
+  ignore (SmallLexer.mk_small_printer interpr outstr stringbuf);
+  prerr_endline ("parser output: " ^ !outstr);
   MatitaAuthentication.set_status sid st;
   MatitaAuthentication.set_history sid (st::history);
-  parsed_len, new_unparsed, st
+  parsed_len, 
+    Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false 
+      () (html_of_matita !outstr), new_unparsed, st
 
 let register (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
   let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
@@ -321,10 +361,11 @@ let advance (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
       ();
     let text = cgi#argument_value "body" in
     prerr_endline ("body =\n" ^ text);
-    let parsed_len, new_unparsed, new_status = advance0 sid text in
+    let parsed_len, new_parsed, new_unparsed, new_status = advance0 sid text in
     let txt = output_status new_status in
     let body = 
-       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
+       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\">" ^
+       new_parsed ^ "</parsed>" ^ txt 
        ^ "</response>"
     in 
     prerr_endline ("sending advance response:\n" ^ body);
@@ -346,13 +387,18 @@ let gotoBottom (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
     let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
     let sid = HExtlib.unopt sid in
 
-    let rec aux parsed_len text =
+    let rec aux parsed_len parsed_txt text =
       try
         prerr_endline ("evaluating: " ^ first_line text);
-        let plen,new_unparsed,_new_status = advance0 sid text in
-        aux (parsed_len+plen) new_unparsed
+        let plen,new_parsed,new_unparsed,_new_status = advance0 sid text in
+        aux (parsed_len+plen) (parsed_txt ^ new_parsed) new_unparsed
       with 
-      | _ -> parsed_len
+      | End_of_file -> 
+          let status = MatitaAuthentication.get_status sid in
+          GrafiteTypes.Serializer.serialize 
+            ~baseuri:(NUri.uri_of_string status#baseuri) status;
+          parsed_len, parsed_txt
+      | _ -> parsed_len, parsed_txt
     in 
     cgi # set_header 
       ~cache:`No_cache 
@@ -360,13 +406,18 @@ let gotoBottom (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
       ();
     let text = cgi#argument_value "body" in
     prerr_endline ("body =\n" ^ text);
-    let parsed_len = aux 0 text in
+    let parsed_len, new_parsed = aux 0 "" text in
     let status = MatitaAuthentication.get_status sid in
     let txt = output_status status in
     let body = 
-       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
+       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\">" ^
+       new_parsed ^ "</parsed>" ^ txt 
        ^ "</response>"
     in 
+    (*let body = 
+       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
+       ^ "</response>"
+    in*) 
     prerr_endline ("sending goto bottom response:\n" ^ body);
     cgi#out_channel#output_string body
    with Not_found -> cgi#set_header ~status:`Internal_server_error