mirrors/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added `HTML_ENCODER.general_encoded_string (s: READABLE_STRING_GENERAL): STRING_8'

Browse Source 
(note: probably we should do similar change for all the encoders)
This commit is contained in:
Jocelyn Fiat
2012-09-10 09:36:27 +02:00
parent 0d8363aa3f
commit fbd9cb9588
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
library/text/encoder/src/html_encoder.e
View File

@@ -36,19 +36,25 @@ feature -- Encoder
encoded_string (s: READABLE_STRING_32): STRING_8 encoded_string (s: READABLE_STRING_32): STRING_8
-- HTML-encoded value of `s'. -- HTML-encoded value of `s'.
do
Result := general_encoded_string (s)
end
general_encoded_string (s: READABLE_STRING_GENERAL): STRING_8
-- The HTML-encoded equivalent of the given string
-- HTML-encoded value of `s'.
local local
i, n: INTEGER i, n: INTEGER
uc: CHARACTER_32 l_code: NATURAL_32
l_code: INTEGER
c: CHARACTER_8 c: CHARACTER_8
do do
has_error := False has_error := False
create Result.make (s.count + s.count // 10) create Result.make (s.count + s.count // 10)
n := s.count n := s.count
from i := 1 until i > n loop from i := 1 until i > n loop
uc := s.item (i) l_code := s.code (i)
if uc.is_character_8 then if l_code.is_valid_character_8_code then
c := uc.to_character_8 c := l_code.to_character_8
inspect c inspect c
when '%T', '%N', '%R' then when '%T', '%N', '%R' then
@@ -59,7 +65,6 @@ feature -- Encoder
when '<' then Result.append_string ("&lt;") when '<' then Result.append_string ("&lt;")
when '>' then Result.append_string ("&gt;") when '>' then Result.append_string ("&gt;")
else else
l_code := c.code
if if
l_code <= 31 or -- Hexa 1F l_code <= 31 or -- Hexa 1F
l_code = 127 -- Hexa 7F l_code = 127 -- Hexa 7F
@@ -77,7 +82,7 @@ feature -- Encoder
end end
else else
Result.append ("&#") Result.append ("&#")
Result.append (uc.code.out) Result.append (l_code.out)
Result.extend (';') Result.extend (';')
end end
i := i + 1 i := i + 1