Signed-off-by: Lucas Bajolet <r4pass@hotmail.com>
end
# Stores a flat version of self in cache
end
# Stores a flat version of self in cache
- private fun flatten: String
+ private fun flatten: FlatString
do
var native_final_str = calloc_string(length + 1)
do
var native_final_str = calloc_string(length + 1)
var iter = new DFSRopeLeafIterator(self)
while iter.is_ok do
var iter = new DFSRopeLeafIterator(self)
while iter.is_ok do
- iter.item.value.items.copy_to(native_final_str, iter.item.value.length, 0, offset)
+ iter.item.value.as(FlatString).items.copy_to(native_final_str, iter.item.value.length, 0, offset)
offset += iter.item.value.length
iter.next
end
offset += iter.item.value.length
iter.next
end
+abstract class String
+ super Text
+
+ redef type SELFTYPE: String
+
+ redef fun to_s do return self
+
+end
+
# Immutable strings of characters.
# Immutable strings of characters.
- redef type SELFTYPE: String
+ redef type SELFTYPE: FlatString
redef type SELFVIEW: FlatStringCharView
# Index in _items of the start of the string
redef type SELFVIEW: FlatStringCharView
# Index in _items of the start of the string
var realFrom = index_from + from
var realFrom = index_from + from
- if (realFrom + count) > index_to then return new String.with_infos(items, index_to - realFrom + 1, realFrom, index_to)
+ if (realFrom + count) > index_to then return new FlatString.with_infos(items, index_to - realFrom + 1, realFrom, index_to)
- if count == 0 then return ""
+ if count == 0 then return empty
var to = realFrom + count - 1
var to = realFrom + count - 1
- return new String.with_infos(items, to - realFrom + 1, realFrom, to)
+ return new FlatString.with_infos(items, to - realFrom + 1, realFrom, to)
- redef fun empty do return "".as(String)
+ redef fun empty do return "".as(FlatString)
- if not other isa String then return super
+ if not other isa FlatString then return super
if self.object_id == other.object_id then return true
if self.object_id == other.object_id then return true
# assert ("aa" < "b") == true
redef fun <(other)
do
# assert ("aa" < "b") == true
redef fun <(other)
do
- if not other isa String then return super
+ if not other isa FlatString then return super
if self.object_id == other.object_id then return false
if self.object_id == other.object_id then return false
var target_string = calloc_string(my_length + its_length + 1)
self.items.copy_to(target_string, my_length, index_from, 0)
var target_string = calloc_string(my_length + its_length + 1)
self.items.copy_to(target_string, my_length, index_from, 0)
+ if s isa FlatString then
s.items.copy_to(target_string, its_length, s.index_from, my_length)
else if s isa FlatBuffer then
s.items.copy_to(target_string, its_length, 0, my_length)
s.items.copy_to(target_string, its_length, s.index_from, my_length)
else if s isa FlatBuffer then
s.items.copy_to(target_string, its_length, 0, my_length)
return target_string.to_s_with_length(final_length)
end
return target_string.to_s_with_length(final_length)
end
- redef fun to_s do return self
-
redef fun hash
do
# djb2 hash algorythm
redef fun hash
do
# djb2 hash algorythm
private class FlatStringReverseIterator
super IndexedIterator[Char]
private class FlatStringReverseIterator
super IndexedIterator[Char]
var target_items: NativeString
var curr_pos: Int
var target_items: NativeString
var curr_pos: Int
- init with_pos(tgt: String, pos: Int)
+ init with_pos(tgt: FlatString, pos: Int)
do
target = tgt
target_items = tgt.items
do
target = tgt
target_items = tgt.items
private class FlatStringIterator
super IndexedIterator[Char]
private class FlatStringIterator
super IndexedIterator[Char]
var target_items: NativeString
var curr_pos: Int
var target_items: NativeString
var curr_pos: Int
- init with_pos(tgt: String, pos: Int)
+ init with_pos(tgt: FlatString, pos: Int)
do
target = tgt
target_items = tgt.items
do
target = tgt
target_items = tgt.items
private class FlatStringCharView
super StringCharView
private class FlatStringCharView
super StringCharView
- redef type SELFTYPE: String
+ redef type SELFTYPE: FlatString
do
var sl = s.length
if capacity < length + sl then enlarge(length + sl)
do
var sl = s.length
if capacity < length + sl then enlarge(length + sl)
+ if s isa FlatString then
s.items.copy_to(items, sl, s.index_from, length)
else if s isa FlatBuffer then
s.items.copy_to(items, sl, 0, length)
s.items.copy_to(items, sl, s.index_from, length)
else if s isa FlatBuffer then
s.items.copy_to(items, sl, 0, length)
return to_s_with_length(cstring_length)
end
return to_s_with_length(cstring_length)
end
- fun to_s_with_length(length: Int): String
+ fun to_s_with_length(length: Int): FlatString
- return new String.with_infos(self, length, 0, length - 1)
+ return new FlatString.with_infos(self, length, 0, length - 1)
- fun to_s_with_copy: String
+ fun to_s_with_copy: FlatString
do
var length = cstring_length
var new_self = calloc_string(length + 1)
copy_to(new_self, length, 0, 0)
do
var length = cstring_length
var new_self = calloc_string(length + 1)
copy_to(new_self, length, 0, 0)
- return new String.with_infos(new_self, length, 0, length - 1)
+ return new FlatString.with_infos(new_self, length, 0, length - 1)
assert 1.0.object_id.to_s.is_numeric
# Check NativeString.object_id
assert 1.0.object_id.to_s.is_numeric
# Check NativeString.object_id
-assert "Test".items.object_id.to_s.is_numeric
+assert "Test".as(FlatString).items.object_id.to_s.is_numeric
referenced_str = null
end
referenced_str = null
end
- fun get_c_string import String.items, NativeString.to_s, NativeString.to_s_with_copy, StringTest.ref_test, StringTest.copy_test `{
+ fun get_c_string import FlatString.items, NativeString.to_s, NativeString.to_s_with_copy, StringTest.ref_test, StringTest.copy_test `{
char* string = "This is a test string";
char* string = "This is a test string";
- String ref_string = NativeString_to_s(string);
+ FlatString ref_string = NativeString_to_s(string);
StringTest_ref_test(recv, ref_string);
StringTest_ref_test(recv, ref_string);
- String copy_string = NativeString_to_s_with_copy(string);
+ FlatString copy_string = NativeString_to_s_with_copy(string);
StringTest_copy_test(recv, copy_string);
StringTest_copy_test(recv, copy_string);
- int same_refs = String_items(copy_string) == String_items(ref_string);
+ int same_refs = FlatString_items(copy_string) == FlatString_items(ref_string);
printf("Do the strings have the same NativeString reference ? ");
printf("Do the strings have the same NativeString reference ? ");