Code extraction branched.

diff --git a/matita/components/ng_kernel/.depend b/matita/components/ng_kernel/.depend
index 16f0d02cce32e0673a5ebae845e6a94b88f9d1a2..5273e5eb8180d0992bc8e4ae8f614920acfa8d48 100644 (file)
--- a/matita/components/ng_kernel/.depend
+++ b/matita/components/ng_kernel/.depend
@@ -7,6 +7,7 @@ nCicReduction.cmi: nCic.cmo
 nCicTypeChecker.cmi: nUri.cmi nReference.cmi nCic.cmo
 nCicUntrusted.cmi: nCic.cmo
 nCicPp.cmi: nReference.cmi nCic.cmo
+nCicExtraction.cmi: nCic.cmo
 nCic.cmo: nUri.cmi nReference.cmi
 nCic.cmx: nUri.cmx nReference.cmx
 nUri.cmo: nUri.cmi
@@ -39,3 +40,9 @@ nCicPp.cmo: nUri.cmi nReference.cmi nCicSubstitution.cmi nCicReduction.cmi \
     nCicEnvironment.cmi nCic.cmo nCicPp.cmi
 nCicPp.cmx: nUri.cmx nReference.cmx nCicSubstitution.cmx nCicReduction.cmx \
     nCicEnvironment.cmx nCic.cmx nCicPp.cmi
+nCicExtraction.cmo: nUri.cmi nReference.cmi nCicUntrusted.cmi \
+    nCicTypeChecker.cmi nCicSubstitution.cmi nCicReduction.cmi nCicPp.cmi \
+    nCicEnvironment.cmi nCic.cmo nCicExtraction.cmi
+nCicExtraction.cmx: nUri.cmx nReference.cmx nCicUntrusted.cmx \
+    nCicTypeChecker.cmx nCicSubstitution.cmx nCicReduction.cmx nCicPp.cmx \
+    nCicEnvironment.cmx nCic.cmx nCicExtraction.cmi

diff --git a/matita/components/ng_kernel/.depend.opt b/matita/components/ng_kernel/.depend.opt
index c57bf8efed34aac283e8464783f90cac2e1ed6c6..af21515ba5cd84ac4d790fe1e74571ed4446e077 100644 (file)
--- a/matita/components/ng_kernel/.depend.opt
+++ b/matita/components/ng_kernel/.depend.opt
@@ -7,6 +7,7 @@ nCicReduction.cmi: nCic.cmx
 nCicTypeChecker.cmi: nUri.cmi nReference.cmi nCic.cmx
 nCicUntrusted.cmi: nCic.cmx
 nCicPp.cmi: nReference.cmi nCic.cmx
+nCicExtraction.cmi: nCic.cmx
 nCic.cmo: nUri.cmi nReference.cmi
 nCic.cmx: nUri.cmx nReference.cmx
 nUri.cmo: nUri.cmi
@@ -39,3 +40,9 @@ nCicPp.cmo: nUri.cmi nReference.cmi nCicSubstitution.cmi nCicReduction.cmi \
     nCicEnvironment.cmi nCic.cmx nCicPp.cmi
 nCicPp.cmx: nUri.cmx nReference.cmx nCicSubstitution.cmx nCicReduction.cmx \
     nCicEnvironment.cmx nCic.cmx nCicPp.cmi
+nCicExtraction.cmo: nUri.cmi nReference.cmi nCicUntrusted.cmi \
+    nCicTypeChecker.cmi nCicReduction.cmi nCicPp.cmi nCicEnvironment.cmi \
+    nCic.cmx nCicExtraction.cmi
+nCicExtraction.cmx: nUri.cmx nReference.cmx nCicUntrusted.cmx \
+    nCicTypeChecker.cmx nCicReduction.cmx nCicPp.cmx nCicEnvironment.cmx \
+    nCic.cmx nCicExtraction.cmi

diff --git a/matita/components/ng_kernel/Makefile b/matita/components/ng_kernel/Makefile
index 35b89f3b1005c2fab30426d57fd3e6cd3f38afd2..6bca07465a642293d38abc6ae5bbf4d89ff599c6 100644 (file)
--- a/matita/components/ng_kernel/Makefile
+++ b/matita/components/ng_kernel/Makefile
@@ -10,7 +10,8 @@ INTERFACE_FILES = \
        nCicReduction.mli \
        nCicTypeChecker.mli \
        nCicUntrusted.mli \
-       nCicPp.mli
+       nCicPp.mli \
+       nCicExtraction.mli
 
 IMPLEMENTATION_FILES = \
   nCic.ml $(INTERFACE_FILES:%.mli=%.ml)

