lib: Fixed imports throughout standard library

Signed-off-by: Lucas Bajolet <r4pass@hotmail.com>

diff --git a/lib/standard/bytes.nit b/lib/standard/bytes.nit
index b9b39fd..c02ff00 100644 (file)
--- a/lib/standard/bytes.nit
+++ b/lib/standard/bytes.nit
@@ -17,7 +17,7 @@ module bytes
 
 import kernel
 import collection::array
-intrude import string
+intrude import text::flat
 
 # A buffer containing Byte-manipulation facilities
 #

diff --git a/lib/standard/environ.nit b/lib/standard/environ.nit
index 0abe7f3..4b2d632 100644 (file)
--- a/lib/standard/environ.nit
+++ b/lib/standard/environ.nit
@@ -14,7 +14,7 @@
 # Access to the environment variables of the process
 module environ
 
-import string
+import text
 import file
 
 # TODO prevoir une structure pour recup tout un environ, le modifier et le passer a process

diff --git a/lib/standard/error.nit b/lib/standard/error.nit
index f40444d..b1e96e2 100644 (file)
--- a/lib/standard/error.nit
+++ b/lib/standard/error.nit
@@ -12,7 +12,7 @@
 #
 module error
 
-import string
+import text
 
 # Standard class for error messages
 class Error

diff --git a/lib/standard/file.nit b/lib/standard/file.nit
index 46c52ec..01c2d82 100644 (file)
--- a/lib/standard/file.nit
+++ b/lib/standard/file.nit
@@ -16,8 +16,8 @@
 module file
 
 intrude import stream
-intrude import ropes
-import string_search
+intrude import text::ropes
+import text
 import time
 import gc
 

diff --git a/lib/standard/numeric.nit b/lib/standard/numeric.nit
index 3452155..1d2e30c 100644 (file)
--- a/lib/standard/numeric.nit
+++ b/lib/standard/numeric.nit
@@ -18,7 +18,7 @@
 module numeric
 
 import math
-import string
+import text
 
 redef class Text
        # Get the numeric version of `self`

diff --git a/lib/standard/posix.nit b/lib/standard/posix.nit
index 7f4b24b..b7122e6 100644 (file)
--- a/lib/standard/posix.nit
+++ b/lib/standard/posix.nit
@@ -17,7 +17,7 @@
 # Services conforming to POSIX
 module posix
 
-import string
+import text
 
 in "C Header" `{
 #include <sys/types.h>

diff --git a/lib/standard/re.nit b/lib/standard/re.nit
index 24637cb..1f488ad 100644 (file)
--- a/lib/standard/re.nit
+++ b/lib/standard/re.nit
@@ -21,7 +21,7 @@
 # The main entities are `Text::to_re` and `Regex`.
 module re
 
-import string_search
+import text
 import gc
 import error
 

diff --git a/lib/standard/standard.nit b/lib/standard/standard.nit
index a4ec83a..e675600 100644 (file)
--- a/lib/standard/standard.nit
+++ b/lib/standard/standard.nit
@@ -18,13 +18,12 @@ module standard
 import posix
 import environ 
 import time
-import string_search
 import file
 import exec
 import stream
 import collection
 import math
-import ropes
+import text
 import kernel
 import gc
 import bitset

diff --git a/lib/standard/stream.nit b/lib/standard/stream.nit
index b901596..ad31a7d 100644 (file)
--- a/lib/standard/stream.nit
+++ b/lib/standard/stream.nit
@@ -11,7 +11,7 @@
 # Input and output streams of characters
 module stream
 
-intrude import ropes
+intrude import text::ropes
 import error
 intrude import bytes
 

diff --git a/lib/standard/time.nit b/lib/standard/time.nit
index 99a9f35..2a31fb2 100644 (file)
--- a/lib/standard/time.nit
+++ b/lib/standard/time.nit
@@ -14,7 +14,7 @@
 # Management of time and dates
 module time
 
-import string_search
+import text
 import stream
 
 in "C Header" `{

diff --git a/src/interpreter/primitive_types.nit b/src/interpreter/primitive_types.nit
index 122fe4e..8f12c78 100644 (file)
--- a/src/interpreter/primitive_types.nit
+++ b/src/interpreter/primitive_types.nit
@@ -15,7 +15,7 @@
 module primitive_types
 
 intrude import standard::file
-intrude import standard::string
+intrude import standard::text::flat
 
 # Wrapper for `NativeFile`
 class PrimitiveNativeFile