lib/c&java: remove all custom SELF types

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/lib/c.nit b/lib/c.nit
index fdc7e99..6c843f3 100644 (file)
--- a/lib/c.nit
+++ b/lib/c.nit
@@ -29,7 +29,6 @@ end
 # A native C array, as in a pointer to the first element of the array
 extern class NativeCArray `{ void * `}
        type E: nullable Object
-       type SELF: NativeCArray
 
        fun [](index: E): E is abstract
        fun []=(index: E, val: E) is abstract
@@ -79,7 +78,6 @@ end
 extern class NativeCIntArray `{ int* `}
        super NativeCArray
        redef type E: Int
-       redef type SELF: NativeCIntArray
 
        new(size: Int) `{ return calloc(size, sizeof(int)); `}
        redef fun [](index) `{ return recv[index]; `}
@@ -91,7 +89,6 @@ end
 redef class NativeString
        super NativeCArray
        redef type E: Char
-       redef type SELF: NativeString
 
        redef fun +(offset) `{ return recv + offset; `}
 end

diff --git a/lib/java/io.nit b/lib/java/io.nit
index 04245a5..4ab4eab 100644 (file)
--- a/lib/java/io.nit
+++ b/lib/java/io.nit
@@ -32,7 +32,6 @@ in "Java" `{
 
 extern class NativeFile in "Java" `{ java.io.File `}
        super JavaObject
-       redef type SELF: NativeFile
 
        fun can_execute: Bool in "Java" `{ return recv.canExecute(); `}
        fun can_read: Bool in "Java" `{ return recv.canRead(); `}
@@ -77,7 +76,6 @@ end
 
 extern class NativeFileInputStream in "Java" `{ java.io.FileInputStream `}
        super JavaObject
-       redef type SELF: NativeFileInputStream
 
        fun available: Int in "Java" `{
                try {
@@ -114,7 +112,6 @@ end
 
 extern class NativeFileOutputStream in "Java" `{ java.io.FileOutputStream `}
        super JavaObject
-       redef type SELF: NativeFileOutputStream
 
        fun close in "Java" `{
                try {
@@ -141,7 +138,7 @@ end
 
 extern class NativeFileDescriptor in "Java" `{ java.io.FileDescriptor `}
        super JavaObject
-       redef type SELF: NativeFileDescriptor
+
        fun sync in "Java" `{
                try{
                        recv.sync();
@@ -154,7 +151,6 @@ end
 
 extern class NativeInputStream in "Java" `{ java.io.InputStream `}
        super JavaObject
-       redef type SELF: NativeInputStream
 
        fun available: Int in "Java" `{
                try {

diff --git a/lib/java/java.nit b/lib/java/java.nit
index 389c6f6..56a375f 100644 (file)
--- a/lib/java/java.nit
+++ b/lib/java/java.nit
@@ -98,8 +98,6 @@ end
 extern class JavaString in "Java" `{ java.lang.String `}
        super JavaObject
 
-       redef type SELF: JavaString
-
        # Get the string from Java and copy it to Nit memory
        fun to_cstring: NativeString import sys, Sys.jni_env `{
                Sys sys = JavaString_sys(recv);
@@ -140,7 +138,6 @@ redef class Text
 end
 
 redef extern class JavaObject
-       type SELF: JavaObject
 
        # Returns a global reference to the Java object behind this reference
        #

diff --git a/tests/sav/test_c_alt1.res b/tests/sav/test_c_alt1.res
index aa38be4..9533b69 100644 (file)
--- a/tests/sav/test_c_alt1.res
+++ b/tests/sav/test_c_alt1.res
@@ -1 +1 @@
-Runtime error: Assert failed (../lib/c.nit:64)
+Runtime error: Assert failed (../lib/c.nit:63)

diff --git a/tests/sav/test_c_alt2.res b/tests/sav/test_c_alt2.res
index 95d7a74..17a3dc5 100644 (file)
--- a/tests/sav/test_c_alt2.res
+++ b/tests/sav/test_c_alt2.res
@@ -1,2 +1,2 @@
-Runtime error: Assert failed (../lib/c.nit:57)
+Runtime error: Assert failed (../lib/c.nit:56)
 0

diff --git a/tests/sav/test_c_alt3.res b/tests/sav/test_c_alt3.res
index 95d7a74..17a3dc5 100644 (file)
--- a/tests/sav/test_c_alt3.res
+++ b/tests/sav/test_c_alt3.res
@@ -1,2 +1,2 @@
-Runtime error: Assert failed (../lib/c.nit:57)
+Runtime error: Assert failed (../lib/c.nit:56)
 0

diff --git a/tests/sav/test_c_alt4.res b/tests/sav/test_c_alt4.res
index 3bb984c..fdc9a45 100644 (file)
--- a/tests/sav/test_c_alt4.res
+++ b/tests/sav/test_c_alt4.res
@@ -1,4 +1,4 @@
-Runtime error: Assert failed (../lib/c.nit:56)
+Runtime error: Assert failed (../lib/c.nit:55)
 0
 0
 1