Source file reconcile.ml
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
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
open Expect_test_common.Std
open Ppx_compare_lib.Builtin
open Ppx_sexp_conv_lib.Conv
module Result = struct
type 'a t =
| Match
| Correction of 'a
[@@deriving sexp_of, compare]
let map t ~f =
match t with
| Match -> Match
| Correction x -> Correction (f x)
;;
let value t ~success =
match t with
| Match -> success
| Correction f -> f
;;
end
let matches_regexp ~(pat : Re.t) s =
Re.execp (Re.compile (Re.whole_string pat)) s
;;
let glob = Re.Glob.glob ~anchored:true ~pathname:false ~expand_braces:true
let line_matches ~(expect : Fmt.t) ~actual =
match expect with
| Literal expect ->
expect = actual
| Glob expect ->
matches_regexp ~pat:(glob expect) actual
| Regexp expect ->
matches_regexp ~pat:(Re.Emacs.re expect) actual
;;
let%test _ = line_matches ~expect:(Literal "foo") ~actual:"foo"
let%test _ = line_matches ~expect:(Literal "f.*o (regexp)") ~actual:"f.*o (regexp)"
let%test _ = line_matches ~expect:(Regexp "f.*o") ~actual:"foo"
let%test _ = not (line_matches ~expect:(Regexp "f.*o") ~actual:"foo (regexp)")
let%test _ = not (line_matches ~expect:(Regexp "[a]") ~actual:"[a]")
let%test _ = line_matches ~expect:(Regexp "f.*o") ~actual:"foo"
let%test _ = line_matches ~expect:(Regexp "f.*o[ ]") ~actual:"foo "
let literal_line ~allow_output_patterns actual : Fmt.t Cst.Line.t =
match actual with
| "" -> Blank ""
| _ ->
let line_matches_itself =
not allow_output_patterns ||
line_matches
~expect:(Lexer.parse_pretty_line actual ~allow_output_patterns)
~actual
in
Not_blank
{ data = Literal actual
; orig = if line_matches_itself then actual else actual ^ " (literal)"
; trailing_blanks = ""
}
;;
let reconcile_line ~(expect:Fmt.t) ~actual ~allow_output_patterns
: Fmt.t Cst.Line.t Result.t =
assert (not (String.contains actual '\n'));
if line_matches ~expect ~actual
then Match
else Correction (literal_line actual ~allow_output_patterns)
;;
let%test_module _ =
(module struct
let allow_output_patterns = true
let expect_match ~expect ~actual =
let expect = Lexer.parse_pretty_line expect ~allow_output_patterns in
[%test_result: Fmt.t Cst.Line.t Result.t]
(reconcile_line ~expect ~actual ~allow_output_patterns)
~expect:Match
;;
let expect_correction ~expect ~actual ~corrected =
let expect = Lexer.parse_pretty_line expect ~allow_output_patterns in
let corrected : Fmt.t Cst.Line.t =
Not_blank
{ orig = corrected
; data = Lexer.parse_pretty_line corrected ~allow_output_patterns
; trailing_blanks = "" }
in
[%test_result: Fmt.t Cst.Line.t Result.t]
(reconcile_line ~expect ~actual ~allow_output_patterns)
~expect:(Correction corrected)
;;
let%test_unit _ =
expect_match
~expect:"foo"
~actual:"foo"
let%test_unit _ =
expect_match
~expect:"[a] (regexp)"
~actual:"a"
let%test_unit _ =
expect_correction
~expect:"[a] (regexp)"
~actual:"b"
~corrected:"b"
end)
let rec lines_match
~(expect_lines : Fmt.t Cst.Line.t list)
~(actual_lines : string list)
~allow_output_patterns
: bool =
match expect_lines, actual_lines with
| [], [] -> true
| [], _ -> false
| _ , [] -> false
| (expect::expect_lines), (actual::actual_lines) ->
let format = Cst.Line.data expect ~blank:(Literal "") in
let line = reconcile_line ~expect:format ~actual ~allow_output_patterns in
match line with
| Match -> lines_match ~expect_lines ~actual_lines ~allow_output_patterns
| _ -> false
;;
let rec corrected_rev acc
~(expect_lines : Fmt.t Cst.Line.t list)
~(actual_lines : string list)
~allow_output_patterns
: Fmt.t Cst.Line.t list =
match expect_lines, actual_lines with
| [], [] -> acc
| [], actual_lines ->
ListLabels.fold_left actual_lines ~init:acc ~f:(fun acc x ->
literal_line x ~allow_output_patterns :: acc)
| _, [] -> acc
| (expect::expect_lines), (actual::actual_lines) ->
let format = Cst.Line.data expect ~blank:(Literal "") in
let line =
reconcile_line ~expect:format ~actual ~allow_output_patterns
|> Result.value ~success:expect
in
corrected_rev ~expect_lines ~actual_lines (line :: acc)
~allow_output_patterns
;;
let reconcile_lines ~expect_lines ~actual_lines ~allow_output_patterns
: Fmt.t Cst.Line.t list Result.t =
if lines_match ~expect_lines ~actual_lines ~allow_output_patterns
then Match
else Correction (List.rev (corrected_rev [] ~expect_lines ~actual_lines
~allow_output_patterns))
let expectation_body_internal
~(expect : Fmt.t Cst.t Expectation.Body.t)
~actual
~default_indent
~pad_single_line
~allow_output_patterns
: Fmt.t Cst.t Expectation.Body.t Result.t =
match expect with
| Exact expect ->
if expect = actual
then Match
else Correction (Exact actual)
| Output -> Match
| Pretty expect -> begin
let actual_lines =
Lexer.strip_surrounding_whitespaces actual
|> Cst.stripped_original_lines
in
let expect_lines = Cst.to_lines expect in
match reconcile_lines ~expect_lines ~actual_lines ~allow_output_patterns with
| Match -> Match
| Correction reconciled_lines ->
let reconciled =
Cst.reconcile expect
~lines:reconciled_lines
~default_indentation:default_indent
~pad_single_line
in
Correction (Pretty reconciled)
end
| Unreachable ->
let actual_lines =
Lexer.strip_surrounding_whitespaces actual
|> Cst.stripped_original_lines
in
match reconcile_lines ~expect_lines:[] ~actual_lines ~allow_output_patterns with
| Match -> Correction (Pretty (Empty ""))
| Correction reconciled_lines ->
let reconciled =
Cst.reconcile (Empty "")
~lines:reconciled_lines
~default_indentation:default_indent
~pad_single_line
in
Correction (Pretty reconciled)
;;
let expectation_body
~(expect : Fmt.t Cst.t Expectation.Body.t)
~actual
~default_indent
~pad_single_line
~allow_output_patterns
: Fmt.t Cst.t Expectation.Body.t Result.t =
let res =
expectation_body_internal ~expect ~actual ~default_indent ~pad_single_line
~allow_output_patterns
in
match res with
| Match -> Match
| Correction c ->
match
expectation_body_internal ~expect:c ~actual ~default_indent ~pad_single_line
~allow_output_patterns
with
| Match -> res
| Correction _ ->
assert false
;;
let%test_module _ =
(module struct
let allow_output_patterns = true
let strip s =
Lexer.strip_surrounding_whitespaces s
;;
let nb orig trailing_blanks =
Cst.Line.Not_blank { orig; trailing_blanks; data = () }
;;
let%test_unit _ =
[%test_result: unit Cst.t]
(strip "\n ")
~expect:(Empty "\n ")
;;
let%test_unit _ =
[%test_result: unit Cst.t]
(strip " \n\
\ foo \n\
\ bar \n\
\ plop \n\
\ \n\
\ blah \n\
\ \n\
\ ")
~expect:(Multi_lines
{ leading_spaces = " \n"
; trailing_spaces = "\n \n "
; indentation = " "
; lines =
[ nb "foo" " "
; nb " bar" " "
; nb " plop" " "
; Blank " "
; nb " blah" " "
]
})
;;
let%test_unit _ =
[%test_result: unit Cst.t]
(strip "abc \n\
def ")
~expect:(Multi_lines
{ leading_spaces = ""
; trailing_spaces = " "
; indentation = ""
; lines =
[ nb "abc" " "
; nb "def" ""
]
})
;;
let%test_unit _ =
[%test_result: unit Cst.t]
(strip " [a] (regexp) ")
~expect:(Single_line
{ leading_blanks = " "
; trailing_spaces = " "
; orig = "[a] (regexp)"
; data = ()
})
;;
let expect_match ~expect ~actual =
let expect = Lexer.parse_body (Pretty expect) ~allow_output_patterns in
[%test_result: Fmt.t Cst.t Expectation.Body.t Result.t]
(expectation_body ~expect ~actual ~default_indent:0 ~pad_single_line:true
~allow_output_patterns)
~expect:Match
;;
let expect_correction ~expect ~actual ~default_indent ~corrected =
let expect = Lexer.parse_body (Pretty expect) ~allow_output_patterns in
[%test_result: Fmt.t Cst.t Expectation.Body.t Result.t]
(expectation_body ~expect ~actual ~default_indent ~pad_single_line:true
~allow_output_patterns)
~expect:(Correction corrected)
;;
let%test_unit _ =
expect_match
~expect:" foo "
~actual:"foo"
let%test_unit _ =
expect_match
~expect:"foo\n\
[a] (regexp)"
~actual:"foo\na"
let%test_unit _ =
expect_correction
~expect:"foo\n\
[a] (regexp)"
~actual:"foo\nb"
~default_indent:0
~corrected:(
Lexer.parse_body
~allow_output_patterns:true
(Pretty
"foo\n\
b")
)
let%test_unit _ =
expect_correction
~expect:"foo\n\
[ab]* (regexp)"
~actual:"not-foo\nbaba"
~default_indent:0
~corrected:(
Lexer.parse_body
~allow_output_patterns
(Pretty
"not-foo\n\
[ab]* (regexp)")
)
end)