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
|
#!/usr/bin/gosh
;; skkdic-diff.scm -- print diffs between two jisyo files in manued format
;;
;; Copyright (C) 2003-2004 Kimura Fuyuki <fuyuki@hadaly.org>
;;
;; Author: Kimura Fuyuki <fuyuki@hadaly.org>
;; Created: August 11, 2003
;; Last Modified: $Date: 2004/08/24 03:38:56 $
;; Version: $Id: skkdic-diff.scm,v 1.2 2004/08/24 03:38:56 skk-cvs Exp $
(use gauche.process)
(use gauche.regexp)
(use gauche.charconv)
(use util.lcs)
(use util.match)
(use srfi-11)
(define (usage)
(print "Usage: skkdic-diff from-jisyo to-jisyo")
(exit 1))
(define (lcs-edit-list2 lis1 lis2)
(let ((a '()) (b '()) (ab '())
(r '()))
(define (push-a)
(unless (null? a)
(push! r (list '/ (reverse a) '()))
(set! a '())))
(define (push-b)
(unless (null? b)
(push! r (list '/ '() (reverse b)))
(set! b '())))
(define (push-ab)
(unless (null? ab)
(push! r (list '= (reverse ab)))
(set! ab '())))
(define (push-a&b)
(unless (or (null? a) (null? b))
(push! r (list '/ (reverse a) (reverse b)))
(set! a '())
(set! b '())))
(define (a-proc e _) (push-b) (push-ab) (push! a e))
(define (b-proc e _) (push-ab) (push! b e))
(define (both-proc e _) (push-a&b) (push-a) (push-b) (push! ab e))
(lcs-fold a-proc b-proc both-proc '() lis1 lis2)
(push-a&b) (push-ab) (push-a) (push-b)
(reverse r)))
(define (manuediff lis1 lis2)
(let loop ((el (lcs-edit-list2 lis1 lis2))
(r '()))
(match el
((('/ () a) ('= b) ('/ c ()) . rest) (=> next)
(if (equal? a c)
(loop rest (cons (list '$ b '() a) r))
(next)))
((('/ a ()) ('= b) ('/ () c) . rest) (=> next)
(if (equal? a c)
(loop rest (cons (list '$ a '() b) r))
(next)))
((('/ a1 a2) ('= b) ('/ c1 c2) . rest) (=> next)
(if (and (equal? a1 c2) (equal? a2 c1))
(loop rest (cons (list '$ a1 b c1) r))
(next)))
((x . rest)
(loop rest (cons x r)))
(() (reverse r)))))
(define (skkdic-diff lis1 lis2)
(let* ((open "{") (close "}") (swap "|")
(delete "->") (comment ";") (escape "~")
(cmds (list open close swap delete comment escape))
(rx-cmds (string->regexp (string-join (map regexp-quote cmds) "|")))
(rx-open (string->regexp (regexp-quote open)))
(escaped #`",|escape|\\0"))
(define (escape-outer str) (regexp-replace-all rx-open str escaped))
(define (escape-inner str) (regexp-replace-all rx-cmds str escaped))
(define (display-outer l to-string)
(display (escape-outer (to-string l))))
(define (display-inner ls to-string t)
(let ((d (case t ((/) delete) (($) swap))))
(display open)
(display (string-join (map (lambda (l)
(escape-inner (to-string l)))
ls)
d))
(display close)))
(define (manuediff->string1 md)
(with-output-to-string
(lambda ()
(for-each (lambda (e)
(match e
(('= l)
(display-outer l list->string))
((t ls ...)
(display-inner ls list->string t))))
md))))
(define (manuediff->string md)
(with-output-to-string
(lambda ()
(for-each (lambda (e)
(define (to-s l)
(if (null? l) "" (string-join l "/" 'suffix)))
(match e
(('= l)
(display-outer l to-s))
(('/ a b) (=> next)
(if (or (null? a) (null? b))
(next)
(let ((l1 (string->list (to-s a)))
(l2 (string->list (to-s b))))
(display (manuediff->string1 (manuediff l1 l2))))))
((t ls ...)
(display-inner ls to-s t))))
md))))
(define (print-modified m c1 c2)
(define (split-candidates str)
;; /a/b/c/
;; remove the first/last slash and do string-split
;; since string-tokenize is much slower
(string-split (substring str 1 (- (string-length str) 1)) #\/))
(print m " /" (manuediff->string (manuediff (split-candidates c1)
(split-candidates c2)))))
(define (print-added line)
(print open delete (escape-inner line) close))
(define (print-removed line)
(print open (escape-inner line) delete close))
(let loop ((lis1 lis1) (lis2 lis2))
(let ((l1 (if (null? lis1) #f (car lis1)))
(l2 (if (null? lis2) #f (car lis2))))
(cond ((not (or l1 l2)))
((not l1)
(print-added l2)
(loop lis1 (cdr lis2)))
((not l2)
(print-removed l1)
(loop (cdr lis1) lis2))
((string=? l1 l2)
(loop (cdr lis1) (cdr lis2)))
(else
(let-values (((m1 c1) (string-scan l1 " " 'both))
((m2 c2) (string-scan l2 " " 'both)))
(cond ((not m1) ;l1 is broken
(loop (cdr lis1) lis2))
((not m2) ;l2 is broken
(loop lis1 (cdr lis2)))
((string>? m1 m2)
(print-added l2)
(loop lis1 (cdr lis2)))
((string<? m1 m2)
(print-removed l1)
(loop (cdr lis1) lis2))
(else
(print-modified m1 c1 c2)
(loop (cdr lis1) (cdr lis2)))))))))))
(define (read-jisyo file)
(define (read-jisyo1 file)
(with-input-from-file file
(lambda ()
(with-port-locking (current-input-port)
(lambda ()
(let loop ((l (read-line))
(r '()))
(if (eof-object? l)
r
;; ignore comments and blank lines
(if (eqv? (string-ref l 0 #\;) #\;)
(loop (read-line) r)
(loop (read-line) (cons l r))))))))
:encoding "EUC-JP"))
(sort! (read-jisyo1 file)))
(define (main args)
(unless (= (length args) 3) (usage))
(with-output-conversion (current-output-port)
(lambda ()
(skkdic-diff (read-jisyo (cadr args))
(read-jisyo (caddr args))))
:encoding "EUC-JP")
0)
;; Local variables:
;; mode: scheme
;; end:
|
