X-Git-Url: http://nitlanguage.org

diff --git a/lib/c.nit b/lib/c.nit
index d94ae8e..a9b04e1 100644
--- a/lib/c.nit
+++ b/lib/c.nit
@@ -14,10 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Utilities and performant structure for the FFI with C
+# Structures and services for compatibility with the C language
 module c
-import standard
-intrude import standard::collection::array
+
+import core
+intrude import core::collection::array
 
 # A thin wrapper around a `NativeCArray` adding length information
 abstract class CArray[E]
@@ -70,10 +71,10 @@ extern class NativeCArray `{ void * `}
 	type E: nullable Object
 
 	# Get element at `index`.
-	fun [](index: E): E is abstract
+	fun [](index: Int): E is abstract
 
 	# Set `val` at `index`.
-	fun []=(index: E, val: E) is abstract
+	fun []=(index: Int, val: E) is abstract
 
 	# Return pointer to the address to the second element of this array
 	#
@@ -92,8 +93,8 @@ class CIntArray
 		super size
 	end
 
-	# Build from an `Array[Int]`
-	new from(array: Array[Int])
+	# Create from an `SequenceRead[Int]`
+	new from(array: SequenceRead[Int])
 	do
 		var carray = new CIntArray(array.length)
 		for i in array.length.times do
@@ -111,15 +112,15 @@ extern class NativeCIntArray `{ int* `}
 	# Initialize a new NativeCIntArray of `size` elements.
 	new(size: Int) `{ return calloc(size, sizeof(int)); `}
 
-	redef fun [](index) `{ return recv[index]; `}
-	redef fun []=(index, val) `{ recv[index] = val; `}
+	redef fun [](index) `{ return self[index]; `}
+	redef fun []=(index, val) `{ self[index] = val; `}
 
-	redef fun +(offset) `{ return recv + offset; `}
+	redef fun +(offset) `{ return self + offset; `}
 end
 
 # Wrapper around an array of `unsigned char` in C (`unsigned char*`) with length and destroy state
 class CByteArray
-	super CArray[Int]
+	super CArray[Byte]
 	redef type NATIVE: NativeCByteArray
 
 	# Allocate a new array of `size`
@@ -128,8 +129,8 @@ class CByteArray
 		super size
 	end
 
-	# Build from an `Array[Int]`
-	new from(array: Array[Int])
+	# Create from a `SequenceRead[Byte]`
+	new from(array: SequenceRead[Byte])
 	do
 		var carray = new CByteArray(array.length)
 		for i in array.length.times do
@@ -142,20 +143,57 @@ end
 # An array of `unsigned char` in C (`unsigned char*`)
 extern class NativeCByteArray `{ unsigned char* `}
 	super NativeCArray
-	redef type E: Int
+	redef type E: Byte
 
 	# Allocate a new array of `size`
 	new(size: Int) `{ return calloc(size, sizeof(unsigned char)); `}
 
-	redef fun [](index) `{ return recv[index]; `}
-	redef fun []=(index, val) `{ recv[index] = val; `}
+	redef fun [](index) `{ return self[index]; `}
+	redef fun []=(index, val) `{ self[index] = val; `}
+
+	redef fun +(offset) `{ return self + offset; `}
+end
+
+# Wrapper around an array of `NativeString` in C (`char**`) with length and destroy state.
+class CNativeStringArray
+	super CArray[NativeString]
+
+	redef type NATIVE: NativeCStringArray
+
+	# Initialize a new NativeCStringArray of `size` elements.
+	init(size: Int) is old_style_init do
+		native_array = new NativeCStringArray(size)
+		super size
+	end
+
+	# Create from an `SequenceRead[NativeString]`
+	new from(array: SequenceRead[NativeString])
+	do
+		var carray = new CNativeStringArray(array.length)
+		for i in array.length.times do
+			carray[i] = array[i]
+		end
+		return carray
+	end
+end
+
+# An array of `NativeString` in C (`char**`)
+extern class NativeCStringArray `{ char** `}
+	super NativeCArray
+
+	redef type E: NativeString
+
+	# Initialize a new NativeCStringArray of `size` elements.
+	new(size: Int) `{ return calloc(size, sizeof(char*)); `}
 
-	redef fun +(offset) `{ return recv + offset; `}
+	redef fun [](index) `{ return self[index]; `}
+	redef fun []=(index, val) `{ self[index] = val; `}
+	redef fun +(offset) `{ return self + offset; `}
 end
 
 redef class NativeString
 	super NativeCArray
 	redef type E: Char
 
-	redef fun +(offset) `{ return recv + offset; `}
+	redef fun +(offset) `{ return self + offset; `}
 end