66 |
|
|
67 |
|
void Iffy::iffy(ios::Reader& in, ios::Writer& out) |
68 |
|
{ |
69 |
< |
ext::String segment; |
69 |
> |
ext::Buffer segment; |
70 |
|
bool text(false); |
71 |
|
Cleaner cleaner; |
72 |
|
|
73 |
|
while (read(in, segment, (text = !text))) if (text) |
74 |
|
{ |
75 |
< |
cleaner.insert(segment); |
75 |
> |
if (!segment.IsEmpty()) cleaner.insert(segment); |
76 |
|
} |
77 |
|
else |
78 |
|
{ |
96 |
|
|
97 |
|
ios::FormatWriter fout(out); |
98 |
|
|
99 |
< |
fout << cleaner; |
99 |
> |
fout << cleaner << ios::NewLine; |
100 |
|
} |
101 |
|
|
102 |
< |
bool Iffy::read(ios::Reader& in, ext::String& segment, bool text) |
102 |
> |
bool Iffy::read(ios::Reader& in, ext::Buffer& segment, bool text) |
103 |
|
{ |
104 |
|
segment.Clear(); |
105 |
|
|
106 |
< |
utf8_t atom; |
106 |
> |
byte_t atom; |
107 |
|
|
108 |
|
while (in.Get(atom)) |
109 |
|
{ |