4 |
|
// |
5 |
|
// $Id$ |
6 |
|
|
7 |
< |
#include "Tag.hpp" |
7 |
> |
#include "Cleaner.hpp" |
8 |
|
#include "Matcher.hpp" |
9 |
|
|
10 |
|
#include <menes-api/exename.hpp> |
52 |
|
|
53 |
|
Iffy::Iffy(const ext::String& in, const ext::String& out) |
54 |
|
{ |
55 |
< |
if (in == "-" && out == "-") |
56 |
< |
{ |
57 |
< |
iffy(api::Cin, api::Cout); |
58 |
< |
} |
59 |
< |
else if (in == "-") |
60 |
< |
{ |
61 |
< |
api::FileWriter fout(out); |
55 |
> |
_H<ios::Reader> rin; |
56 |
> |
_H<ios::Writer> rout; |
57 |
|
|
58 |
< |
iffy(api::Cin, fout); |
59 |
< |
} |
65 |
< |
else if (out == "-") |
66 |
< |
{ |
67 |
< |
api::FileReader fin(in); |
58 |
> |
if (in == "-") rin = &api::Cin; else rin = new api::FileReader(in); |
59 |
> |
if (out == "-") rout = &api::Cout; else rout = new api::FileWriter(out); |
60 |
|
|
61 |
< |
iffy(fin, api::Cout); |
70 |
< |
} |
71 |
< |
else |
72 |
< |
{ |
73 |
< |
api::FileReader fin(in); |
74 |
< |
api::FileWriter fout(out); |
75 |
< |
|
76 |
< |
iffy(fin, fout); |
77 |
< |
} |
61 |
> |
iffy(*rin, *rout); |
62 |
|
} |
63 |
|
|
64 |
|
ext::String Iffy::program; |
67 |
|
void Iffy::iffy(ios::Reader& in, ios::Writer& out) |
68 |
|
{ |
69 |
|
ext::String segment; |
70 |
< |
bool text(true); |
71 |
< |
ios::FormatWriter fout(out); |
88 |
< |
ext::Stack<ext::String> opens; |
70 |
> |
bool text(false); |
71 |
> |
Cleaner cleaner; |
72 |
|
|
73 |
< |
while (read(in, segment, text)) if (text) |
73 |
> |
while (read(in, segment, (text = !text))) if (text) |
74 |
|
{ |
75 |
< |
fout << segment; |
93 |
< |
|
94 |
< |
text = false; |
75 |
> |
cleaner.insert(segment); |
76 |
|
} |
77 |
|
else |
78 |
|
{ |
79 |
< |
Tag tag(segment); |
99 |
< |
|
100 |
< |
if (tag == "br") tag = STANDALONE; |
79 |
> |
Matcher matcher; |
80 |
|
|
81 |
< |
switch (tag) |
81 |
> |
if (segment == matcher("^!--( \\(\\d{1,2}:\\d{2}:\\d{2} [AP]M\\))--$")) |
82 |
|
{ |
83 |
< |
case OPEN: |
105 |
< |
opens.Push(tag); |
83 |
> |
cleaner.insert(matcher[1]); |
84 |
|
|
85 |
< |
break; |
108 |
< |
case CLOSE: |
109 |
< |
if (tag != opens.Top()) tag = opens.Top(); |
110 |
< |
|
111 |
< |
opens.Pop(); |
112 |
< |
|
113 |
< |
break; |
114 |
< |
default: |
115 |
< |
break; |
85 |
> |
continue; |
86 |
|
} |
87 |
|
|
88 |
< |
fout << tag; |
88 |
> |
Tag tag(segment); |
89 |
|
|
90 |
< |
text = true; |
90 |
> |
if (tag == "br") tag = STANDALONE; |
91 |
> |
|
92 |
> |
cleaner.insert(tag); |
93 |
|
} |
94 |
+ |
|
95 |
+ |
cleaner.clean(); |
96 |
+ |
|
97 |
+ |
ios::FormatWriter fout(out); |
98 |
+ |
|
99 |
+ |
fout << cleaner; |
100 |
|
} |
101 |
|
|
102 |
|
bool Iffy::read(ios::Reader& in, ext::String& segment, bool text) |
103 |
|
{ |
104 |
|
segment.Clear(); |
105 |
|
|
106 |
< |
byte_t atom; |
106 |
> |
utf8_t atom; |
107 |
|
|
108 |
|
while (in.Get(atom)) |
109 |
|
{ |