diff --git a/matita/components/ng_kernel/nCicEnvironment.mli b/matita/components/ng_kernel/nCicEnvironment.mli
index 80fcd2b68e4f993c3e49adfe2fe6c7c115df7399..a557ef563b0b922b6bb6424adf8d26382b61992a 100644 (file)
--- a/matita/components/ng_kernel/nCicEnvironment.mli
+++ b/matita/components/ng_kernel/nCicEnvironment.mli
@@ -24,6 +24,10 @@ val check_and_add_obj: #NCic.status -> NCic.obj -> unit
 
 val get_relevance: #NCic.status -> NReference.reference -> bool list
 
+val get_checked_decl:
+  #NCic.status -> NReference.reference -> 
+    NCic.relevance * string * NCic.term * NCic.c_attr * int
+
 val get_checked_def:
   #NCic.status -> NReference.reference -> 
     NCic.relevance * string * NCic.term * NCic.term * NCic.c_attr * int

diff --git a/matita/components/ng_kernel/nCicExtraction.mli b/matita/components/ng_kernel/nCicExtraction.mli
index b11f38654519d43148e1763eae759f237c181cce..e1a06852704b879455384459b58e9f1f8c220dc4 100644 (file)
--- a/matita/components/ng_kernel/nCicExtraction.mli
+++ b/matita/components/ng_kernel/nCicExtraction.mli
@@ -28,4 +28,4 @@ class virtual status :
 
 
 (* Haskell *)
-val haskell_of_obj: (#status as 'status) -> NCic.obj -> 'status * string option
+val haskell_of_obj: (#status as 'status) -> NCic.obj -> 'status * string

diff --git a/matita/components/ng_library/nCicLibrary.ml b/matita/components/ng_library/nCicLibrary.ml
index 729d62d0ee8696eef3c0b6fbe035d0d8929d53d2..b509ce813fd8997c713426ffba6301311328573d 100644 (file)
--- a/matita/components/ng_library/nCicLibrary.ml
+++ b/matita/components/ng_library/nCicLibrary.ml
@@ -146,10 +146,11 @@ let init = load_db;;
 
 class virtual status =
  object
-  inherit NCic.status
+  inherit NCicExtraction.status
   val timestamp = (time0 : timestamp)
   method timestamp = timestamp
   method set_timestamp v = {< timestamp = v >}
+  (*CSC: bug here, we are not copying the NCicExtraction part of the status *)
  end
 
 let time_travel0 (sto,ali) =
@@ -324,10 +325,10 @@ let aliases_of uri =
      if NUri.eq uri' uri then Some nref else None) !local_aliases
 ;;
 
-let add_obj status ((u,_,_,_,_) as obj) =
- NCicEnvironment.check_and_add_obj status obj;
- storage := (`Obj (u,obj))::!storage;
-  let _,height,_,_,obj = obj in
+let add_obj status ((u,_,_,_,_) as orig_obj) =
+ NCicEnvironment.check_and_add_obj status orig_obj;
+ storage := (`Obj (u,orig_obj))::!storage;
+  let _,height,_,_,obj = orig_obj in
   let references =
    match obj with
       NCic.Constant (_,name,None,_,_) ->
@@ -356,7 +357,14 @@ let add_obj status ((u,_,_,_,_) as obj) =
          ) il)
   in
   local_aliases := references @ !local_aliases;
-  status#set_timestamp (!storage,!local_aliases)
+  let status = status#set_timestamp (!storage,!local_aliases) in
+  (* To test extraction *)
+  try
+   ignore (Helm_registry.get "extract_haskell");
+   let status,msg = NCicExtraction.haskell_of_obj status orig_obj in
+    prerr_endline msg; status
+  with
+   Helm_registry.Key_not_found _ -> status
 ;;
 
 let add_constraint status u1 u2 = 

diff --git a/matita/components/ng_library/nCicLibrary.mli b/matita/components/ng_library/nCicLibrary.mli
index 3d9ab02cb2e4e0abae15abcb2538a40f8c8a2cac..3781a47e2dfa757c095d1c5cdca1ede6b5138b89 100644 (file)
--- a/matita/components/ng_library/nCicLibrary.mli
+++ b/matita/components/ng_library/nCicLibrary.mli
@@ -18,9 +18,10 @@ type timestamp
 
 class virtual status :
  object ('self)
-  inherit NCic.status
+  inherit NCicExtraction.status
   method timestamp: timestamp
   method set_timestamp: timestamp -> 'self
+  (*CSC: bug here, we are not copying the NCicExtraction part of the status *)
  end
 
 (* it also checks it and add it to the environment *)