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

diff --git a/src/nitni/nitni_base.nit b/src/nitni/nitni_base.nit
index 7cf6bbc..a43e1d7 100644
--- a/src/nitni/nitni_base.nit
+++ b/src/nitni/nitni_base.nit
@@ -71,17 +71,18 @@ redef class MType
 
 	# Representation of this type in C for the internal of the system
 	# Hides extern types.
-	fun cname_blind: String is abstract
+	fun cname_blind: String do return "struct nitni_instance *"
 
 	# Representation of this type in mangled C
 	#   Object -> Object
 	#   Pointer -> Pointer
 	fun mangled_cname: String is abstract
 
-	# Does this types has a primitive reprensentation
+	# Does this type have a primitive representation?
+	#
 	#   type Object is_primitive? false
 	#   type Pointer is_primitive? true
-	fun is_cprimitive: Bool is abstract
+	fun is_cprimitive: Bool do return false
 end
 
 redef class MClassType
@@ -89,10 +90,15 @@ redef class MClassType
 	do
 		var name = mclass.name
 		if name == "Bool" then return "int"
-		if name == "Char" then return "char"
+		if name == "Char" then return "uint32_t"
 		if name == "Float" then return "double"
 		if name == "Int" then return "long"
 		if name == "Byte" then return "unsigned char"
+		if name == "Int8" then return "int8_t"
+		if name == "Int16" then return "int16_t"
+		if name == "UInt16" then return "uint16_t"
+		if name == "Int32" then return "int32_t"
+		if name == "UInt32" then return "uint32_t"
 		if name == "NativeString" then return "char*"
 		if mclass.kind == extern_kind then
 			var ctype = mclass.ctype
@@ -105,13 +111,18 @@ redef class MClassType
 	redef fun cname_blind do
 		var name = mclass.name
 		if name == "Bool" then return "int"
-		if name == "Char" then return "char"
+		if name == "Char" then return "uint32_t"
 		if name == "Float" then return "double"
 		if name == "Int" then return "long"
 		if name == "Byte" then return "unsigned char"
+		if name == "Int8" then return "int8_t"
+		if name == "Int16" then return "int16_t"
+		if name == "UInt16" then return "uint16_t"
+		if name == "Int32" then return "int32_t"
+		if name == "UInt32" then return "uint32_t"
 		if name == "NativeString" then return "char*"
 		if mclass.kind == extern_kind then return "void*"
-		return "struct nitni_instance *"
+		return super
 	end
 
 	# Name of this type in C for normal classes (not extern and not primitive)
@@ -120,18 +131,17 @@ redef class MClassType
 	redef fun mangled_cname do return mclass.name
 
 	redef fun is_cprimitive do return mclass.kind == extern_kind or
-			(once ["Bool", "Char", "Float", "Int", "NativeString"]).has(mclass.name)
+			(once ["Bool", "Char", "Float", "Int", "NativeString",
+			       "Byte", "Int8", "Int16", "UInt16", "Int32", "UInt32"]).has(mclass.name)
 end
 
 redef class MNullableType
 	redef fun cname do return mangled_cname
-	redef fun cname_blind do return "struct nitni_instance *"
 	redef fun mangled_cname do return "nullable_{mtype.mangled_cname}"
-	redef fun is_cprimitive do return false
 end
 
 redef class MVirtualType
-	redef fun mangled_cname: String do return to_s
+	redef fun mangled_cname do return to_s
 end
 
 redef class MGenericType