Updated code regarding to string 32 vs string 8.
This commit is contained in:
@@ -52,14 +52,14 @@ feature -- Status report
|
||||
|
||||
feature -- Query
|
||||
|
||||
string_representation: STRING_32
|
||||
string_representation: READABLE_STRING_32
|
||||
-- String representation of Current
|
||||
-- if possible
|
||||
do
|
||||
if attached value as v then
|
||||
Result := v.generating_type.name_32
|
||||
Result := generating_type.name_32
|
||||
else
|
||||
Result := "Void"
|
||||
Result := {STRING_32} "Void"
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -126,17 +126,10 @@ feature -- Helper
|
||||
Result := value.same_string_general (a_other)
|
||||
end
|
||||
|
||||
is_case_insensitive_equal (a_other: READABLE_STRING_8): BOOLEAN
|
||||
is_case_insensitive_equal (a_other: READABLE_STRING_GENERAL): BOOLEAN
|
||||
-- Does `a_other' represent the same case insensitive string as `Current'?
|
||||
local
|
||||
v: like value
|
||||
do
|
||||
v := value
|
||||
if v = a_other.to_string_32 then
|
||||
Result := True
|
||||
elseif v.is_valid_as_string_8 then
|
||||
Result := v.is_case_insensitive_equal (a_other.to_string_32)
|
||||
end
|
||||
Result := value.is_case_insensitive_equal_general (a_other)
|
||||
end
|
||||
|
||||
feature -- Conversion
|
||||
|
||||
@@ -130,7 +130,7 @@ feature -- Conversion
|
||||
end
|
||||
|
||||
as_array_of_string: detachable ARRAY [READABLE_STRING_32]
|
||||
-- Return an array of STRING if possible., otherwise Void
|
||||
-- Return an array of STRING if possible, otherwise Void.
|
||||
local
|
||||
i,n: INTEGER
|
||||
nb: INTEGER
|
||||
@@ -145,6 +145,10 @@ feature -- Conversion
|
||||
if attached {WSF_STRING} value (i.out) as s then
|
||||
Result.put (s.value, i)
|
||||
nb := nb + 1
|
||||
elseif attached {WSF_STRING} value (name + "[" + i.out + "]") as s then
|
||||
-- FIXME !!
|
||||
Result.put (s.value, i)
|
||||
nb := nb + 1
|
||||
else
|
||||
Result := Void
|
||||
end
|
||||
|
||||
@@ -94,7 +94,7 @@ feature -- Status report
|
||||
|
||||
feature -- Conversion
|
||||
|
||||
string_representation: STRING_32
|
||||
string_representation: READABLE_STRING_32
|
||||
do
|
||||
Result := filename
|
||||
end
|
||||
@@ -250,7 +250,7 @@ feature -- Element change
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
@@ -70,7 +70,7 @@ feature -- Query
|
||||
end
|
||||
end
|
||||
|
||||
string_representation: STRING_32
|
||||
string_representation: READABLE_STRING_32
|
||||
-- String representation of Current
|
||||
-- if possible
|
||||
-- note: unicode value.
|
||||
@@ -89,7 +89,7 @@ feature -- Helper
|
||||
result_true_only_for_string: Result implies is_string
|
||||
end
|
||||
|
||||
is_case_insensitive_equal (a_other: READABLE_STRING_8): BOOLEAN
|
||||
is_case_insensitive_equal (a_other: READABLE_STRING_GENERAL): BOOLEAN
|
||||
-- Does `a_other' represent the same case insensitive string as `Current'?
|
||||
do
|
||||
if is_string then
|
||||
@@ -130,7 +130,7 @@ feature -- Visitor
|
||||
end
|
||||
|
||||
note
|
||||
copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
|
||||
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
|
||||
source: "[
|
||||
Eiffel Software
|
||||
|
||||
Reference in New Issue
Block a user