[Pkg-ocaml-maint-commits] [matita] 02/02: Patch to fix type checker inference of polymorphic variants

[Enrico Tassi]

This is an automated email from the git hooks/post-receive script.

gareuselesinge pushed a commit to branch master
in repository matita.

commit dc9ac0b5c2c83ed753c92d11336a90259b29bffd
Author: Enrico Tassi <gareuselesinge at debian.org>
Date:   Tue Dec 10 20:27:38 2013 +0100

    Patch to fix type checker inference of polymorphic variants
---
 debian/changelog                                   |  1 +
 ...p-type-checker-for-nCicUntrusted.set_kind.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a2abc1c..586270c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ matita (0.99.1-3) unstable; urgency=medium
 
   * Fix FTBFS w.r.t. lablgtk2 2.16 by updating findlinb name for gtksourceview
     (Closes: #731702) 
+  * New patch to help the type checker in nCicUntrusted.set_kind
 
  -- Enrico Tassi <gareuselesinge at debian.org>  Tue, 10 Dec 2013 20:15:50 +0100
 
diff --git a/debian/patches/0002-Help-type-checker-for-nCicUntrusted.set_kind.patch b/debian/patches/0002-Help-type-checker-for-nCicUntrusted.set_kind.patch
new file mode 100644
index 0000000..dc3679a
--- /dev/null
+++ b/debian/patches/0002-Help-type-checker-for-nCicUntrusted.set_kind.patch
@@ -0,0 +1,23 @@
+From: Enrico Tassi <gareuselesinge at debian.org>
+Date: Tue, 10 Dec 2013 20:26:15 +0100
+Subject: Help type checker for nCicUntrusted.set_kind
+
+---
+ components/ng_kernel/nCicUntrusted.ml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/components/ng_kernel/nCicUntrusted.ml b/components/ng_kernel/nCicUntrusted.ml
+index df716eb..88c8ef9 100644
+--- a/components/ng_kernel/nCicUntrusted.ml
++++ b/components/ng_kernel/nCicUntrusted.ml
+@@ -273,8 +273,8 @@ let rec replace_in_subst i f = function
+   | x::tl -> x :: replace_in_subst i f tl
+ ;;
+           
+-let set_kind newkind attrs = 
+-  newkind :: List.filter (fun x -> not (is_kind x)) attrs 
++let set_kind (newkind : meta_kind) (attrs : NCic.meta_attrs) = 
++  (newkind :> NCic.meta_attr) :: List.filter (fun x -> not (is_kind x)) attrs 
+ ;;
+ 
+ let max_kind k1 k2 = 
diff --git a/debian/patches/series b/debian/patches/series
index ffa3813..365cdc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-configure.patch
+0002-Help-type-checker-for-nCicUntrusted.set_kind.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/matita.git