X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2FmatitaEngine.ml;h=f65c8432a4000f3dc9f28031eb0d5a03bc2c4174;hb=b7779155a6bb8868e0d33e1211a92d5f39e0c3a8;hp=6c8a033e46f733dceb377f277902713930fc6855;hpb=5f55d666e5f640de8f1b91f14d77346af5d5488c;p=helm.git

diff --git a/matita/matita/matitaEngine.ml b/matita/matita/matitaEngine.ml
index 6c8a033e4..f65c8432a 100644
--- a/matita/matita/matitaEngine.ml
+++ b/matita/matita/matitaEngine.ml
@@ -29,8 +29,14 @@ module G = GrafiteAst
 open GrafiteTypes
 open Printf
 
+class status baseuri =
+ object
+  inherit GrafiteTypes.status baseuri
+  inherit ApplyTransformation.status
+ end
+
 exception TryingToAdd of string Lazy.t
-exception EnrichedWithStatus of exn * GrafiteTypes.status
+exception EnrichedWithStatus of exn * status
 exception AlreadyLoaded of string Lazy.t
 exception FailureCompiling of string * exn
 exception CircularDependency of string
@@ -40,8 +46,8 @@ let debug_print = if debug then prerr_endline else ignore ;;
 
 let slash_n_RE = Pcre.regexp "\\n" ;;
 
-let pp_ast_statement grafite_status stm =
-  let stm = GrafiteAstPp.pp_statement stm
+let pp_ast_statement status stm =
+  let stm = GrafiteAstPp.pp_statement status stm
     ~map_unicode_to_tex:(Helm_registry.get_bool "matita.paste_unicode_as_tex")
   in
   let stm = Pcre.replace ~rex:slash_n_RE stm in
@@ -153,27 +159,30 @@ let baseuri_of_script ~include_paths fname =
     raise (Failure ("File not found: "^fname))
 ;;
 
-let rec get_ast status ~compiling ~include_paths strm = 
+let rec get_ast status ~compiling ~asserted ~include_paths strm = 
   match GrafiteParser.parse_statement status strm with
      (GrafiteAst.Executable
        (_,GrafiteAst.NCommand (_,GrafiteAst.Include (_,_,mafilename)))) as cmd
      ->
-       let already_included = NCicLibrary.get_already_included status in
-       ignore(assert_ng ~already_included ~compiling ~include_paths mafilename);
-       cmd
-   | cmd -> cmd
+       let already_included = NCicLibrary.get_transitively_included status in
+       let asserted,_ =
+        assert_ng ~already_included ~compiling ~asserted ~include_paths
+         mafilename
+       in
+        asserted,cmd
+   | cmd -> asserted,cmd
 
-and eval_from_stream ~compiling ~include_paths ?do_heavy_checks status str cb =
+and eval_from_stream ~compiling ~asserted ~include_paths ?do_heavy_checks status str cb =
  let matita_debug = Helm_registry.get_bool "matita.debug" in
- let rec loop status =
-  let stop,status = 
+ let rec loop asserted status str =
+  let asserted,stop,status,str = 
    try
      let cont =
-       try Some (get_ast status ~compiling ~include_paths str)
+       try Some (get_ast status ~compiling ~asserted ~include_paths str)
        with End_of_file -> None in
      match cont with
-     | None -> true, status
-     | Some ast ->
+     | None -> asserted, true, status, str
+     | Some (asserted,ast) ->
         cb status ast;
         let new_statuses =
           eval_ast ~include_paths ?do_heavy_checks status ("",0,ast) in
@@ -182,17 +191,27 @@ and eval_from_stream ~compiling ~include_paths ?do_heavy_checks status str cb =
             [s,None] -> s
           | _::(_,Some (_,value))::_ ->
                 raise (TryingToAdd (lazy (GrafiteAstPp.pp_alias value)))
-          | _ -> assert false
+          | _ -> assert false in
+        (* CSC: complex patch to re-build the lexer since the tokens may
+           have changed. Note: this way we loose look-ahead tokens.
+           Hence the "include" command must be terminated (no look-ahead) *)
+        let str =
+         match ast with
+            (GrafiteAst.Executable
+              (_,GrafiteAst.NCommand (_,GrafiteAst.Include (_,_,_)))) ->
+              GrafiteParser.parsable_statement status
+               (GrafiteParser.strm_of_parsable str)
+          | _ -> str
         in
-         false, status
+         asserted, false, status, str
    with exn when not matita_debug ->
      raise (EnrichedWithStatus (exn, status))
   in
-  if stop then status else loop status
+  if stop then asserted,status else loop asserted status str
  in
-  loop status
+  loop asserted status str
 
-and compile ~compiling ~include_paths fname =
+and compile ~compiling ~asserted ~include_paths fname =
   if List.mem fname compiling then raise (CircularDependency fname);
   let compiling = fname::compiling in
   let matita_debug = Helm_registry.get_bool "matita.debug" in
@@ -201,7 +220,7 @@ and compile ~compiling ~include_paths fname =
   if Http_getter_storage.is_read_only baseuri then assert false;
   activate_extraction baseuri fname ;
   (* MATITA 1.0: debbo fare time_travel sulla ng_library? *)
-  let grafite_status = new GrafiteTypes.status baseuri in
+  let status = new status baseuri in
   let big_bang = Unix.gettimeofday () in
   let { Unix.tms_utime = big_bang_u ; Unix.tms_stime = big_bang_s} = 
     Unix.times () 
@@ -235,19 +254,19 @@ and compile ~compiling ~include_paths fname =
           (Http_getter.filename ~local:true ~writable:true (baseuri ^
           "foo.con")));
     let buf =
