1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
|
Index: markup.ml-0.7.2/test/test_encoding.ml
===================================================================
--- markup.ml-0.7.2.orig/test/test_encoding.ml
+++ markup.ml-0.7.2/test/test_encoding.ml
@@ -15,9 +15,9 @@ let test_ucs_4 (f : Encoding.t) name s1
expect_error (1, 2) (`Decoding_error (bad_bytes, name))
begin fun report ->
let chars = s1 |> string |> f ~report in
- next_option chars ok (assert_equal (Some (Char.code 'f')));
+ next_option chars ok (assert_equal (Some ((Uchar.of_int (Char.code 'f')))));
next_option chars ok (assert_equal (Some Uutf.u_rep));
- next_option chars ok (assert_equal (Some (Char.code 'o')));
+ next_option chars ok (assert_equal (Some ((Uchar.of_int (Char.code 'o')))));
next_option chars ok (assert_equal None);
next_option chars ok (assert_equal None)
end;
@@ -25,9 +25,9 @@ let test_ucs_4 (f : Encoding.t) name s1
expect_error (2, 2) (`Decoding_error ("\x00\x00\x00", name))
begin fun report ->
let chars = s2 |> string |> f ~report in
- next_option chars ok (assert_equal (Some (Char.code 'f')));
- next_option chars ok (assert_equal (Some 0x000A));
- next_option chars ok (assert_equal (Some (Char.code 'o')));
+ next_option chars ok (assert_equal (Some (Uchar.of_int (Char.code 'f'))));
+ next_option chars ok (assert_equal (Some (Uchar.of_int 0x000A)));
+ next_option chars ok (assert_equal (Some (Uchar.of_int (Char.code 'o'))));
next_option chars ok (assert_equal (Some Uutf.u_rep));
next_option chars ok (assert_equal None);
next_option chars ok (assert_equal None)
@@ -38,12 +38,12 @@ let tests = [
let s = "\xef\xbb\xbffoo\xf0\x9f\x90\x99bar\xa0more" in
expect_error (1, 8) (`Decoding_error ("\xa0", "utf-8")) begin fun report ->
let chars = s |> string |> utf_8 ~report in
- next_n 3 chars ok (assert_equal (List.map Char.code ['f'; 'o'; 'o']));
- next_option chars ok (assert_equal (Some 0x1F419));
- next_n 3 chars ok (assert_equal (List.map Char.code ['b'; 'a'; 'r']));
+ next_n 3 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['f'; 'o'; 'o']));
+ next_option chars ok (assert_equal (Some (Uchar.of_int 0x1F419)));
+ next_n 3 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['b'; 'a'; 'r']));
next_option chars ok (assert_equal (Some Uutf.u_rep));
next_n 4 chars ok
- (assert_equal (List.map Char.code ['m'; 'o'; 'r'; 'e']));
+ (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['m'; 'o'; 'r'; 'e']));
next_option chars ok (assert_equal None);
next_option chars ok (assert_equal None)
end);
@@ -53,11 +53,11 @@ let tests = [
expect_error (1, 6) (`Decoding_error ("\xdc\x19", "utf-16be"))
begin fun report ->
let chars = s |> string |> utf_16be ~report in
- next_n 3 chars ok (assert_equal (List.map Char.code ['f'; 'o'; 'o']));
- next_option chars ok (assert_equal (Some 0x1F419));
- next_option chars ok (assert_equal (Some (Char.code 'b')));
+ next_n 3 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['f'; 'o'; 'o']));
+ next_option chars ok (assert_equal (Some (Uchar.of_int 0x1F419)));
+ next_option chars ok (assert_equal (Some (Uchar.of_int (Char.code 'b'))));
next_option chars ok (assert_equal (Some Uutf.u_rep));
- next_n 16 chars ok (assert_equal (List.map Char.code ['a'; 'r']));
+ next_n 16 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['a'; 'r']));
next_option chars ok (assert_equal None);
next_option chars ok (assert_equal None)
end);
@@ -67,11 +67,11 @@ let tests = [
expect_error (1, 6) (`Decoding_error ("\x19\xdc", "utf-16le"))
begin fun report ->
let chars = s |> string |> utf_16le ~report in
- next_n 3 chars ok (assert_equal (List.map Char.code ['f'; 'o'; 'o']));
- next_option chars ok (assert_equal (Some 0x1F419));
- next_option chars ok (assert_equal (Some (Char.code 'b')));
+ next_n 3 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['f'; 'o'; 'o']));
+ next_option chars ok (assert_equal (Some (Uchar.of_int 0x1F419)));
+ next_option chars ok (assert_equal (Some (Uchar.of_int (Char.code 'b'))));
next_option chars ok (assert_equal (Some Uutf.u_rep));
- next_n 16 chars ok (assert_equal (List.map Char.code ['a'; 'r']));
+ next_n 16 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['a'; 'r']));
next_option chars ok (assert_equal None);
next_option chars ok (assert_equal None)
end);
@@ -79,7 +79,7 @@ let tests = [
("encoding.iso_8859_1" >:: fun _ ->
let chars = string "foo\xa0" |> iso_8859_1 in
next_n 4 chars
- ok (assert_equal (List.map Char.code ['f'; 'o'; 'o'; '\xa0']));
+ ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['f'; 'o'; 'o'; '\xa0']));
next_option chars ok (assert_equal None);
next_option chars ok (assert_equal None));
@@ -88,26 +88,26 @@ let tests = [
expect_error (1, 4) (`Decoding_error ("\xa0", "us-ascii"))
begin fun report ->
let chars = s |> string |> us_ascii ~report in
- next_n 3 chars ok (assert_equal (List.map Char.code ['f'; 'o'; 'o']));
+ next_n 3 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['f'; 'o'; 'o']));
next_option chars ok (assert_equal (Some Uutf.u_rep));
- next_n 3 chars ok (assert_equal (List.map Char.code ['b'; 'a'; 'r']));
+ next_n 3 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['b'; 'a'; 'r']));
next_option chars ok (assert_equal None);
next_option chars ok (assert_equal None)
end);
("encoding.windows_1251" >:: fun _ ->
let chars = string "foo\xe0\xe1\xe2bar" |> windows_1251 in
- next_n 3 chars ok (assert_equal (List.map Char.code ['f'; 'o'; 'o']));
- next_n 3 chars ok (assert_equal [0x0430; 0x0431; 0x0432]);
- next_n 3 chars ok (assert_equal (List.map Char.code ['b'; 'a'; 'r']));
+ next_n 3 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['f'; 'o'; 'o']));
+ next_n 3 chars ok (assert_equal [Uchar.of_int 0x0430; Uchar.of_int 0x0431; Uchar.of_int 0x0432]);
+ next_n 3 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['b'; 'a'; 'r']));
next_option chars ok (assert_equal None);
next_option chars ok (assert_equal None));
("encoding.windows_1252" >:: fun _ ->
let chars = string "foo\x80\x83bar" |> windows_1252 in
- next_n 3 chars ok (assert_equal (List.map Char.code ['f'; 'o'; 'o']));
- next_n 2 chars ok (assert_equal [0x20AC; 0x0192]);
- next_n 3 chars ok (assert_equal (List.map Char.code ['b'; 'a'; 'r']));
+ next_n 3 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['f'; 'o'; 'o']));
+ next_n 2 chars ok (assert_equal [Uchar.of_int 0x20AC; Uchar.of_int 0x0192]);
+ next_n 3 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['b'; 'a'; 'r']));
next_option chars ok (assert_equal None);
next_option chars ok (assert_equal None));
@@ -137,7 +137,7 @@ let tests = [
("encoding.ebcdic" >:: fun _ ->
let chars = string "\x86\x96\x96" |> ebcdic in
- next_n 3 chars ok (assert_equal (List.map Char.code ['f'; 'o'; 'o']));
+ next_n 3 chars ok (assert_equal (List.map (fun x -> Uchar.of_int (Char.code x)) ['f'; 'o'; 'o']));
next_option chars ok (assert_equal None);
next_option chars ok (assert_equal None));
]
Index: markup.ml-0.7.2/test/test_html_tokenizer.ml
===================================================================
--- markup.ml-0.7.2.orig/test/test_html_tokenizer.ml
+++ markup.ml-0.7.2/test/test_html_tokenizer.ml
@@ -134,7 +134,7 @@ let tests = [
expect "�"
[ 1, 1, E (`Bad_token ("�",
reference, "out of range"));
- 1, 1, S (`Char Uutf.u_rep);
+ 1, 1, S (`Char (Uchar.to_int Uutf.u_rep));
1, 35, S `EOF];
expect "�"
@@ -142,22 +142,22 @@ let tests = [
reference, "missing ';' at end"));
1, 1, E (`Bad_token ("�",
reference, "out of range"));
- 1, 1, S (`Char Uutf.u_rep);
+ 1, 1, S (`Char (Uchar.to_int Uutf.u_rep));
1, 34, S `EOF];
expect "�"
[ 1, 1, E (`Bad_token ("�", reference, "out of range"));
- 1, 1, S (`Char Uutf.u_rep);
+ 1, 1, S (`Char (Uchar.to_int Uutf.u_rep));
1, 9, S `EOF];
expect "�"
[ 1, 1, E (`Bad_token ("�", reference, "out of range"));
- 1, 1, S (`Char Uutf.u_rep);
+ 1, 1, S (`Char (Uchar.to_int Uutf.u_rep));
1, 11, S `EOF];
expect "�"
[ 1, 1, E (`Bad_token ("�", reference, "out of range"));
- 1, 1, S (`Char Uutf.u_rep);
+ 1, 1, S (`Char (Uchar.to_int Uutf.u_rep));
1, 5, S `EOF];
expect ""
@@ -264,7 +264,7 @@ let tests = [
expect ~state:`RCDATA "f\x00</foo>"
([ 1, 1, S (`Char 0x66);
1, 2, E (`Bad_token ("U+0000", "content", "null"));
- 1, 2, S (`Char Uutf.u_rep)] @
+ 1, 2, S (`Char (Uchar.to_int Uutf.u_rep))] @
(char_sequence ~start:3 "</foo>"));
expect ~state:`RCDATA "<title>f</title >"
@@ -302,7 +302,7 @@ let tests = [
expect ~state:`RAWTEXT "f\x00</foo>"
([ 1, 1, S (`Char 0x66);
1, 2, E (`Bad_token ("U+0000", "content", "null"));
- 1, 2, S (`Char Uutf.u_rep)] @
+ 1, 2, S (`Char (Uchar.to_int Uutf.u_rep))] @
(char_sequence ~start:3 "</foo>")));
("html.tokenizer.script-data" >:: fun _ ->
@@ -330,7 +330,7 @@ let tests = [
expect ~state:`Script_data "f<!--o\x00o"
((char_sequence ~no_eof:true "f<!--o") @
[1, 7, E (`Bad_token ("U+0000", "script", "null"));
- 1, 7, S (`Char Uutf.u_rep);
+ 1, 7, S (`Char (Uchar.to_int Uutf.u_rep));
1, 8, S (`Char 0x6F);
1, 9, E (`Unexpected_eoi "script");
1, 9, S `EOF]);
@@ -363,7 +363,7 @@ let tests = [
expect ~state:`Script_data "f<!--a-\x00-"
((char_sequence ~no_eof:true "f<!--a-") @
[ 1, 8, E (`Bad_token ("U+0000", "script", "null"));
- 1, 8, S (`Char Uutf.u_rep);
+ 1, 8, S (`Char (Uchar.to_int Uutf.u_rep));
1, 9, S (`Char 0x02D);
1, 10, E (`Unexpected_eoi "script");
1, 10, S `EOF]);
@@ -371,7 +371,7 @@ let tests = [
expect ~state:`Script_data "f<!--a--\x00--"
((char_sequence ~no_eof:true "f<!--a--") @
[ 1, 9, E (`Bad_token ("U+0000", "script", "null"));
- 1, 9, S (`Char Uutf.u_rep);
+ 1, 9, S (`Char (Uchar.to_int Uutf.u_rep));
1, 10, S (`Char 0x02D);
1, 11, S (`Char 0x02D);
1, 12, E (`Unexpected_eoi "script");
@@ -380,14 +380,14 @@ let tests = [
expect ~state:`Script_data "f<!--<script>\x00"
((char_sequence ~no_eof:true "f<!--<script>") @
[ 1, 14, E (`Bad_token ("U+0000", "script", "null"));
- 1, 14, S (`Char Uutf.u_rep);
+ 1, 14, S (`Char (Uchar.to_int Uutf.u_rep));
1, 15, E (`Unexpected_eoi "script");
1, 15, S `EOF]);
expect ~state:`Script_data "f<!--<script>-\x00-"
((char_sequence ~no_eof:true "f<!--<script>-") @
[ 1, 15, E (`Bad_token ("U+0000", "script", "null"));
- 1, 15, S (`Char Uutf.u_rep);
+ 1, 15, S (`Char (Uchar.to_int Uutf.u_rep));
1, 16, S (`Char 0x2D);
1, 17, E (`Unexpected_eoi "script");
1, 17, S `EOF]);
@@ -395,7 +395,7 @@ let tests = [
expect ~state:`Script_data "f<!--<script>--\x00--"
((char_sequence ~no_eof:true "f<!--<script>--") @
[ 1, 16, E (`Bad_token ("U+0000", "script", "null"));
- 1, 16, S (`Char Uutf.u_rep);
+ 1, 16, S (`Char (Uchar.to_int Uutf.u_rep));
1, 17, S (`Char 0x2D);
1, 18, S (`Char 0x2D);
1, 19, E (`Unexpected_eoi "script");
@@ -413,7 +413,7 @@ let tests = [
expect ~state:`Script_data "f\x00</foo>"
([ 1, 1, S (`Char 0x66);
1, 2, E (`Bad_token ("U+0000", "content", "null"));
- 1, 2, S (`Char Uutf.u_rep)] @
+ 1, 2, S (`Char (Uchar.to_int Uutf.u_rep))] @
(char_sequence ~start:3 "</foo>")));
("html.tokenizer.plaintext" >:: fun _ ->
@@ -424,7 +424,7 @@ let tests = [
expect ~state:`PLAINTEXT "f\x00</foo>"
([ 1, 1, S (`Char 0x66);
1, 2, E (`Bad_token ("U+0000", "content", "null"));
- 1, 2, S (`Char Uutf.u_rep)] @
+ 1, 2, S (`Char (Uchar.to_int Uutf.u_rep))] @
(char_sequence ~start:3 "</foo>")));
("html.tokenizer.comment" >:: fun _ ->
Index: markup.ml-0.7.2/test/test_input.ml
===================================================================
--- markup.ml-0.7.2.orig/test/test_input.ml
+++ markup.ml-0.7.2/test/test_input.ml
@@ -71,7 +71,7 @@ let tests = [
end);
("input.bom" >:: fun _ ->
- [0xFEFF; 0x66]
+ [Uchar.of_int 0xFEFF; Uchar.of_int 0x66]
|> of_list
|> preprocess is_valid_xml_char Error.ignore_errors
|> fst
|
GitWeb