lib/core: remove uses of Byte for Text

[nit.git] / lib / core / kernel.nit

diff --git a/lib/core/kernel.nit b/lib/core/kernel.nit
index a821006..1160e72 100644 (file)
--- a/lib/core/kernel.nit
+++ b/lib/core/kernel.nit
@@ -651,11 +651,6 @@ universal Byte
        #     assert 5u8 >> 1    == 2u8
        fun >>(i: Int): Byte is intern `{ return self >> i; `}
 
-       # Returns the character equivalent of `self`
-       #
-       # REQUIRE: `self <= 127u8`
-       fun ascii: Char is intern `{ return (uint32_t)self; `}
-
        redef fun to_i is intern
        redef fun to_f is intern
        redef fun to_b do return self
@@ -812,6 +807,11 @@ universal Int
        #     assert 0x220B.code_point == '∋'
        fun code_point: Char is intern `{ return (uint32_t)self; `}
 
+       # Returns the character equivalent of `self`
+       #
+       # REQUIRE: `self <= 127`
+       fun ascii: Char do return code_point
+
        # Number of digits of an integer in base `b` (plus one if negative)
        #
        #     assert 123.digit_count(10) == 3
@@ -882,6 +882,9 @@ universal Int
        #     assert 10.abs    == 10
        #     assert 0.abs     == 0
        fun abs: Int do return if self >= 0 then self else -self
+
+       # Is `self` an ASCII whitespace ?
+       fun is_whitespace: Bool do return self == 0x7F or self <= 0x20
 end
 
 # Native characters.
@@ -918,6 +921,24 @@ universal Char
        redef fun successor(i) is intern
        redef fun predecessor(i) is intern
 
+       # The `i`-th char after self (in code point)
+       #
+       # ~~~
+       # assert 'A' + 5 == 'F'
+       # ~~~
+       #
+       # Alias of `successor`.
+       fun +(i: Int): Char do return successor(i)
+
+       # The `i`-th char before self (in code point)
+       #
+       # ~~~
+       # assert 'F' - 5 == 'A'
+       # ~~~
+       #
+       # Alias of `predecessor`.
+       fun -(i: Int): Char do return predecessor(i)
+
        redef fun distance(c)
        do
                var d = self.code_point - c.code_point
@@ -945,11 +966,11 @@ universal Char
 
        # The ascii value of `self`
        #
-       #     assert 'a'.ascii    == 97u8
-       #     assert '\n'.ascii   == 10u8
+       #     assert 'a'.ascii    == 97
+       #     assert '\n'.ascii   == 10
        #
        # REQUIRE: `is_ascii`
-       fun ascii: Byte do return code_point.to_b
+       fun ascii: Int do return code_point
 
        # The unicode code point value of `self`
        #
@@ -1045,17 +1066,21 @@ universal Char
        #
        #     assert 'A'.is_whitespace  == false
        #     assert ','.is_whitespace  == false
-       #     assert ' '.is_whitespace  == true
+       #     assert ' '.is_whitespace  == true # space
+       #     assert ' '.is_whitespace  == true # non-breaking space
        #     assert '\t'.is_whitespace == true
        fun is_whitespace: Bool
        do
                var i = code_point
-               return i <= 0x20 or i == 0x7F
+               return i <= 0x20 or i == 0x7F or i == 0xA0
        end
 end
 
 # Pointer classes are used to manipulate extern C structures.
 extern class Pointer
+       # C `NULL` pointer
+       new nul `{ return NULL; `}
+
        # Is the address behind this Object at NULL?
        fun address_is_null: Bool `{ return self == NULL; `}