diff-lcs 1.3 → 1.4.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/Contributing.md +83 -48
- data/History.md +252 -153
- data/Manifest.txt +8 -0
- data/README.rdoc +10 -10
- data/Rakefile +39 -22
- data/autotest/discover.rb +3 -1
- data/bin/htmldiff +7 -4
- data/bin/ldiff +4 -1
- data/lib/diff-lcs.rb +1 -1
- data/lib/diff/lcs.rb +184 -170
- data/lib/diff/lcs/array.rb +1 -1
- data/lib/diff/lcs/backports.rb +9 -0
- data/lib/diff/lcs/block.rb +1 -1
- data/lib/diff/lcs/callbacks.rb +15 -12
- data/lib/diff/lcs/change.rb +30 -37
- data/lib/diff/lcs/htmldiff.rb +17 -16
- data/lib/diff/lcs/hunk.rb +156 -74
- data/lib/diff/lcs/internals.rb +36 -39
- data/lib/diff/lcs/ldiff.rb +46 -42
- data/lib/diff/lcs/string.rb +1 -1
- data/spec/change_spec.rb +31 -7
- data/spec/diff_spec.rb +16 -12
- data/spec/fixtures/aX +1 -0
- data/spec/fixtures/bXaX +1 -0
- data/spec/fixtures/ldiff/output.diff +4 -0
- data/spec/fixtures/ldiff/output.diff-c +7 -0
- data/spec/fixtures/ldiff/output.diff-e +3 -0
- data/spec/fixtures/ldiff/output.diff-f +3 -0
- data/spec/fixtures/ldiff/output.diff-u +5 -0
- data/spec/hunk_spec.rb +37 -26
- data/spec/issues_spec.rb +115 -10
- data/spec/lcs_spec.rb +10 -10
- data/spec/ldiff_spec.rb +71 -31
- data/spec/patch_spec.rb +93 -99
- data/spec/sdiff_spec.rb +89 -89
- data/spec/spec_helper.rb +118 -64
- data/spec/traverse_balanced_spec.rb +173 -173
- data/spec/traverse_sequences_spec.rb +28 -28
- metadata +31 -30
data/spec/sdiff_spec.rb
CHANGED
@@ -1,214 +1,214 @@
|
|
1
|
-
#
|
1
|
+
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require 'spec_helper'
|
4
4
|
|
5
|
-
describe
|
5
|
+
describe 'Diff::LCS.sdiff' do
|
6
6
|
include Diff::LCS::SpecHelper::Matchers
|
7
7
|
|
8
|
-
shared_examples
|
9
|
-
it
|
8
|
+
shared_examples 'compare sequences correctly' do
|
9
|
+
it 'compares s1 -> s2 correctly' do
|
10
10
|
expect(Diff::LCS.sdiff(s1, s2)).to eq(context_diff(result))
|
11
11
|
end
|
12
12
|
|
13
|
-
it
|
13
|
+
it 'compares s2 -> s1 correctly' do
|
14
14
|
expect(Diff::LCS.sdiff(s2, s1)).to eq(context_diff(reverse_sdiff(result)))
|
15
15
|
end
|
16
16
|
end
|
17
17
|
|
18
|
-
describe
|
18
|
+
describe 'using seq1 & seq2' do
|
19
19
|
let(:s1) { seq1 }
|
20
20
|
let(:s2) { seq2 }
|
21
21
|
let(:result) { correct_forward_sdiff }
|
22
22
|
|
23
|
-
it_has_behavior
|
23
|
+
it_has_behavior 'compare sequences correctly'
|
24
24
|
end
|
25
25
|
|
26
|
-
describe
|
26
|
+
describe 'using %w(abc def yyy xxx ghi jkl) & %w(abc dxf xxx ghi jkl)' do
|
27
27
|
let(:s1) { %w(abc def yyy xxx ghi jkl) }
|
28
28
|
let(:s2) { %w(abc dxf xxx ghi jkl) }
|
29
29
|
let(:result) {
|
30
30
|
[
|
31
|
-
[
|
32
|
-
[
|
33
|
-
[
|
34
|
-
[
|
35
|
-
[
|
36
|
-
[
|
31
|
+
['=', [0, 'abc'], [0, 'abc']],
|
32
|
+
['!', [1, 'def'], [1, 'dxf']],
|
33
|
+
['-', [2, 'yyy'], [2, nil]],
|
34
|
+
['=', [3, 'xxx'], [2, 'xxx']],
|
35
|
+
['=', [4, 'ghi'], [3, 'ghi']],
|
36
|
+
['=', [5, 'jkl'], [4, 'jkl']]
|
37
37
|
]
|
38
38
|
}
|
39
39
|
|
40
|
-
it_has_behavior
|
40
|
+
it_has_behavior 'compare sequences correctly'
|
41
41
|
end
|
42
42
|
|
43
|
-
describe
|
43
|
+
describe 'using %w(a b c d e) & %w(a e)' do
|
44
44
|
let(:s1) { %w(a b c d e) }
|
45
45
|
let(:s2) { %w(a e) }
|
46
46
|
let(:result) {
|
47
47
|
[
|
48
|
-
[
|
49
|
-
[
|
50
|
-
[
|
51
|
-
[
|
52
|
-
[
|
48
|
+
['=', [0, 'a'], [0, 'a']],
|
49
|
+
['-', [1, 'b'], [1, nil]],
|
50
|
+
['-', [2, 'c'], [1, nil]],
|
51
|
+
['-', [3, 'd'], [1, nil]],
|
52
|
+
['=', [4, 'e'], [1, 'e']]
|
53
53
|
]
|
54
54
|
}
|
55
55
|
|
56
|
-
it_has_behavior
|
56
|
+
it_has_behavior 'compare sequences correctly'
|
57
57
|
end
|
58
58
|
|
59
|
-
describe
|
59
|
+
describe 'using %w(a e) & %w(a b c d e)' do
|
60
60
|
let(:s1) { %w(a e) }
|
61
61
|
let(:s2) { %w(a b c d e) }
|
62
62
|
let(:result) {
|
63
63
|
[
|
64
|
-
[
|
65
|
-
[
|
66
|
-
[
|
67
|
-
[
|
68
|
-
[
|
64
|
+
['=', [0, 'a'], [0, 'a']],
|
65
|
+
['+', [1, nil], [1, 'b']],
|
66
|
+
['+', [1, nil], [2, 'c']],
|
67
|
+
['+', [1, nil], [3, 'd']],
|
68
|
+
['=', [1, 'e'], [4, 'e']]
|
69
69
|
]
|
70
70
|
}
|
71
71
|
|
72
|
-
it_has_behavior
|
72
|
+
it_has_behavior 'compare sequences correctly'
|
73
73
|
end
|
74
74
|
|
75
|
-
describe
|
75
|
+
describe 'using %w(v x a e) & %w(w y a b c d e)' do
|
76
76
|
let(:s1) { %w(v x a e) }
|
77
77
|
let(:s2) { %w(w y a b c d e) }
|
78
78
|
let(:result) {
|
79
79
|
[
|
80
|
-
[
|
81
|
-
[
|
82
|
-
[
|
83
|
-
[
|
84
|
-
[
|
85
|
-
[
|
86
|
-
[
|
80
|
+
['!', [0, 'v'], [0, 'w']],
|
81
|
+
['!', [1, 'x'], [1, 'y']],
|
82
|
+
['=', [2, 'a'], [2, 'a']],
|
83
|
+
['+', [3, nil], [3, 'b']],
|
84
|
+
['+', [3, nil], [4, 'c']],
|
85
|
+
['+', [3, nil], [5, 'd']],
|
86
|
+
['=', [3, 'e'], [6, 'e']]
|
87
87
|
]
|
88
88
|
}
|
89
89
|
|
90
|
-
it_has_behavior
|
90
|
+
it_has_behavior 'compare sequences correctly'
|
91
91
|
end
|
92
92
|
|
93
|
-
describe
|
93
|
+
describe 'using %w(x a e) & %w(a b c d e)' do
|
94
94
|
let(:s1) { %w(x a e) }
|
95
95
|
let(:s2) { %w(a b c d e) }
|
96
96
|
let(:result) {
|
97
97
|
[
|
98
|
-
[
|
99
|
-
[
|
100
|
-
[
|
101
|
-
[
|
102
|
-
[
|
103
|
-
[
|
98
|
+
['-', [0, 'x'], [0, nil]],
|
99
|
+
['=', [1, 'a'], [0, 'a']],
|
100
|
+
['+', [2, nil], [1, 'b']],
|
101
|
+
['+', [2, nil], [2, 'c']],
|
102
|
+
['+', [2, nil], [3, 'd']],
|
103
|
+
['=', [2, 'e'], [4, 'e']]
|
104
104
|
]
|
105
105
|
}
|
106
106
|
|
107
|
-
it_has_behavior
|
107
|
+
it_has_behavior 'compare sequences correctly'
|
108
108
|
end
|
109
109
|
|
110
|
-
describe
|
110
|
+
describe 'using %w(a e) & %w(x a b c d e)' do
|
111
111
|
let(:s1) { %w(a e) }
|
112
112
|
let(:s2) { %w(x a b c d e) }
|
113
113
|
let(:result) {
|
114
114
|
[
|
115
|
-
[
|
116
|
-
[
|
117
|
-
[
|
118
|
-
[
|
119
|
-
[
|
120
|
-
[
|
115
|
+
['+', [0, nil], [0, 'x']],
|
116
|
+
['=', [0, 'a'], [1, 'a']],
|
117
|
+
['+', [1, nil], [2, 'b']],
|
118
|
+
['+', [1, nil], [3, 'c']],
|
119
|
+
['+', [1, nil], [4, 'd']],
|
120
|
+
['=', [1, 'e'], [5, 'e']]
|
121
121
|
]
|
122
122
|
}
|
123
123
|
|
124
|
-
it_has_behavior
|
124
|
+
it_has_behavior 'compare sequences correctly'
|
125
125
|
end
|
126
126
|
|
127
|
-
describe
|
127
|
+
describe 'using %w(a e v) & %w(x a b c d e w x)' do
|
128
128
|
let(:s1) { %w(a e v) }
|
129
129
|
let(:s2) { %w(x a b c d e w x) }
|
130
130
|
let(:result) {
|
131
131
|
[
|
132
|
-
[
|
133
|
-
[
|
134
|
-
[
|
135
|
-
[
|
136
|
-
[
|
137
|
-
[
|
138
|
-
[
|
139
|
-
[
|
132
|
+
['+', [0, nil], [0, 'x']],
|
133
|
+
['=', [0, 'a'], [1, 'a']],
|
134
|
+
['+', [1, nil], [2, 'b']],
|
135
|
+
['+', [1, nil], [3, 'c']],
|
136
|
+
['+', [1, nil], [4, 'd']],
|
137
|
+
['=', [1, 'e'], [5, 'e']],
|
138
|
+
['!', [2, 'v'], [6, 'w']],
|
139
|
+
['+', [3, nil], [7, 'x']]
|
140
140
|
]
|
141
141
|
}
|
142
142
|
|
143
|
-
it_has_behavior
|
143
|
+
it_has_behavior 'compare sequences correctly'
|
144
144
|
end
|
145
145
|
|
146
|
-
describe
|
146
|
+
describe 'using %w() & %w(a b c)' do
|
147
147
|
let(:s1) { %w() }
|
148
148
|
let(:s2) { %w(a b c) }
|
149
149
|
let(:result) {
|
150
150
|
[
|
151
|
-
[
|
152
|
-
[
|
153
|
-
[
|
151
|
+
['+', [0, nil], [0, 'a']],
|
152
|
+
['+', [0, nil], [1, 'b']],
|
153
|
+
['+', [0, nil], [2, 'c']]
|
154
154
|
]
|
155
155
|
}
|
156
156
|
|
157
|
-
it_has_behavior
|
157
|
+
it_has_behavior 'compare sequences correctly'
|
158
158
|
end
|
159
159
|
|
160
|
-
describe
|
160
|
+
describe 'using %w(a b c) & %w(1)' do
|
161
161
|
let(:s1) { %w(a b c) }
|
162
162
|
let(:s2) { %w(1) }
|
163
163
|
let(:result) {
|
164
164
|
[
|
165
|
-
[
|
166
|
-
[
|
167
|
-
[
|
165
|
+
['!', [0, 'a'], [0, '1']],
|
166
|
+
['-', [1, 'b'], [1, nil]],
|
167
|
+
['-', [2, 'c'], [1, nil]]
|
168
168
|
]
|
169
169
|
}
|
170
170
|
|
171
|
-
it_has_behavior
|
171
|
+
it_has_behavior 'compare sequences correctly'
|
172
172
|
end
|
173
173
|
|
174
|
-
describe
|
174
|
+
describe 'using %w(a b c) & %w(c)' do
|
175
175
|
let(:s1) { %w(a b c) }
|
176
176
|
let(:s2) { %w(c) }
|
177
177
|
let(:result) {
|
178
178
|
[
|
179
|
-
[
|
180
|
-
[
|
181
|
-
[
|
179
|
+
['-', [0, 'a'], [0, nil]],
|
180
|
+
['-', [1, 'b'], [0, nil]],
|
181
|
+
['=', [2, 'c'], [0, 'c']]
|
182
182
|
]
|
183
183
|
}
|
184
184
|
|
185
|
-
it_has_behavior
|
185
|
+
it_has_behavior 'compare sequences correctly'
|
186
186
|
end
|
187
187
|
|
188
|
-
describe
|
188
|
+
describe 'using %w(abcd efgh ijkl mnop) & []' do
|
189
189
|
let(:s1) { %w(abcd efgh ijkl mnop) }
|
190
190
|
let(:s2) { [] }
|
191
191
|
let(:result) {
|
192
192
|
[
|
193
|
-
[
|
194
|
-
[
|
195
|
-
[
|
196
|
-
[
|
193
|
+
['-', [0, 'abcd'], [0, nil]],
|
194
|
+
['-', [1, 'efgh'], [0, nil]],
|
195
|
+
['-', [2, 'ijkl'], [0, nil]],
|
196
|
+
['-', [3, 'mnop'], [0, nil]]
|
197
197
|
]
|
198
198
|
}
|
199
199
|
|
200
|
-
it_has_behavior
|
200
|
+
it_has_behavior 'compare sequences correctly'
|
201
201
|
end
|
202
202
|
|
203
|
-
describe
|
204
|
-
let(:s1) { [
|
203
|
+
describe 'using [[1,2]] & []' do
|
204
|
+
let(:s1) { [[1, 2]] }
|
205
205
|
let(:s2) { [] }
|
206
206
|
let(:result) {
|
207
207
|
[
|
208
|
-
[
|
208
|
+
['-', [0, [1, 2]], [0, nil]]
|
209
209
|
]
|
210
210
|
}
|
211
211
|
|
212
|
-
it_has_behavior
|
212
|
+
it_has_behavior 'compare sequences correctly'
|
213
213
|
end
|
214
214
|
end
|
data/spec/spec_helper.rb
CHANGED
@@ -1,23 +1,21 @@
|
|
1
|
-
#
|
1
|
+
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require 'rubygems'
|
4
4
|
require 'pathname'
|
5
|
-
require 'psych'
|
6
5
|
|
7
|
-
if
|
8
|
-
|
9
|
-
|
10
|
-
elsif ENV['COVERAGE']
|
6
|
+
require 'psych' if RUBY_VERSION >= '1.9'
|
7
|
+
|
8
|
+
if ENV['COVERAGE']
|
11
9
|
require 'simplecov'
|
12
10
|
|
13
|
-
def require_do(resource
|
11
|
+
def require_do(resource)
|
14
12
|
require resource
|
15
|
-
|
13
|
+
yield if block_given?
|
16
14
|
rescue LoadError
|
17
15
|
nil
|
18
16
|
end
|
19
17
|
|
20
|
-
formatters = [
|
18
|
+
formatters = [SimpleCov::Formatter::HTMLFormatter]
|
21
19
|
|
22
20
|
require_do('simplecov-rcov') {
|
23
21
|
formatters << SimpleCov::Formatter::RcovFormatter
|
@@ -40,15 +38,48 @@ parent = path.parent
|
|
40
38
|
|
41
39
|
$:.unshift parent.join('lib')
|
42
40
|
|
41
|
+
module CaptureSubprocessIO
|
42
|
+
def _synchronize
|
43
|
+
yield
|
44
|
+
end
|
45
|
+
|
46
|
+
def capture_subprocess_io
|
47
|
+
_synchronize { _capture_subprocess_io { yield } }
|
48
|
+
end
|
49
|
+
|
50
|
+
def _capture_subprocess_io
|
51
|
+
require 'tempfile'
|
52
|
+
|
53
|
+
captured_stdout, captured_stderr = Tempfile.new('out'), Tempfile.new('err')
|
54
|
+
|
55
|
+
orig_stdout, orig_stderr = $stdout.dup, $stderr.dup
|
56
|
+
$stdout.reopen captured_stdout
|
57
|
+
$stderr.reopen captured_stderr
|
58
|
+
|
59
|
+
yield
|
60
|
+
|
61
|
+
$stdout.rewind
|
62
|
+
$stderr.rewind
|
63
|
+
|
64
|
+
[captured_stdout.read, captured_stderr.read]
|
65
|
+
ensure
|
66
|
+
captured_stdout.unlink
|
67
|
+
captured_stderr.unlink
|
68
|
+
$stdout.reopen orig_stdout
|
69
|
+
$stderr.reopen orig_stderr
|
70
|
+
end
|
71
|
+
private :_capture_subprocess_io
|
72
|
+
end
|
73
|
+
|
43
74
|
require 'diff-lcs'
|
44
75
|
|
45
76
|
module Diff::LCS::SpecHelper
|
46
77
|
def hello
|
47
|
-
|
78
|
+
'hello'
|
48
79
|
end
|
49
80
|
|
50
81
|
def hello_ary
|
51
|
-
%
|
82
|
+
%w(h e l l o)
|
52
83
|
end
|
53
84
|
|
54
85
|
def seq1
|
@@ -77,50 +108,69 @@ module Diff::LCS::SpecHelper
|
|
77
108
|
|
78
109
|
def correct_forward_diff
|
79
110
|
[
|
80
|
-
[
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
[
|
88
|
-
[
|
89
|
-
|
111
|
+
[
|
112
|
+
['-', 0, 'a']
|
113
|
+
],
|
114
|
+
[
|
115
|
+
['+', 2, 'd']
|
116
|
+
],
|
117
|
+
[
|
118
|
+
['-', 4, 'h'],
|
119
|
+
['+', 4, 'f']
|
120
|
+
],
|
121
|
+
[
|
122
|
+
['+', 6, 'k']
|
123
|
+
],
|
124
|
+
[
|
125
|
+
['-', 8, 'n'],
|
126
|
+
['-', 9, 'p'],
|
127
|
+
['+', 9, 'r'],
|
128
|
+
['+', 10, 's'],
|
129
|
+
['+', 11, 't']
|
130
|
+
]
|
90
131
|
]
|
91
132
|
end
|
92
133
|
|
93
134
|
def correct_backward_diff
|
94
135
|
[
|
95
|
-
[ [ '+', 0, 'a' ] ],
|
96
|
-
[ [ '-', 2, 'd' ] ],
|
97
|
-
[ [ '-', 4, 'f' ],
|
98
|
-
[ '+', 4, 'h' ] ],
|
99
|
-
[ [ '-', 6, 'k' ] ],
|
100
136
|
[
|
101
|
-
[
|
102
|
-
|
103
|
-
|
104
|
-
[
|
105
|
-
|
137
|
+
['+', 0, 'a']
|
138
|
+
],
|
139
|
+
[
|
140
|
+
['-', 2, 'd']
|
141
|
+
],
|
142
|
+
[
|
143
|
+
['-', 4, 'f'],
|
144
|
+
['+', 4, 'h']
|
145
|
+
],
|
146
|
+
[
|
147
|
+
['-', 6, 'k']
|
148
|
+
],
|
149
|
+
[
|
150
|
+
['-', 9, 'r'],
|
151
|
+
['-', 10, 's'],
|
152
|
+
['+', 8, 'n'],
|
153
|
+
['-', 11, 't'],
|
154
|
+
['+', 9, 'p']
|
155
|
+
]
|
106
156
|
]
|
107
157
|
end
|
108
158
|
|
109
159
|
def correct_forward_sdiff
|
110
160
|
[
|
111
|
-
[
|
112
|
-
[
|
113
|
-
[
|
114
|
-
[
|
115
|
-
[
|
116
|
-
[
|
117
|
-
[
|
118
|
-
[
|
119
|
-
[
|
120
|
-
[
|
121
|
-
[
|
122
|
-
[
|
123
|
-
[
|
161
|
+
['-', [0, 'a'], [0, nil]],
|
162
|
+
['=', [1, 'b'], [0, 'b']],
|
163
|
+
['=', [2, 'c'], [1, 'c']],
|
164
|
+
['+', [3, nil], [2, 'd']],
|
165
|
+
['=', [3, 'e'], [3, 'e']],
|
166
|
+
['!', [4, 'h'], [4, 'f']],
|
167
|
+
['=', [5, 'j'], [5, 'j']],
|
168
|
+
['+', [6, nil], [6, 'k']],
|
169
|
+
['=', [6, 'l'], [7, 'l']],
|
170
|
+
['=', [7, 'm'], [8, 'm']],
|
171
|
+
['!', [8, 'n'], [9, 'r']],
|
172
|
+
['!', [9, 'p'], [10, 's']],
|
173
|
+
['+', [10, nil], [11, 't']]
|
124
174
|
]
|
125
175
|
end
|
126
176
|
|
@@ -144,13 +194,13 @@ module Diff::LCS::SpecHelper
|
|
144
194
|
end
|
145
195
|
|
146
196
|
def format_diffs(diffs)
|
147
|
-
diffs.map
|
197
|
+
diffs.map { |e|
|
148
198
|
if e.kind_of?(Array)
|
149
|
-
e.map { |f| f.to_a.join }.join(
|
199
|
+
e.map { |f| f.to_a.join }.join(', ')
|
150
200
|
else
|
151
201
|
e.to_a.join
|
152
202
|
end
|
153
|
-
|
203
|
+
}.join("\n")
|
154
204
|
end
|
155
205
|
|
156
206
|
def map_diffs(diffs, klass = Diff::LCS::ContextChange)
|
@@ -171,8 +221,8 @@ module Diff::LCS::SpecHelper
|
|
171
221
|
|
172
222
|
def balanced_reverse(change_result)
|
173
223
|
new_result = []
|
174
|
-
change_result.each
|
175
|
-
line = [
|
224
|
+
change_result.each do |line|
|
225
|
+
line = [line[0], line[2], line[1]]
|
176
226
|
case line[0]
|
177
227
|
when '<'
|
178
228
|
line[0] = '>'
|
@@ -180,21 +230,21 @@ module Diff::LCS::SpecHelper
|
|
180
230
|
line[0] = '<'
|
181
231
|
end
|
182
232
|
new_result << line
|
183
|
-
|
184
|
-
new_result.sort_by { |line| [
|
233
|
+
end
|
234
|
+
new_result.sort_by { |line| [line[1], line[2]] }
|
185
235
|
end
|
186
236
|
|
187
237
|
def map_to_no_change(change_result)
|
188
238
|
new_result = []
|
189
|
-
change_result.each
|
239
|
+
change_result.each do |line|
|
190
240
|
case line[0]
|
191
241
|
when '!'
|
192
|
-
new_result << [
|
193
|
-
new_result << [
|
242
|
+
new_result << ['<', line[1], line[2]]
|
243
|
+
new_result << ['>', line[1] + 1, line[2]]
|
194
244
|
else
|
195
245
|
new_result << line
|
196
246
|
end
|
197
|
-
|
247
|
+
end
|
198
248
|
new_result
|
199
249
|
end
|
200
250
|
|
@@ -231,14 +281,18 @@ module Diff::LCS::SpecHelper
|
|
231
281
|
end
|
232
282
|
|
233
283
|
def finished_a(event)
|
234
|
-
@done_a << [
|
235
|
-
event.
|
284
|
+
@done_a << [
|
285
|
+
event.old_element, event.old_position,
|
286
|
+
event.new_element, event.new_position
|
287
|
+
]
|
236
288
|
end
|
237
289
|
|
238
290
|
def finished_b(event)
|
239
|
-
p
|
240
|
-
@done_b << [
|
241
|
-
event.
|
291
|
+
p 'called #finished_b'
|
292
|
+
@done_b << [
|
293
|
+
event.old_element, event.old_position,
|
294
|
+
event.new_element, event.new_position
|
295
|
+
]
|
242
296
|
end
|
243
297
|
end
|
244
298
|
callbacks.reset
|
@@ -264,19 +318,19 @@ module Diff::LCS::SpecHelper
|
|
264
318
|
end
|
265
319
|
|
266
320
|
def match(event)
|
267
|
-
@result << [
|
321
|
+
@result << ['=', event.old_position, event.new_position]
|
268
322
|
end
|
269
323
|
|
270
324
|
def discard_a(event)
|
271
|
-
@result << [
|
325
|
+
@result << ['<', event.old_position, event.new_position]
|
272
326
|
end
|
273
327
|
|
274
328
|
def discard_b(event)
|
275
|
-
@result << [
|
329
|
+
@result << ['>', event.old_position, event.new_position]
|
276
330
|
end
|
277
331
|
|
278
332
|
def change(event)
|
279
|
-
@result << [
|
333
|
+
@result << ['!', event.old_position, event.new_position]
|
280
334
|
end
|
281
335
|
end
|
282
336
|
cb.reset
|