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
type index = Odiff_types.index =
| One of int
| Many of int * int
type diff = Odiff_types.diff =
| Add of index * index * string
| Delete of index * index * string
| Change of index * string * index * string
type diffs = diff list
let parse_from_lexbuf lex =
Odiff_lexer.line := 0;
try
Odiff_parser.main Odiff_lexer.main lex
with
Parsing.Parse_error ->
raise (Failure ("Parse error line "^(string_of_int !Odiff_lexer.line)))
| e ->
let s = Printf.sprintf "Line %d: %s"
!Odiff_lexer.line (Printexc.to_string e)
in
failwith s
let split_string s chars =
let len = String.length s in
let rec iter acc pos =
if pos >= len then
match acc with
"" -> []
| _ -> [acc]
else
if List.mem s.[pos] chars then
match acc with
"" -> iter "" (pos + 1)
| _ -> acc :: (iter "" (pos + 1))
else
iter (Printf.sprintf "%s%c" acc s.[pos]) (pos + 1)
in
iter "" 0
let string_of_index ?(offset=0) = function
One n -> string_of_int (offset+n)
| Many (n,m) -> Printf.sprintf "%d,%d" (offset+n) (offset+m)
let prepend_lines =
let rec remove_last_empty_line acc = function
| [] -> List.rev acc
| [""] -> List.rev acc
| h :: q -> remove_last_empty_line (h::acc) q
in
fun s txt ->
let l = String.split_on_char '\n' txt in
let l = remove_last_empty_line [] l in
String.concat "\n" (List.map ((^) s) l)
let string_of_diff ?offset = function
Add (i1,i2,s) ->
let i1 = string_of_index ?offset i1
and i2 = string_of_index ?offset i2 in
let txt = prepend_lines "> " s in
Printf.sprintf "%sa%s\n%s" i1 i2 txt
| Delete (i1,i2,s) ->
let i1 = string_of_index ?offset i1
and i2 = string_of_index ?offset i2 in
let txt = prepend_lines "< " s in
Printf.sprintf "%sd%s\n%s" i1 i2 txt
| Change (i1,s1,i2,s2) ->
let i1 = string_of_index ?offset i1
and i2 = string_of_index ?offset i2 in
let txt1 = prepend_lines "< " s1 in
let txt2 = prepend_lines "> " s2 in
Printf.sprintf "%sc%s\n%s\n---\n%s"
i1 i2 txt1 txt2
let string_of_diffs ?offset l =
(String.concat "\n" (List.map (string_of_diff ?offset) l))^"\n"
let print_diffs oc ?offset l =
Printf.fprintf oc "%s" (string_of_diffs ?offset l)
let from_string s =
parse_from_lexbuf (Lexing.from_string s)
let from_channel ic =
parse_from_lexbuf (Lexing.from_channel ic)
let from_file s =
try from_channel (open_in s)
with Sys_error s -> failwith s
let try_finalize f x finally y =
let res =
try f x
with exn -> finally y; raise exn
in
finally y;
res
let file_of_string ~file s =
let oc = open_out file in
output_string oc s;
close_out oc
let files_diffs f1 f2 =
let com = Printf.sprintf "diff %s %s"
(Filename.quote f1) (Filename.quote f2)
in
let ic =
try Unix.open_process_in com
with
Unix.Unix_error (e,s1,s2) ->
failwith (Printf.sprintf "%s: %s %s" (Unix.error_message e) s1 s2)
in
let final () = try ignore(Unix.close_process_in ic) with _ -> () in
try_finalize from_channel ic final ()
let strings_diffs s1 s2 =
let (f1, f2) =
try
let f1 = Filename.temp_file "odiff" ".txt" in
file_of_string ~file: f1 s1;
let f2 = Filename.temp_file "odiff" ".txt" in
file_of_string ~file: f2 s2;
(f1,f2)
with Sys_error s -> failwith s
in
let final () =
(try Sys.remove f1 with _ -> ());
(try Sys.remove f2 with _ -> ())
in
try_finalize (files_diffs f1) f2 final ()