-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathdiff.pre
More file actions
67 lines (62 loc) · 1.76 KB
/
Copy pathdiff.pre
File metadata and controls
67 lines (62 loc) · 1.76 KB
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
! diff utilities for Prefix
FUNC STR _append_line(STR acc, STR line){
IF( EQ(acc, "") ){ RETURN(line) } ELSE { RETURN( JOIN(acc, "\n", line) ) }
}
FUNC STR UNIFIED(STR mod, STR src){
TNS a = SPLIT(mod, "\n")
TNS b = SPLIT(src, "\n")
INT la = TLEN(a, 0d1)
INT lb = TLEN(b, 0d1)
INT n = MAX(la, lb)
STR out = ""
INT i = 0d1
WHILE( LTE(i, n) ){
STR left = ""
IF( LTE(i, la) ){ left = a[i] }
STR right = ""
IF( LTE(i, lb) ){ right = b[i] }
IF( EQ(left, right) ){
IF( NEQ(left, "")){
STR line = JOIN(" ", left)
out = _append_line(out, line)
}
} ELSE {
IF( NEQ(left, "")) {
out = _append_line(out, JOIN("-", left))
}
IF( NEQ(right, "")) {
out = _append_line(out, JOIN("+", right))
}
}
i = ADD(i, 0d1)
}
RETURN(out)
}
FUNC STR CONTEXT(STR mod, STR src){
! For simplicity, use the same output as UNIFIED but with a ' ' prefix
STR u = UNIFIED(mod, src)
IF( EQ(u, "") ){ RETURN("") }
! Prepend a simple header to resemble context diff
RETURN( JOIN("*** a", "\n", u) )
}
FUNC STR SIDE_BY_SIDE(STR mod, STR src){
TNS a = SPLIT(mod, "\n")
TNS b = SPLIT(src, "\n")
INT la = TLEN(a, 0d1)
INT lb = TLEN(b, 0d1)
INT n = MAX(la, lb)
STR out = ""
INT i = 0d1
WHILE( LTE(i, n) ){
STR left = ""
IF( LTE(i, la) ){ left = a[i] }
STR right = ""
IF( LTE(i, lb) ){ right = b[i] }
STR marker = " "
IF( NEQ(left, right)){ marker = "|" }
STR line = JOIN(left, " ", marker, " ", right)
out = _append_line(out, line)
i = ADD(i, 0d1)
}
RETURN(out)
}