-     GrafiteParser.parsable_statement grafite_status
+     GrafiteParser.parsable_statement status
       (Ulexing.from_utf8_channel (open_in fname))
     in
     let print_cb =
       if not (Helm_registry.get_bool "matita.verbose") then (fun _ _ -> ())
       else pp_ast_statement
     in
-    let grafite_status =
-     eval_from_stream ~compiling ~include_paths grafite_status buf print_cb in
+    let asserted, status =
+     eval_from_stream ~compiling ~asserted ~include_paths status buf print_cb in
     let elapsed = Unix.time () -. time in
      (if Helm_registry.get_bool "matita.moo" then begin
        GrafiteTypes.Serializer.serialize ~baseuri:(NUri.uri_of_string baseuri)
-        grafite_status
+        status
      end;
      let tm = Unix.gmtime elapsed in
      let sec = string_of_int tm.Unix.tm_sec ^ "''" in
@@ -259,7 +278,8 @@ and compile ~compiling ~include_paths fname =
      in
      HLog.message 
        (sprintf "execution of %s completed in %s." fname (hou^min^sec));
-     pp_times fname true big_bang big_bang_u big_bang_s
+     pp_times fname true big_bang big_bang_u big_bang_s;
+     asserted
 (* MATITA 1.0: debbo fare time_travel sulla ng_library?
      LexiconSync.time_travel 
        ~present:lexicon_status ~past:initial_lexicon_status;
@@ -273,46 +293,58 @@ and compile ~compiling ~include_paths fname =
       pp_times fname false big_bang big_bang_u big_bang_s;
       clean_exit baseuri exn
 
-and assert_ng ~already_included ~compiling ~include_paths mapath =
+and assert_ng ~already_included ~compiling ~asserted ~include_paths mapath =
  let _,baseuri,fullmapath,_ = Librarian.baseuri_of_script ~include_paths mapath in
- let baseuri = NUri.uri_of_string baseuri in
- let ngtime_of baseuri =
-  let ngpath = NCicLibrary.ng_path_of_baseuri baseuri in
-  try
-   Some (Unix.stat ngpath).Unix.st_mtime
-  with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = ngpath -> None in
- let matime =
-  try (Unix.stat fullmapath).Unix.st_mtime
-  with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = fullmapath -> assert false
- in
- let ngtime = ngtime_of baseuri in
- let to_be_compiled =
-  match ngtime with
-     Some ngtime ->
-      let preamble = GrafiteTypes.Serializer.dependencies_of baseuri in
-      let children_bad =
-       List.exists
-        (fun mapath ->
-             assert_ng ~already_included ~compiling ~include_paths mapath
-          || let _,baseuri,_,_ =
-               Librarian.baseuri_of_script ~include_paths mapath in
-             let baseuri = NUri.uri_of_string baseuri in
-              (match ngtime_of baseuri with
-                  Some child_ngtime -> child_ngtime > ngtime
-                | None -> assert false)
-        ) preamble
-      in
-       children_bad || matime > ngtime
-   | None -> true
- in
-  if not to_be_compiled then false
-  else
-   if List.mem baseuri already_included then
-     (* maybe recompiling it I would get the same... *)
-     raise (AlreadyLoaded (lazy mapath))
-   else
-    (compile ~compiling ~include_paths fullmapath; true)
+ if List.mem fullmapath asserted then asserted,false
+ else
+  begin
+   let baseuri = NUri.uri_of_string baseuri in
+   let ngtime_of baseuri =
+    let ngpath = NCicLibrary.ng_path_of_baseuri baseuri in
+    try
+     Some (Unix.stat ngpath).Unix.st_mtime
+    with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = ngpath -> None in
+   let matime =
+    try (Unix.stat fullmapath).Unix.st_mtime
+    with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = fullmapath -> assert false
+   in
+   let ngtime = ngtime_of baseuri in
+   let asserted,to_be_compiled =
+    match ngtime with
+       Some ngtime ->
+        let preamble = GrafiteTypes.Serializer.dependencies_of baseuri in
+        let asserted,children_bad =
+         List.fold_left
+          (fun (asserted,b) mapath ->
+            let asserted,b1 =
+              assert_ng ~already_included ~compiling ~asserted ~include_paths
+               mapath
+            in
+             asserted, b || b1
+              || let _,baseuri,_,_ =
+                   Librarian.baseuri_of_script ~include_paths mapath in
+                 let baseuri = NUri.uri_of_string baseuri in
+                  (match ngtime_of baseuri with
+                      Some child_ngtime -> child_ngtime > ngtime
+                    | None -> assert false)
+          ) (asserted,false) preamble
+        in
+         asserted, children_bad || matime > ngtime
+     | None -> asserted,true
+   in
+    if not to_be_compiled then fullmapath::asserted,false
+    else
+     if List.mem baseuri already_included then
+       (* maybe recompiling it I would get the same... *)
+       raise (AlreadyLoaded (lazy mapath))
+     else
+      let asserted = compile ~compiling ~asserted ~include_paths fullmapath in
+       fullmapath::asserted,true
+  end
 ;;
 
-let assert_ng = assert_ng ~already_included:[] ~compiling:[]
-let get_ast = get_ast ~compiling:[]
+let assert_ng ~include_paths mapath =
+ snd (assert_ng ~include_paths ~already_included:[] ~compiling:[] ~asserted:[]
+  mapath)
+let get_ast status ~include_paths strm =
+ snd (get_ast status ~compiling:[] ~asserted:[] ~include_paths strm)