1 fe621944 2020-11-10 stsp /* Produce a unidiff output from a diff_result. */
3 fe621944 2020-11-10 stsp * Copyright (c) 2020 Neels Hofmeyr <neels@hofmeyr.de>
5 fe621944 2020-11-10 stsp * Permission to use, copy, modify, and distribute this software for any
6 fe621944 2020-11-10 stsp * purpose with or without fee is hereby granted, provided that the above
7 fe621944 2020-11-10 stsp * copyright notice and this permission notice appear in all copies.
9 fe621944 2020-11-10 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 fe621944 2020-11-10 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 fe621944 2020-11-10 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 fe621944 2020-11-10 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 fe621944 2020-11-10 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 fe621944 2020-11-10 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 fe621944 2020-11-10 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 fe621944 2020-11-10 stsp #include <errno.h>
19 fe621944 2020-11-10 stsp #include <stdbool.h>
20 f3c44083 2020-11-14 naddy #include <stdint.h>
21 fe621944 2020-11-10 stsp #include <stdio.h>
22 fe621944 2020-11-10 stsp #include <stdlib.h>
23 fe621944 2020-11-10 stsp #include <assert.h>
25 fe621944 2020-11-10 stsp #include <arraylist.h>
26 fe621944 2020-11-10 stsp #include <diff_main.h>
27 fe621944 2020-11-10 stsp #include <diff_output.h>
29 fe621944 2020-11-10 stsp #include "diff_internal.h"
30 fe621944 2020-11-10 stsp #include "diff_debug.h"
33 fe621944 2020-11-10 stsp diff_chunk_context_empty(const struct diff_chunk_context *cc)
35 fe621944 2020-11-10 stsp return diff_range_empty(&cc->chunk);
39 fe621944 2020-11-10 stsp diff_chunk_get_left_start(const struct diff_chunk *c,
40 fe621944 2020-11-10 stsp const struct diff_result *r, int context_lines)
42 fe621944 2020-11-10 stsp int left_start = diff_atom_root_idx(r->left, c->left_start);
43 fe621944 2020-11-10 stsp return MAX(0, left_start - context_lines);
47 fe621944 2020-11-10 stsp diff_chunk_get_left_end(const struct diff_chunk *c,
48 fe621944 2020-11-10 stsp const struct diff_result *r, int context_lines)
50 fe621944 2020-11-10 stsp int left_start = diff_chunk_get_left_start(c, r, 0);
51 fe621944 2020-11-10 stsp return MIN(r->left->atoms.len,
52 fe621944 2020-11-10 stsp left_start + c->left_count + context_lines);
56 fe621944 2020-11-10 stsp diff_chunk_get_right_start(const struct diff_chunk *c,
57 fe621944 2020-11-10 stsp const struct diff_result *r, int context_lines)
59 fe621944 2020-11-10 stsp int right_start = diff_atom_root_idx(r->right, c->right_start);
60 fe621944 2020-11-10 stsp return MAX(0, right_start - context_lines);
64 fe621944 2020-11-10 stsp diff_chunk_get_right_end(const struct diff_chunk *c,
65 fe621944 2020-11-10 stsp const struct diff_result *r, int context_lines)
67 fe621944 2020-11-10 stsp int right_start = diff_chunk_get_right_start(c, r, 0);
68 fe621944 2020-11-10 stsp return MIN(r->right->atoms.len,
69 fe621944 2020-11-10 stsp right_start + c->right_count + context_lines);
72 fe621944 2020-11-10 stsp struct diff_chunk *
73 fe621944 2020-11-10 stsp diff_chunk_get(const struct diff_result *r, int chunk_idx)
75 fe621944 2020-11-10 stsp return &r->chunks.head[chunk_idx];
79 fe621944 2020-11-10 stsp diff_chunk_get_left_count(struct diff_chunk *c)
81 fe621944 2020-11-10 stsp return c->left_count;
85 fe621944 2020-11-10 stsp diff_chunk_get_right_count(struct diff_chunk *c)
87 fe621944 2020-11-10 stsp return c->right_count;
91 fe621944 2020-11-10 stsp diff_chunk_context_get(struct diff_chunk_context *cc, const struct diff_result *r,
92 fe621944 2020-11-10 stsp int chunk_idx, int context_lines)
94 fe621944 2020-11-10 stsp const struct diff_chunk *c = &r->chunks.head[chunk_idx];
95 fe621944 2020-11-10 stsp int left_start = diff_chunk_get_left_start(c, r, context_lines);
96 fe621944 2020-11-10 stsp int left_end = diff_chunk_get_left_end(c, r, context_lines);
97 fe621944 2020-11-10 stsp int right_start = diff_chunk_get_right_start(c, r, context_lines);
98 fe621944 2020-11-10 stsp int right_end = diff_chunk_get_right_end(c, r, context_lines);
100 fe621944 2020-11-10 stsp *cc = (struct diff_chunk_context){
102 fe621944 2020-11-10 stsp .start = chunk_idx,
103 fe621944 2020-11-10 stsp .end = chunk_idx + 1,
106 fe621944 2020-11-10 stsp .start = left_start,
107 fe621944 2020-11-10 stsp .end = left_end,
110 fe621944 2020-11-10 stsp .start = right_start,
111 fe621944 2020-11-10 stsp .end = right_end,
117 fe621944 2020-11-10 stsp diff_chunk_contexts_touch(const struct diff_chunk_context *cc,
118 fe621944 2020-11-10 stsp const struct diff_chunk_context *other)
120 fe621944 2020-11-10 stsp return diff_ranges_touch(&cc->chunk, &other->chunk)
121 fe621944 2020-11-10 stsp || diff_ranges_touch(&cc->left, &other->left)
122 fe621944 2020-11-10 stsp || diff_ranges_touch(&cc->right, &other->right);
126 fe621944 2020-11-10 stsp diff_chunk_contexts_merge(struct diff_chunk_context *cc,
127 fe621944 2020-11-10 stsp const struct diff_chunk_context *other)
129 fe621944 2020-11-10 stsp diff_ranges_merge(&cc->chunk, &other->chunk);
130 fe621944 2020-11-10 stsp diff_ranges_merge(&cc->left, &other->left);
131 fe621944 2020-11-10 stsp diff_ranges_merge(&cc->right, &other->right);
135 fe621944 2020-11-10 stsp diff_chunk_context_load_change(struct diff_chunk_context *cc,
136 fe621944 2020-11-10 stsp int *nchunks_used,
137 fe621944 2020-11-10 stsp struct diff_result *result,
138 fe621944 2020-11-10 stsp int start_chunk_idx,
139 fe621944 2020-11-10 stsp int context_lines)
142 fe621944 2020-11-10 stsp int seen_minus = 0, seen_plus = 0;
144 fe621944 2020-11-10 stsp if (nchunks_used)
145 fe621944 2020-11-10 stsp *nchunks_used = 0;
147 fe621944 2020-11-10 stsp for (i = start_chunk_idx; i < result->chunks.len; i++) {
148 fe621944 2020-11-10 stsp struct diff_chunk *chunk = &result->chunks.head[i];
149 fe621944 2020-11-10 stsp enum diff_chunk_type t = diff_chunk_type(chunk);
150 fe621944 2020-11-10 stsp struct diff_chunk_context next;
152 fe621944 2020-11-10 stsp if (t != CHUNK_MINUS && t != CHUNK_PLUS) {
153 fe621944 2020-11-10 stsp if (nchunks_used)
154 fe621944 2020-11-10 stsp (*nchunks_used)++;
155 fe621944 2020-11-10 stsp if (seen_minus || seen_plus)
159 fe621944 2020-11-10 stsp } else if (t == CHUNK_MINUS)
160 fe621944 2020-11-10 stsp seen_minus = 1;
161 fe621944 2020-11-10 stsp else if (t == CHUNK_PLUS)
162 fe621944 2020-11-10 stsp seen_plus = 1;
164 fe621944 2020-11-10 stsp if (diff_chunk_context_empty(cc)) {
165 fe621944 2020-11-10 stsp /* Note down the start point, any number of subsequent
166 fe621944 2020-11-10 stsp * chunks may be joined up to this chunk by being
167 fe621944 2020-11-10 stsp * directly adjacent. */
168 fe621944 2020-11-10 stsp diff_chunk_context_get(cc, result, i, context_lines);
169 fe621944 2020-11-10 stsp if (nchunks_used)
170 fe621944 2020-11-10 stsp (*nchunks_used)++;
174 fe621944 2020-11-10 stsp /* There already is a previous chunk noted down for being
175 fe621944 2020-11-10 stsp * printed. Does it join up with this one? */
176 fe621944 2020-11-10 stsp diff_chunk_context_get(&next, result, i, context_lines);
178 fe621944 2020-11-10 stsp if (diff_chunk_contexts_touch(cc, &next)) {
179 fe621944 2020-11-10 stsp /* This next context touches or overlaps the previous
180 fe621944 2020-11-10 stsp * one, join. */
181 fe621944 2020-11-10 stsp diff_chunk_contexts_merge(cc, &next);
182 fe621944 2020-11-10 stsp if (nchunks_used)
183 fe621944 2020-11-10 stsp (*nchunks_used)++;
190 fe621944 2020-11-10 stsp struct diff_output_unidiff_state {
191 fe621944 2020-11-10 stsp bool header_printed;
194 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *
195 fe621944 2020-11-10 stsp diff_output_unidiff_state_alloc(void)
197 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *state;
199 fe621944 2020-11-10 stsp state = calloc(1, sizeof(struct diff_output_unidiff_state));
200 fe621944 2020-11-10 stsp if (state != NULL)
201 fe621944 2020-11-10 stsp diff_output_unidiff_state_reset(state);
202 fe621944 2020-11-10 stsp return state;
206 fe621944 2020-11-10 stsp diff_output_unidiff_state_reset(struct diff_output_unidiff_state *state)
208 fe621944 2020-11-10 stsp state->header_printed = false;
212 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(struct diff_output_unidiff_state *state)
214 fe621944 2020-11-10 stsp free(state);
218 fe621944 2020-11-10 stsp output_unidiff_chunk(struct diff_output_info *outinfo, FILE *dest,
219 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *state,
220 fe621944 2020-11-10 stsp const struct diff_input_info *info,
221 fe621944 2020-11-10 stsp const struct diff_result *result,
222 fe621944 2020-11-10 stsp bool print_header, bool show_function_prototypes,
223 fe621944 2020-11-10 stsp const struct diff_chunk_context *cc)
225 fe621944 2020-11-10 stsp int rc, left_start, left_len, right_start, right_len;
226 fe621944 2020-11-10 stsp off_t outoff = 0, *offp;
227 fe621944 2020-11-10 stsp char *prototype = NULL;
229 fe621944 2020-11-10 stsp if (diff_range_empty(&cc->left) && diff_range_empty(&cc->right))
230 fe621944 2020-11-10 stsp return DIFF_RC_OK;
232 fe621944 2020-11-10 stsp if (outinfo && outinfo->line_offsets.len > 0) {
233 fe621944 2020-11-10 stsp unsigned int idx = outinfo->line_offsets.len - 1;
234 fe621944 2020-11-10 stsp outoff = outinfo->line_offsets.head[idx];
237 fe621944 2020-11-10 stsp if (print_header && !(state->header_printed)) {
238 fe621944 2020-11-10 stsp rc = fprintf(dest, "--- %s\n", info->left_path ? : "a");
239 fe621944 2020-11-10 stsp if (rc < 0)
240 fe621944 2020-11-10 stsp return errno;
241 fe621944 2020-11-10 stsp if (outinfo) {
242 fe621944 2020-11-10 stsp ARRAYLIST_ADD(offp, outinfo->line_offsets);
243 fe621944 2020-11-10 stsp if (offp == NULL)
244 fe621944 2020-11-10 stsp return ENOMEM;
245 fe621944 2020-11-10 stsp outoff += rc;
246 fe621944 2020-11-10 stsp *offp = outoff;
249 fe621944 2020-11-10 stsp rc = fprintf(dest, "+++ %s\n", info->right_path ? : "b");
250 fe621944 2020-11-10 stsp if (rc < 0)
251 fe621944 2020-11-10 stsp return errno;
252 fe621944 2020-11-10 stsp if (outinfo) {
253 fe621944 2020-11-10 stsp ARRAYLIST_ADD(offp, outinfo->line_offsets);
254 fe621944 2020-11-10 stsp if (offp == NULL)
255 fe621944 2020-11-10 stsp return ENOMEM;
256 fe621944 2020-11-10 stsp outoff += rc;
257 fe621944 2020-11-10 stsp *offp = outoff;
260 fe621944 2020-11-10 stsp state->header_printed = true;
263 fe621944 2020-11-10 stsp left_len = cc->left.end - cc->left.start;
264 fe621944 2020-11-10 stsp if (result->left->atoms.len == 0)
265 fe621944 2020-11-10 stsp left_start = 0;
266 fe621944 2020-11-10 stsp else if (left_len == 0 && cc->left.start > 0)
267 fe621944 2020-11-10 stsp left_start = cc->left.start;
269 fe621944 2020-11-10 stsp left_start = cc->left.start + 1;
271 fe621944 2020-11-10 stsp right_len = cc->right.end - cc->right.start;
272 fe621944 2020-11-10 stsp if (result->right->atoms.len == 0)
273 fe621944 2020-11-10 stsp right_start = 0;
274 fe621944 2020-11-10 stsp else if (right_len == 0 && cc->right.start > 0)
275 fe621944 2020-11-10 stsp right_start = cc->right.start;
277 fe621944 2020-11-10 stsp right_start = cc->right.start + 1;
279 fe621944 2020-11-10 stsp if (show_function_prototypes) {
280 fe621944 2020-11-10 stsp rc = diff_output_match_function_prototype(&prototype,
281 fe621944 2020-11-10 stsp result, cc);
286 fe621944 2020-11-10 stsp if (left_len == 1 && right_len == 1) {
287 fe621944 2020-11-10 stsp rc = fprintf(dest, "@@ -%d +%d @@%s%s\n",
288 fe621944 2020-11-10 stsp left_start, right_start,
289 fe621944 2020-11-10 stsp prototype ? " " : "",
290 fe621944 2020-11-10 stsp prototype ? : "");
291 fe621944 2020-11-10 stsp } else if (left_len == 1 && right_len != 1) {
292 fe621944 2020-11-10 stsp rc = fprintf(dest, "@@ -%d +%d,%d @@%s%s\n",
293 fe621944 2020-11-10 stsp left_start, right_start, right_len,
294 fe621944 2020-11-10 stsp prototype ? " " : "",
295 fe621944 2020-11-10 stsp prototype ? : "");
296 fe621944 2020-11-10 stsp } else if (left_len != 1 && right_len == 1) {
297 fe621944 2020-11-10 stsp rc = fprintf(dest, "@@ -%d,%d +%d @@%s%s\n",
298 fe621944 2020-11-10 stsp left_start, left_len, right_start,
299 fe621944 2020-11-10 stsp prototype ? " " : "",
300 fe621944 2020-11-10 stsp prototype ? : "");
302 fe621944 2020-11-10 stsp rc = fprintf(dest, "@@ -%d,%d +%d,%d @@%s%s\n",
303 fe621944 2020-11-10 stsp left_start, left_len, right_start, right_len,
304 fe621944 2020-11-10 stsp prototype ? " " : "",
305 fe621944 2020-11-10 stsp prototype ? : "");
307 fe621944 2020-11-10 stsp free(prototype);
308 fe621944 2020-11-10 stsp if (rc < 0)
309 fe621944 2020-11-10 stsp return errno;
310 fe621944 2020-11-10 stsp if (outinfo) {
311 fe621944 2020-11-10 stsp ARRAYLIST_ADD(offp, outinfo->line_offsets);
312 fe621944 2020-11-10 stsp if (offp == NULL)
313 fe621944 2020-11-10 stsp return ENOMEM;
314 fe621944 2020-11-10 stsp outoff += rc;
315 fe621944 2020-11-10 stsp *offp = outoff;
319 fe621944 2020-11-10 stsp /* Got the absolute line numbers where to start printing, and the index
320 fe621944 2020-11-10 stsp * of the interesting (non-context) chunk.
321 fe621944 2020-11-10 stsp * To print context lines above the interesting chunk, nipping on the
322 fe621944 2020-11-10 stsp * previous chunk index may be necessary.
323 fe621944 2020-11-10 stsp * It is guaranteed to be only context lines where left == right, so it
324 fe621944 2020-11-10 stsp * suffices to look on the left. */
325 fe621944 2020-11-10 stsp const struct diff_chunk *first_chunk;
326 fe621944 2020-11-10 stsp int chunk_start_line;
327 fe621944 2020-11-10 stsp first_chunk = &result->chunks.head[cc->chunk.start];
328 fe621944 2020-11-10 stsp chunk_start_line = diff_atom_root_idx(result->left,
329 fe621944 2020-11-10 stsp first_chunk->left_start);
330 fe621944 2020-11-10 stsp if (cc->left.start < chunk_start_line) {
331 fe621944 2020-11-10 stsp rc = diff_output_lines(outinfo, dest, " ",
332 fe621944 2020-11-10 stsp &result->left->atoms.head[cc->left.start],
333 fe621944 2020-11-10 stsp chunk_start_line - cc->left.start);
338 fe621944 2020-11-10 stsp /* Now write out all the joined chunks and contexts between them */
340 fe621944 2020-11-10 stsp for (c_idx = cc->chunk.start; c_idx < cc->chunk.end; c_idx++) {
341 fe621944 2020-11-10 stsp const struct diff_chunk *c = &result->chunks.head[c_idx];
343 fe621944 2020-11-10 stsp if (c->left_count && c->right_count)
344 fe621944 2020-11-10 stsp rc = diff_output_lines(outinfo, dest,
345 fe621944 2020-11-10 stsp c->solved ? " " : "?",
346 fe621944 2020-11-10 stsp c->left_start, c->left_count);
347 fe621944 2020-11-10 stsp else if (c->left_count && !c->right_count)
348 fe621944 2020-11-10 stsp rc = diff_output_lines(outinfo, dest,
349 fe621944 2020-11-10 stsp c->solved ? "-" : "?",
350 fe621944 2020-11-10 stsp c->left_start, c->left_count);
351 fe621944 2020-11-10 stsp else if (c->right_count && !c->left_count)
352 fe621944 2020-11-10 stsp rc = diff_output_lines(outinfo, dest,
353 fe621944 2020-11-10 stsp c->solved ? "+" : "?",
354 fe621944 2020-11-10 stsp c->right_start, c->right_count);
358 fe621944 2020-11-10 stsp if (cc->chunk.end == result->chunks.len) {
359 fe621944 2020-11-10 stsp rc = diff_output_trailing_newline_msg(outinfo, dest, c);
360 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK)
365 fe621944 2020-11-10 stsp /* Trailing context? */
366 fe621944 2020-11-10 stsp const struct diff_chunk *last_chunk;
367 fe621944 2020-11-10 stsp int chunk_end_line;
368 fe621944 2020-11-10 stsp last_chunk = &result->chunks.head[cc->chunk.end - 1];
369 fe621944 2020-11-10 stsp chunk_end_line = diff_atom_root_idx(result->left,
370 fe621944 2020-11-10 stsp last_chunk->left_start
371 fe621944 2020-11-10 stsp + last_chunk->left_count);
372 fe621944 2020-11-10 stsp if (cc->left.end > chunk_end_line) {
373 fe621944 2020-11-10 stsp rc = diff_output_lines(outinfo, dest, " ",
374 fe621944 2020-11-10 stsp &result->left->atoms.head[chunk_end_line],
375 fe621944 2020-11-10 stsp cc->left.end - chunk_end_line);
380 fe621944 2020-11-10 stsp return DIFF_RC_OK;
384 fe621944 2020-11-10 stsp diff_output_unidiff_chunk(struct diff_output_info **output_info, FILE *dest,
385 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *state,
386 fe621944 2020-11-10 stsp const struct diff_input_info *info,
387 fe621944 2020-11-10 stsp const struct diff_result *result,
388 fe621944 2020-11-10 stsp const struct diff_chunk_context *cc)
390 fe621944 2020-11-10 stsp struct diff_output_info *outinfo = NULL;
391 fe621944 2020-11-10 stsp int flags = (result->left->root->diff_flags |
392 fe621944 2020-11-10 stsp result->right->root->diff_flags);
393 fe621944 2020-11-10 stsp bool show_function_prototypes = (flags & DIFF_FLAG_SHOW_PROTOTYPES);
395 fe621944 2020-11-10 stsp if (output_info) {
396 fe621944 2020-11-10 stsp *output_info = diff_output_info_alloc();
397 fe621944 2020-11-10 stsp if (*output_info == NULL)
398 fe621944 2020-11-10 stsp return ENOMEM;
399 fe621944 2020-11-10 stsp outinfo = *output_info;
402 fe621944 2020-11-10 stsp return output_unidiff_chunk(outinfo, dest, state, info,
403 fe621944 2020-11-10 stsp result, false, show_function_prototypes, cc);
407 fe621944 2020-11-10 stsp diff_output_unidiff(struct diff_output_info **output_info,
408 fe621944 2020-11-10 stsp FILE *dest, const struct diff_input_info *info,
409 fe621944 2020-11-10 stsp const struct diff_result *result,
410 fe621944 2020-11-10 stsp unsigned int context_lines)
412 fe621944 2020-11-10 stsp struct diff_output_unidiff_state *state;
413 fe621944 2020-11-10 stsp struct diff_chunk_context cc = {};
414 fe621944 2020-11-10 stsp struct diff_output_info *outinfo = NULL;
415 fe621944 2020-11-10 stsp int flags = (result->left->root->diff_flags |
416 fe621944 2020-11-10 stsp result->right->root->diff_flags);
417 fe621944 2020-11-10 stsp bool show_function_prototypes = (flags & DIFF_FLAG_SHOW_PROTOTYPES);
420 fe621944 2020-11-10 stsp if (!result)
421 fe621944 2020-11-10 stsp return EINVAL;
422 fe621944 2020-11-10 stsp if (result->rc != DIFF_RC_OK)
423 fe621944 2020-11-10 stsp return result->rc;
425 fe621944 2020-11-10 stsp if (output_info) {
426 fe621944 2020-11-10 stsp *output_info = diff_output_info_alloc();
427 fe621944 2020-11-10 stsp if (*output_info == NULL)
428 fe621944 2020-11-10 stsp return ENOMEM;
429 fe621944 2020-11-10 stsp outinfo = *output_info;
432 fe621944 2020-11-10 stsp state = diff_output_unidiff_state_alloc();
433 fe621944 2020-11-10 stsp if (state == NULL) {
434 fe621944 2020-11-10 stsp if (output_info) {
435 fe621944 2020-11-10 stsp diff_output_info_free(*output_info);
436 fe621944 2020-11-10 stsp *output_info = NULL;
438 fe621944 2020-11-10 stsp return ENOMEM;
442 fe621944 2020-11-10 stsp unsigned int check_left_pos, check_right_pos;
443 fe621944 2020-11-10 stsp check_left_pos = 0;
444 fe621944 2020-11-10 stsp check_right_pos = 0;
445 fe621944 2020-11-10 stsp for (i = 0; i < result->chunks.len; i++) {
446 fe621944 2020-11-10 stsp struct diff_chunk *c = &result->chunks.head[i];
447 fe621944 2020-11-10 stsp enum diff_chunk_type t = diff_chunk_type(c);
449 fe621944 2020-11-10 stsp debug("[%d] %s lines L%d R%d @L %d @R %d\n",
450 fe621944 2020-11-10 stsp i, (t == CHUNK_MINUS ? "minus" :
451 fe621944 2020-11-10 stsp (t == CHUNK_PLUS ? "plus" :
452 fe621944 2020-11-10 stsp (t == CHUNK_SAME ? "same" : "?"))),
453 fe621944 2020-11-10 stsp c->left_count,
454 fe621944 2020-11-10 stsp c->right_count,
455 fe621944 2020-11-10 stsp c->left_start ? diff_atom_root_idx(result->left, c->left_start) : -1,
456 fe621944 2020-11-10 stsp c->right_start ? diff_atom_root_idx(result->right, c->right_start) : -1);
457 fe621944 2020-11-10 stsp assert(check_left_pos == diff_atom_root_idx(result->left, c->left_start));
458 fe621944 2020-11-10 stsp assert(check_right_pos == diff_atom_root_idx(result->right, c->right_start));
459 fe621944 2020-11-10 stsp check_left_pos += c->left_count;
460 fe621944 2020-11-10 stsp check_right_pos += c->right_count;
463 fe621944 2020-11-10 stsp assert(check_left_pos == result->left->atoms.len);
464 fe621944 2020-11-10 stsp assert(check_right_pos == result->right->atoms.len);
467 fe621944 2020-11-10 stsp for (i = 0; i < result->chunks.len; i++) {
468 fe621944 2020-11-10 stsp struct diff_chunk *c = &result->chunks.head[i];
469 fe621944 2020-11-10 stsp enum diff_chunk_type t = diff_chunk_type(c);
470 fe621944 2020-11-10 stsp struct diff_chunk_context next;
472 fe621944 2020-11-10 stsp if (t != CHUNK_MINUS && t != CHUNK_PLUS)
475 fe621944 2020-11-10 stsp if (diff_chunk_context_empty(&cc)) {
476 fe621944 2020-11-10 stsp /* These are the first lines being printed.
477 fe621944 2020-11-10 stsp * Note down the start point, any number of subsequent
478 fe621944 2020-11-10 stsp * chunks may be joined up to this unidiff chunk by
479 fe621944 2020-11-10 stsp * context lines or by being directly adjacent. */
480 fe621944 2020-11-10 stsp diff_chunk_context_get(&cc, result, i, context_lines);
481 fe621944 2020-11-10 stsp debug("new chunk to be printed:"
482 fe621944 2020-11-10 stsp " chunk %d-%d left %d-%d right %d-%d\n",
483 fe621944 2020-11-10 stsp cc.chunk.start, cc.chunk.end,
484 fe621944 2020-11-10 stsp cc.left.start, cc.left.end,
485 fe621944 2020-11-10 stsp cc.right.start, cc.right.end);
489 fe621944 2020-11-10 stsp /* There already is a previous chunk noted down for being
490 fe621944 2020-11-10 stsp * printed. Does it join up with this one? */
491 fe621944 2020-11-10 stsp diff_chunk_context_get(&next, result, i, context_lines);
492 fe621944 2020-11-10 stsp debug("new chunk to be printed:"
493 fe621944 2020-11-10 stsp " chunk %d-%d left %d-%d right %d-%d\n",
494 fe621944 2020-11-10 stsp next.chunk.start, next.chunk.end,
495 fe621944 2020-11-10 stsp next.left.start, next.left.end,
496 fe621944 2020-11-10 stsp next.right.start, next.right.end);
498 fe621944 2020-11-10 stsp if (diff_chunk_contexts_touch(&cc, &next)) {
499 fe621944 2020-11-10 stsp /* This next context touches or overlaps the previous
500 fe621944 2020-11-10 stsp * one, join. */
501 fe621944 2020-11-10 stsp diff_chunk_contexts_merge(&cc, &next);
502 fe621944 2020-11-10 stsp debug("new chunk to be printed touches previous chunk,"
503 fe621944 2020-11-10 stsp " now: left %d-%d right %d-%d\n",
504 fe621944 2020-11-10 stsp cc.left.start, cc.left.end,
505 fe621944 2020-11-10 stsp cc.right.start, cc.right.end);
509 fe621944 2020-11-10 stsp /* No touching, so the previous context is complete with a gap
510 fe621944 2020-11-10 stsp * between it and this next one. Print the previous one and
511 fe621944 2020-11-10 stsp * start fresh here. */
512 fe621944 2020-11-10 stsp debug("new chunk to be printed does not touch previous chunk;"
513 fe621944 2020-11-10 stsp " print left %d-%d right %d-%d\n",
514 fe621944 2020-11-10 stsp cc.left.start, cc.left.end, cc.right.start, cc.right.end);
515 fe621944 2020-11-10 stsp output_unidiff_chunk(outinfo, dest, state, info, result,
516 fe621944 2020-11-10 stsp true, show_function_prototypes, &cc);
518 fe621944 2020-11-10 stsp debug("new unprinted chunk is left %d-%d right %d-%d\n",
519 fe621944 2020-11-10 stsp cc.left.start, cc.left.end, cc.right.start, cc.right.end);
522 fe621944 2020-11-10 stsp if (!diff_chunk_context_empty(&cc))
523 fe621944 2020-11-10 stsp output_unidiff_chunk(outinfo, dest, state, info, result,
524 fe621944 2020-11-10 stsp true, show_function_prototypes, &cc);
525 fe621944 2020-11-10 stsp diff_output_unidiff_state_free(state);
526 fe621944 2020-11-10 stsp return DIFF_RC_OK;
