From 227dc02173e4739d2989c2456886278616087488 Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Mon, 3 Aug 2009 14:09:34 -0400
Subject: [PATCH] lib: new /lib/standard/collection directory

* Update tests.sh to add the new -I for some base_* tests

Signed-off-by: Jean Privat <jean@pryen.org>
---
 .../{ => collection}/abstract_collection.nit       |    0
 lib/standard/{ => collection}/array.nit            |    0
 lib/standard/collection/collection.nit             |   20 ++++++++++++++++++++
 lib/standard/{ => collection}/list.nit             |    0
 lib/standard/{ => collection}/range.nit            |    0
 lib/standard/{ => collection}/sorter.nit           |    0
 lib/standard/standard.nit                          |    6 +-----
 lib/standard/string.nit                            |    2 +-
 tests/sav/nitdoc_args1.sav                         |    3 +++
 tests/tests.sh                                     |    2 +-
 10 files changed, 26 insertions(+), 7 deletions(-)
 rename lib/standard/{ => collection}/abstract_collection.nit (100%)
 rename lib/standard/{ => collection}/array.nit (100%)
 create mode 100644 lib/standard/collection/collection.nit
 rename lib/standard/{ => collection}/list.nit (100%)
 rename lib/standard/{ => collection}/range.nit (100%)
 rename lib/standard/{ => collection}/sorter.nit (100%)

diff --git a/lib/standard/abstract_collection.nit b/lib/standard/collection/abstract_collection.nit
similarity index 100%
rename from lib/standard/abstract_collection.nit
rename to lib/standard/collection/abstract_collection.nit
diff --git a/lib/standard/array.nit b/lib/standard/collection/array.nit
similarity index 100%
rename from lib/standard/array.nit
rename to lib/standard/collection/array.nit
diff --git a/lib/standard/collection/collection.nit b/lib/standard/collection/collection.nit
new file mode 100644
index 0000000..ea08285
--- /dev/null
+++ b/lib/standard/collection/collection.nit
@@ -0,0 +1,20 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Copyright 2009 Jean Privat <jean@pryen.org>
+#
+# This file is free software, which comes along with NIT.  This software is
+# distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without  even  the implied warranty of  MERCHANTABILITY or  FITNESS FOR A
+# PARTICULAR PURPOSE.  You can modify it is you want,  provided this header
+# is kept unaltered, and a notification of the changes is added.
+# You  are  allowed  to  redistribute it and sell it, alone or is a part of
+# another product.
+
+# This module define several collection classes.
+package collection
+
+import abstract_collection
+import range
+import list
+intrude import array # FIXME because of string.nit
+import sorter
diff --git a/lib/standard/list.nit b/lib/standard/collection/list.nit
similarity index 100%
rename from lib/standard/list.nit
rename to lib/standard/collection/list.nit
diff --git a/lib/standard/range.nit b/lib/standard/collection/range.nit
similarity index 100%
rename from lib/standard/range.nit
rename to lib/standard/collection/range.nit
diff --git a/lib/standard/sorter.nit b/lib/standard/collection/sorter.nit
similarity index 100%
rename from lib/standard/sorter.nit
rename to lib/standard/collection/sorter.nit
diff --git a/lib/standard/standard.nit b/lib/standard/standard.nit
index 224aebe..2c5f73a 100644
--- a/lib/standard/standard.nit
+++ b/lib/standard/standard.nit
@@ -17,16 +17,12 @@ package standard
 import environ 
 import time
 import string_search
-import sorter
 import file
 import exec
 import stream
 import hash
-import list
 import symbol
 import string
-import array
-import range
-import abstract_collection
+import collection
 import math
 import kernel
diff --git a/lib/standard/string.nit b/lib/standard/string.nit
index 46f8422..1c7e953 100644
--- a/lib/standard/string.nit
+++ b/lib/standard/string.nit
@@ -14,7 +14,7 @@
 # This module is about character strings.
 package string
 
-intrude import array
+intrude import collection # FIXME should be collection::array
 
 ###############################################################################
 # String                                                                      #
diff --git a/tests/sav/nitdoc_args1.sav b/tests/sav/nitdoc_args1.sav
index 8fdb627..4c03552 100644
--- a/tests/sav/nitdoc_args1.sav
+++ b/tests/sav/nitdoc_args1.sav
@@ -2,6 +2,9 @@ abstract_collection.html
 abstract_collection__.html
 array.html
 array__.html
+collection.html
+collection_.html
+collection__.html
 dummy_array.html
 dummy_array__.html
 environ.html
diff --git a/tests/tests.sh b/tests/tests.sh
index 19b278c..4a0d6a3 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -135,7 +135,7 @@ for ii in "$@"; do
 
 	tmp=${ii/../AA}
 	if [ "x$tmp" = "x$ii" ]; then
-		oincludes="-I . -I ../lib/standard"
+		oincludes="-I . -I ../lib/standard -I ../lib/standard/collection"
 	else
 		oincludes=""
 	fi
-- 
1.7.9.5