From 7761bd5341f81e4b7d335c0b47bc1e2271f02227 Mon Sep 17 00:00:00 2001 From: Wilmer Ricciotti Date: Fri, 21 Jan 2011 13:30:33 +0000 Subject: [PATCH] Removed inclusion of logic/equality.ma in datatypes/list.ma (not needed and source of conflicts in other scripts). --- .../matita/nlibrary/datatypes/list.ma | 1 - helm/software/matita/nlibrary/depends | 18 +++++------ helm/software/matita/nlibrary/depends.dot | 32 +++++++++---------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/helm/software/matita/nlibrary/datatypes/list.ma b/helm/software/matita/nlibrary/datatypes/list.ma index 87f917185..836b72ea5 100644 --- a/helm/software/matita/nlibrary/datatypes/list.ma +++ b/helm/software/matita/nlibrary/datatypes/list.ma @@ -13,7 +13,6 @@ (**************************************************************************) include "logic/pts.ma". -include "logic/equality.ma". include "arithmetics/nat.ma". ninductive list (A:Type[0]) : Type[0] ≝ diff --git a/helm/software/matita/nlibrary/depends b/helm/software/matita/nlibrary/depends index 96eca527f..f89d5b780 100644 --- a/helm/software/matita/nlibrary/depends +++ b/helm/software/matita/nlibrary/depends @@ -1,6 +1,5 @@ -.unnamed.ma datatypes/list.ma sets/setoids.ma -PTS/subst.ma basics/list2.ma topology/igft3.ma arithmetics/nat.ma datatypes/bool.ma topology/igft.ma +PTS/subst.ma basics/list2.ma basics/functions.ma Plogic/connectives.ma Plogic/equality.ma nat/compare.ma datatypes/bool.ma nat/order.ma arithmetics/compare.ma arithmetics/nat.ma @@ -11,8 +10,8 @@ basics/relations.ma Plogic/connectives.ma Plogic/equality.ma logic/pts.ma Plogic/connectives.ma Plogic/equality.ma sets/categories.ma sets/sets.ma -datatypes/pairs.ma logic/pts.ma algebra/magmas.ma sets/sets.ma +datatypes/pairs.ma logic/pts.ma Plogic/russell_support.ma Plogic/connectives.ma Plogic/jmeq.ma datatypes/sums.ma logic/connectives.ma topology/cantor.ma nat/nat.ma topology/igft.ma logic/cprop.ma hints_declaration.ma sets/setoids1.ma @@ -23,28 +22,27 @@ sets/sets.ma logic/connectives.ma logic/cprop.ma properties/relations1.ma sets/s PTS/gpts.ma PTS/subst.ma re/re-setoids.ma datatypes/bool-setoids.ma datatypes/list-setoids.ma datatypes/pairs-setoids.ma hints_declaration.ma sets/sets.ma topology/igft2.ma arithmetics/nat.ma topology/igft.ma -arithmetics/Z.ma arithmetics/nat.ma +arithmetics/Z.ma arithmetics/compare.ma arithmetics/nat.ma datatypes/bool.ma logic/pts.ma +algebra/bool.ma logic/connectives.ma logic/connectives.ma logic/pts.ma properties/relations2.ma logic/pts.ma -algebra/bool.ma logic/connectives.ma sets/categories2.ma sets/categories.ma sets/setoids2.ma sets/sets.ma basics/list2.ma arithmetics/nat.ma basics/list.ma arithmetics/nat.ma basics/bool.ma basics/eq.ma basics/functions.ma hints_declaration.ma sets/setoids1.ma hints_declaration.ma properties/relations1.ma sets/setoids.ma nat/minus.ma nat/order.ma logic/cologic.ma Plogic/connectives.ma Plogic/equality.ma datatypes/bool.ma logic/equality.ma logic/pts.ma -SET171^3.ma TPTP.ma -datatypes/list.ma logic/pts.ma +datatypes/list.ma arithmetics/nat.ma logic/pts.ma Plogic/jmeq.ma Plogic/equality.ma -sets/partitions.ma datatypes/pairs.ma nat/compare.ma nat/minus.ma nat/plus.ma sets/sets.ma topology/igft-setoid.ma sets/sets.ma +sets/partitions.ma datatypes/pairs.ma nat/compare.ma nat/minus.ma nat/plus.ma sets/sets.ma sets/setoids.ma hints_declaration.ma logic/connectives.ma properties/relations.ma properties/relations.ma logic/pts.ma nat/big_ops.ma algebra/magmas.ma nat/order.ma arithmetics/R.ma arithmetics/nat.ma datatypes/pairs.ma datatypes/sums.ma topology/igft.ma -arithmetics/minimization.ma arithmetics/nat.ma algebra/unital_magmas.ma algebra/magmas.ma +arithmetics/minimization.ma arithmetics/nat.ma properties/relations1.ma logic/pts.ma basics/bool.ma basics/eq.ma basics/functions.ma datatypes/bool-setoids.ma datatypes/bool.ma sets/setoids.ma @@ -55,8 +53,8 @@ basics/eq.ma basics/relations.ma datatypes/sums.ma datatypes/pairs.ma hints_declaration.ma logic/pts.ma logic/destruct_bb.ma logic/equality.ma -topology/igft.ma logic/equality.ma sets/sets.ma algebra/abelian_magmas.ma algebra/magmas.ma +topology/igft.ma logic/equality.ma sets/sets.ma overlap/o-algebra.ma sets/categories2.ma re/re.ma arithmetics/nat.ma datatypes/list.ma datatypes/pairs.ma hints_declaration.ma basics/list.ma basics/bool.ma basics/eq.ma diff --git a/helm/software/matita/nlibrary/depends.dot b/helm/software/matita/nlibrary/depends.dot index 0c9dfbc0f..823a76ed7 100644 --- a/helm/software/matita/nlibrary/depends.dot +++ b/helm/software/matita/nlibrary/depends.dot @@ -1,13 +1,10 @@ digraph g { - ".unnamed.ma" []; - ".unnamed.ma" -> "datatypes/list.ma" []; - ".unnamed.ma" -> "sets/setoids.ma" []; - "PTS/subst.ma" []; - "PTS/subst.ma" -> "basics/list2.ma" []; "topology/igft3.ma" []; "topology/igft3.ma" -> "arithmetics/nat.ma" []; "topology/igft3.ma" -> "datatypes/bool.ma" []; "topology/igft3.ma" -> "topology/igft.ma" []; + "PTS/subst.ma" []; + "PTS/subst.ma" -> "basics/list2.ma" []; "basics/functions.ma" []; "basics/functions.ma" -> "Plogic/connectives.ma" []; "basics/functions.ma" -> "Plogic/equality.ma" []; @@ -32,10 +29,10 @@ digraph g { "Plogic/connectives.ma" -> "Plogic/equality.ma" []; "sets/categories.ma" []; "sets/categories.ma" -> "sets/sets.ma" []; - "datatypes/pairs.ma" []; - "datatypes/pairs.ma" -> "logic/pts.ma" []; "algebra/magmas.ma" []; "algebra/magmas.ma" -> "sets/sets.ma" []; + "datatypes/pairs.ma" []; + "datatypes/pairs.ma" -> "logic/pts.ma" []; "Plogic/russell_support.ma" []; "Plogic/russell_support.ma" -> "Plogic/connectives.ma" []; "Plogic/russell_support.ma" -> "Plogic/jmeq.ma" []; @@ -73,15 +70,16 @@ digraph g { "topology/igft2.ma" -> "arithmetics/nat.ma" []; "topology/igft2.ma" -> "topology/igft.ma" []; "arithmetics/Z.ma" []; + "arithmetics/Z.ma" -> "arithmetics/compare.ma" []; "arithmetics/Z.ma" -> "arithmetics/nat.ma" []; "datatypes/bool.ma" []; "datatypes/bool.ma" -> "logic/pts.ma" []; + "algebra/bool.ma" []; + "algebra/bool.ma" -> "logic/connectives.ma" []; "logic/connectives.ma" []; "logic/connectives.ma" -> "logic/pts.ma" []; "properties/relations2.ma" []; "properties/relations2.ma" -> "logic/pts.ma" []; - "algebra/bool.ma" []; - "algebra/bool.ma" -> "logic/connectives.ma" []; "sets/categories2.ma" []; "sets/categories2.ma" -> "sets/categories.ma" []; "sets/categories2.ma" -> "sets/setoids2.ma" []; @@ -106,20 +104,20 @@ digraph g { "logic/cologic.ma" -> "datatypes/bool.ma" []; "logic/cologic.ma" -> "logic/equality.ma" []; "logic/cologic.ma" -> "logic/pts.ma" []; - "SET171^3.ma" []; - "SET171^3.ma" -> "TPTP.ma" []; "datatypes/list.ma" []; + "datatypes/list.ma" -> "arithmetics/nat.ma" []; + "datatypes/list.ma" -> "logic/equality.ma" []; "datatypes/list.ma" -> "logic/pts.ma" []; "Plogic/jmeq.ma" []; "Plogic/jmeq.ma" -> "Plogic/equality.ma" []; + "topology/igft-setoid.ma" []; + "topology/igft-setoid.ma" -> "sets/sets.ma" []; "sets/partitions.ma" []; "sets/partitions.ma" -> "datatypes/pairs.ma" []; "sets/partitions.ma" -> "nat/compare.ma" []; "sets/partitions.ma" -> "nat/minus.ma" []; "sets/partitions.ma" -> "nat/plus.ma" []; "sets/partitions.ma" -> "sets/sets.ma" []; - "topology/igft-setoid.ma" []; - "topology/igft-setoid.ma" -> "sets/sets.ma" []; "sets/setoids.ma" []; "sets/setoids.ma" -> "hints_declaration.ma" []; "sets/setoids.ma" -> "logic/connectives.ma" []; @@ -134,10 +132,10 @@ digraph g { "arithmetics/R.ma" -> "datatypes/pairs.ma" []; "arithmetics/R.ma" -> "datatypes/sums.ma" []; "arithmetics/R.ma" -> "topology/igft.ma" []; - "arithmetics/minimization.ma" []; - "arithmetics/minimization.ma" -> "arithmetics/nat.ma" []; "algebra/unital_magmas.ma" []; "algebra/unital_magmas.ma" -> "algebra/magmas.ma" []; + "arithmetics/minimization.ma" []; + "arithmetics/minimization.ma" -> "arithmetics/nat.ma" []; "properties/relations1.ma" []; "properties/relations1.ma" -> "logic/pts.ma" []; "basics/bool.ma" []; @@ -164,11 +162,11 @@ digraph g { "hints_declaration.ma" -> "logic/pts.ma" []; "logic/destruct_bb.ma" []; "logic/destruct_bb.ma" -> "logic/equality.ma" []; + "algebra/abelian_magmas.ma" []; + "algebra/abelian_magmas.ma" -> "algebra/magmas.ma" []; "topology/igft.ma" []; "topology/igft.ma" -> "logic/equality.ma" []; "topology/igft.ma" -> "sets/sets.ma" []; - "algebra/abelian_magmas.ma" []; - "algebra/abelian_magmas.ma" -> "algebra/magmas.ma" []; "overlap/o-algebra.ma" []; "overlap/o-algebra.ma" -> "sets/categories2.ma" []; "re/re.ma" []; -- 2.39.2