1*2286d8edStholo /* Context-format output routines for GNU DIFF. 2*2286d8edStholo Copyright (C) 1988,1989,1991,1992,1993,1994 Free Software Foundation, Inc. 3*2286d8edStholo 4*2286d8edStholo This file is part of GNU DIFF. 5*2286d8edStholo 6*2286d8edStholo GNU DIFF is free software; you can redistribute it and/or modify 7*2286d8edStholo it under the terms of the GNU General Public License as published by 8*2286d8edStholo the Free Software Foundation; either version 2, or (at your option) 9*2286d8edStholo any later version. 10*2286d8edStholo 11*2286d8edStholo GNU DIFF is distributed in the hope that it will be useful, 12*2286d8edStholo but WITHOUT ANY WARRANTY; without even the implied warranty of 13*2286d8edStholo MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14*2286d8edStholo GNU General Public License for more details. 15*2286d8edStholo 16*2286d8edStholo You should have received a copy of the GNU General Public License 17*2286d8edStholo along with GNU DIFF; see the file COPYING. If not, write to 18*2286d8edStholo the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ 19*2286d8edStholo 20*2286d8edStholo #include "diff.h" 21*2286d8edStholo 22*2286d8edStholo static struct change *find_hunk PARAMS((struct change *)); 23*2286d8edStholo static void find_function PARAMS((struct file_data const *, int, char const **, size_t *)); 24*2286d8edStholo static void mark_ignorable PARAMS((struct change *)); 25*2286d8edStholo static void pr_context_hunk PARAMS((struct change *)); 26*2286d8edStholo static void pr_unidiff_hunk PARAMS((struct change *)); 27*2286d8edStholo static void print_context_label PARAMS ((char const *, struct file_data *, char const *)); 28*2286d8edStholo static void print_context_number_range PARAMS((struct file_data const *, int, int)); 29*2286d8edStholo static void print_unidiff_number_range PARAMS((struct file_data const *, int, int)); 30*2286d8edStholo 31*2286d8edStholo /* Last place find_function started searching from. */ 32*2286d8edStholo static int find_function_last_search; 33*2286d8edStholo 34*2286d8edStholo /* The value find_function returned when it started searching there. */ 35*2286d8edStholo static int find_function_last_match; 36*2286d8edStholo 37*2286d8edStholo /* Print a label for a context diff, with a file name and date or a label. */ 38*2286d8edStholo 39*2286d8edStholo static void 40*2286d8edStholo print_context_label (mark, inf, label) 41*2286d8edStholo char const *mark; 42*2286d8edStholo struct file_data *inf; 43*2286d8edStholo char const *label; 44*2286d8edStholo { 45*2286d8edStholo if (label) 46*2286d8edStholo fprintf (outfile, "%s %s\n", mark, label); 47*2286d8edStholo else 48*2286d8edStholo { 49*2286d8edStholo char const *ct = ctime (&inf->stat.st_mtime); 50*2286d8edStholo if (!ct) 51*2286d8edStholo ct = "?\n"; 52*2286d8edStholo /* See Posix.2 section 4.17.6.1.4 for this format. */ 53*2286d8edStholo fprintf (outfile, "%s %s\t%s", mark, inf->name, ct); 54*2286d8edStholo } 55*2286d8edStholo } 56*2286d8edStholo 57*2286d8edStholo /* Print a header for a context diff, with the file names and dates. */ 58*2286d8edStholo 59*2286d8edStholo void 60*2286d8edStholo print_context_header (inf, unidiff_flag) 61*2286d8edStholo struct file_data inf[]; 62*2286d8edStholo int unidiff_flag; 63*2286d8edStholo { 64*2286d8edStholo if (unidiff_flag) 65*2286d8edStholo { 66*2286d8edStholo print_context_label ("---", &inf[0], file_label[0]); 67*2286d8edStholo print_context_label ("+++", &inf[1], file_label[1]); 68*2286d8edStholo } 69*2286d8edStholo else 70*2286d8edStholo { 71*2286d8edStholo print_context_label ("***", &inf[0], file_label[0]); 72*2286d8edStholo print_context_label ("---", &inf[1], file_label[1]); 73*2286d8edStholo } 74*2286d8edStholo } 75*2286d8edStholo 76*2286d8edStholo /* Print an edit script in context format. */ 77*2286d8edStholo 78*2286d8edStholo void 79*2286d8edStholo print_context_script (script, unidiff_flag) 80*2286d8edStholo struct change *script; 81*2286d8edStholo int unidiff_flag; 82*2286d8edStholo { 83*2286d8edStholo if (ignore_blank_lines_flag || ignore_regexp_list) 84*2286d8edStholo mark_ignorable (script); 85*2286d8edStholo else 86*2286d8edStholo { 87*2286d8edStholo struct change *e; 88*2286d8edStholo for (e = script; e; e = e->link) 89*2286d8edStholo e->ignore = 0; 90*2286d8edStholo } 91*2286d8edStholo 92*2286d8edStholo find_function_last_search = - files[0].prefix_lines; 93*2286d8edStholo find_function_last_match = find_function_last_search - 1; 94*2286d8edStholo 95*2286d8edStholo if (unidiff_flag) 96*2286d8edStholo print_script (script, find_hunk, pr_unidiff_hunk); 97*2286d8edStholo else 98*2286d8edStholo print_script (script, find_hunk, pr_context_hunk); 99*2286d8edStholo } 100*2286d8edStholo 101*2286d8edStholo /* Print a pair of line numbers with a comma, translated for file FILE. 102*2286d8edStholo If the second number is not greater, use the first in place of it. 103*2286d8edStholo 104*2286d8edStholo Args A and B are internal line numbers. 105*2286d8edStholo We print the translated (real) line numbers. */ 106*2286d8edStholo 107*2286d8edStholo static void 108*2286d8edStholo print_context_number_range (file, a, b) 109*2286d8edStholo struct file_data const *file; 110*2286d8edStholo int a, b; 111*2286d8edStholo { 112*2286d8edStholo int trans_a, trans_b; 113*2286d8edStholo translate_range (file, a, b, &trans_a, &trans_b); 114*2286d8edStholo 115*2286d8edStholo /* Note: we can have B < A in the case of a range of no lines. 116*2286d8edStholo In this case, we should print the line number before the range, 117*2286d8edStholo which is B. */ 118*2286d8edStholo if (trans_b > trans_a) 119*2286d8edStholo fprintf (outfile, "%d,%d", trans_a, trans_b); 120*2286d8edStholo else 121*2286d8edStholo fprintf (outfile, "%d", trans_b); 122*2286d8edStholo } 123*2286d8edStholo 124*2286d8edStholo /* Print a portion of an edit script in context format. 125*2286d8edStholo HUNK is the beginning of the portion to be printed. 126*2286d8edStholo The end is marked by a `link' that has been nulled out. 127*2286d8edStholo 128*2286d8edStholo Prints out lines from both files, and precedes each 129*2286d8edStholo line with the appropriate flag-character. */ 130*2286d8edStholo 131*2286d8edStholo static void 132*2286d8edStholo pr_context_hunk (hunk) 133*2286d8edStholo struct change *hunk; 134*2286d8edStholo { 135*2286d8edStholo int first0, last0, first1, last1, show_from, show_to, i; 136*2286d8edStholo struct change *next; 137*2286d8edStholo char const *prefix; 138*2286d8edStholo char const *function; 139*2286d8edStholo size_t function_length; 140*2286d8edStholo FILE *out; 141*2286d8edStholo 142*2286d8edStholo /* Determine range of line numbers involved in each file. */ 143*2286d8edStholo 144*2286d8edStholo analyze_hunk (hunk, &first0, &last0, &first1, &last1, &show_from, &show_to); 145*2286d8edStholo 146*2286d8edStholo if (!show_from && !show_to) 147*2286d8edStholo return; 148*2286d8edStholo 149*2286d8edStholo /* Include a context's width before and after. */ 150*2286d8edStholo 151*2286d8edStholo i = - files[0].prefix_lines; 152*2286d8edStholo first0 = max (first0 - context, i); 153*2286d8edStholo first1 = max (first1 - context, i); 154*2286d8edStholo last0 = min (last0 + context, files[0].valid_lines - 1); 155*2286d8edStholo last1 = min (last1 + context, files[1].valid_lines - 1); 156*2286d8edStholo 157*2286d8edStholo /* If desired, find the preceding function definition line in file 0. */ 158*2286d8edStholo function = 0; 159*2286d8edStholo if (function_regexp_list) 160*2286d8edStholo find_function (&files[0], first0, &function, &function_length); 161*2286d8edStholo 162*2286d8edStholo begin_output (); 163*2286d8edStholo out = outfile; 164*2286d8edStholo 165*2286d8edStholo /* If we looked for and found a function this is part of, 166*2286d8edStholo include its name in the header of the diff section. */ 167*2286d8edStholo fprintf (out, "***************"); 168*2286d8edStholo 169*2286d8edStholo if (function) 170*2286d8edStholo { 171*2286d8edStholo fprintf (out, " "); 172*2286d8edStholo fwrite (function, 1, min (function_length - 1, 40), out); 173*2286d8edStholo } 174*2286d8edStholo 175*2286d8edStholo fprintf (out, "\n*** "); 176*2286d8edStholo print_context_number_range (&files[0], first0, last0); 177*2286d8edStholo fprintf (out, " ****\n"); 178*2286d8edStholo 179*2286d8edStholo if (show_from) 180*2286d8edStholo { 181*2286d8edStholo next = hunk; 182*2286d8edStholo 183*2286d8edStholo for (i = first0; i <= last0; i++) 184*2286d8edStholo { 185*2286d8edStholo /* Skip past changes that apply (in file 0) 186*2286d8edStholo only to lines before line I. */ 187*2286d8edStholo 188*2286d8edStholo while (next && next->line0 + next->deleted <= i) 189*2286d8edStholo next = next->link; 190*2286d8edStholo 191*2286d8edStholo /* Compute the marking for line I. */ 192*2286d8edStholo 193*2286d8edStholo prefix = " "; 194*2286d8edStholo if (next && next->line0 <= i) 195*2286d8edStholo /* The change NEXT covers this line. 196*2286d8edStholo If lines were inserted here in file 1, this is "changed". 197*2286d8edStholo Otherwise it is "deleted". */ 198*2286d8edStholo prefix = (next->inserted > 0 ? "!" : "-"); 199*2286d8edStholo 200*2286d8edStholo print_1_line (prefix, &files[0].linbuf[i]); 201*2286d8edStholo } 202*2286d8edStholo } 203*2286d8edStholo 204*2286d8edStholo fprintf (out, "--- "); 205*2286d8edStholo print_context_number_range (&files[1], first1, last1); 206*2286d8edStholo fprintf (out, " ----\n"); 207*2286d8edStholo 208*2286d8edStholo if (show_to) 209*2286d8edStholo { 210*2286d8edStholo next = hunk; 211*2286d8edStholo 212*2286d8edStholo for (i = first1; i <= last1; i++) 213*2286d8edStholo { 214*2286d8edStholo /* Skip past changes that apply (in file 1) 215*2286d8edStholo only to lines before line I. */ 216*2286d8edStholo 217*2286d8edStholo while (next && next->line1 + next->inserted <= i) 218*2286d8edStholo next = next->link; 219*2286d8edStholo 220*2286d8edStholo /* Compute the marking for line I. */ 221*2286d8edStholo 222*2286d8edStholo prefix = " "; 223*2286d8edStholo if (next && next->line1 <= i) 224*2286d8edStholo /* The change NEXT covers this line. 225*2286d8edStholo If lines were deleted here in file 0, this is "changed". 226*2286d8edStholo Otherwise it is "inserted". */ 227*2286d8edStholo prefix = (next->deleted > 0 ? "!" : "+"); 228*2286d8edStholo 229*2286d8edStholo print_1_line (prefix, &files[1].linbuf[i]); 230*2286d8edStholo } 231*2286d8edStholo } 232*2286d8edStholo } 233*2286d8edStholo 234*2286d8edStholo /* Print a pair of line numbers with a comma, translated for file FILE. 235*2286d8edStholo If the second number is smaller, use the first in place of it. 236*2286d8edStholo If the numbers are equal, print just one number. 237*2286d8edStholo 238*2286d8edStholo Args A and B are internal line numbers. 239*2286d8edStholo We print the translated (real) line numbers. */ 240*2286d8edStholo 241*2286d8edStholo static void 242*2286d8edStholo print_unidiff_number_range (file, a, b) 243*2286d8edStholo struct file_data const *file; 244*2286d8edStholo int a, b; 245*2286d8edStholo { 246*2286d8edStholo int trans_a, trans_b; 247*2286d8edStholo translate_range (file, a, b, &trans_a, &trans_b); 248*2286d8edStholo 249*2286d8edStholo /* Note: we can have B < A in the case of a range of no lines. 250*2286d8edStholo In this case, we should print the line number before the range, 251*2286d8edStholo which is B. */ 252*2286d8edStholo if (trans_b <= trans_a) 253*2286d8edStholo fprintf (outfile, trans_b == trans_a ? "%d" : "%d,0", trans_b); 254*2286d8edStholo else 255*2286d8edStholo fprintf (outfile, "%d,%d", trans_a, trans_b - trans_a + 1); 256*2286d8edStholo } 257*2286d8edStholo 258*2286d8edStholo /* Print a portion of an edit script in unidiff format. 259*2286d8edStholo HUNK is the beginning of the portion to be printed. 260*2286d8edStholo The end is marked by a `link' that has been nulled out. 261*2286d8edStholo 262*2286d8edStholo Prints out lines from both files, and precedes each 263*2286d8edStholo line with the appropriate flag-character. */ 264*2286d8edStholo 265*2286d8edStholo static void 266*2286d8edStholo pr_unidiff_hunk (hunk) 267*2286d8edStholo struct change *hunk; 268*2286d8edStholo { 269*2286d8edStholo int first0, last0, first1, last1, show_from, show_to, i, j, k; 270*2286d8edStholo struct change *next; 271*2286d8edStholo char const *function; 272*2286d8edStholo size_t function_length; 273*2286d8edStholo FILE *out; 274*2286d8edStholo 275*2286d8edStholo /* Determine range of line numbers involved in each file. */ 276*2286d8edStholo 277*2286d8edStholo analyze_hunk (hunk, &first0, &last0, &first1, &last1, &show_from, &show_to); 278*2286d8edStholo 279*2286d8edStholo if (!show_from && !show_to) 280*2286d8edStholo return; 281*2286d8edStholo 282*2286d8edStholo /* Include a context's width before and after. */ 283*2286d8edStholo 284*2286d8edStholo i = - files[0].prefix_lines; 285*2286d8edStholo first0 = max (first0 - context, i); 286*2286d8edStholo first1 = max (first1 - context, i); 287*2286d8edStholo last0 = min (last0 + context, files[0].valid_lines - 1); 288*2286d8edStholo last1 = min (last1 + context, files[1].valid_lines - 1); 289*2286d8edStholo 290*2286d8edStholo /* If desired, find the preceding function definition line in file 0. */ 291*2286d8edStholo function = 0; 292*2286d8edStholo if (function_regexp_list) 293*2286d8edStholo find_function (&files[0], first0, &function, &function_length); 294*2286d8edStholo 295*2286d8edStholo begin_output (); 296*2286d8edStholo out = outfile; 297*2286d8edStholo 298*2286d8edStholo fprintf (out, "@@ -"); 299*2286d8edStholo print_unidiff_number_range (&files[0], first0, last0); 300*2286d8edStholo fprintf (out, " +"); 301*2286d8edStholo print_unidiff_number_range (&files[1], first1, last1); 302*2286d8edStholo fprintf (out, " @@"); 303*2286d8edStholo 304*2286d8edStholo /* If we looked for and found a function this is part of, 305*2286d8edStholo include its name in the header of the diff section. */ 306*2286d8edStholo 307*2286d8edStholo if (function) 308*2286d8edStholo { 309*2286d8edStholo putc (' ', out); 310*2286d8edStholo fwrite (function, 1, min (function_length - 1, 40), out); 311*2286d8edStholo } 312*2286d8edStholo putc ('\n', out); 313*2286d8edStholo 314*2286d8edStholo next = hunk; 315*2286d8edStholo i = first0; 316*2286d8edStholo j = first1; 317*2286d8edStholo 318*2286d8edStholo while (i <= last0 || j <= last1) 319*2286d8edStholo { 320*2286d8edStholo 321*2286d8edStholo /* If the line isn't a difference, output the context from file 0. */ 322*2286d8edStholo 323*2286d8edStholo if (!next || i < next->line0) 324*2286d8edStholo { 325*2286d8edStholo putc (tab_align_flag ? '\t' : ' ', out); 326*2286d8edStholo print_1_line (0, &files[0].linbuf[i++]); 327*2286d8edStholo j++; 328*2286d8edStholo } 329*2286d8edStholo else 330*2286d8edStholo { 331*2286d8edStholo /* For each difference, first output the deleted part. */ 332*2286d8edStholo 333*2286d8edStholo k = next->deleted; 334*2286d8edStholo while (k--) 335*2286d8edStholo { 336*2286d8edStholo putc ('-', out); 337*2286d8edStholo if (tab_align_flag) 338*2286d8edStholo putc ('\t', out); 339*2286d8edStholo print_1_line (0, &files[0].linbuf[i++]); 340*2286d8edStholo } 341*2286d8edStholo 342*2286d8edStholo /* Then output the inserted part. */ 343*2286d8edStholo 344*2286d8edStholo k = next->inserted; 345*2286d8edStholo while (k--) 346*2286d8edStholo { 347*2286d8edStholo putc ('+', out); 348*2286d8edStholo if (tab_align_flag) 349*2286d8edStholo putc ('\t', out); 350*2286d8edStholo print_1_line (0, &files[1].linbuf[j++]); 351*2286d8edStholo } 352*2286d8edStholo 353*2286d8edStholo /* We're done with this hunk, so on to the next! */ 354*2286d8edStholo 355*2286d8edStholo next = next->link; 356*2286d8edStholo } 357*2286d8edStholo } 358*2286d8edStholo } 359*2286d8edStholo 360*2286d8edStholo /* Scan a (forward-ordered) edit script for the first place that more than 361*2286d8edStholo 2*CONTEXT unchanged lines appear, and return a pointer 362*2286d8edStholo to the `struct change' for the last change before those lines. */ 363*2286d8edStholo 364*2286d8edStholo static struct change * 365*2286d8edStholo find_hunk (start) 366*2286d8edStholo struct change *start; 367*2286d8edStholo { 368*2286d8edStholo struct change *prev; 369*2286d8edStholo int top0, top1; 370*2286d8edStholo int thresh; 371*2286d8edStholo 372*2286d8edStholo do 373*2286d8edStholo { 374*2286d8edStholo /* Compute number of first line in each file beyond this changed. */ 375*2286d8edStholo top0 = start->line0 + start->deleted; 376*2286d8edStholo top1 = start->line1 + start->inserted; 377*2286d8edStholo prev = start; 378*2286d8edStholo start = start->link; 379*2286d8edStholo /* Threshold distance is 2*CONTEXT between two non-ignorable changes, 380*2286d8edStholo but only CONTEXT if one is ignorable. */ 381*2286d8edStholo thresh = ((prev->ignore || (start && start->ignore)) 382*2286d8edStholo ? context 383*2286d8edStholo : 2 * context + 1); 384*2286d8edStholo /* It is not supposed to matter which file we check in the end-test. 385*2286d8edStholo If it would matter, crash. */ 386*2286d8edStholo if (start && start->line0 - top0 != start->line1 - top1) 387*2286d8edStholo abort (); 388*2286d8edStholo } while (start 389*2286d8edStholo /* Keep going if less than THRESH lines 390*2286d8edStholo elapse before the affected line. */ 391*2286d8edStholo && start->line0 < top0 + thresh); 392*2286d8edStholo 393*2286d8edStholo return prev; 394*2286d8edStholo } 395*2286d8edStholo 396*2286d8edStholo /* Set the `ignore' flag properly in each change in SCRIPT. 397*2286d8edStholo It should be 1 if all the lines inserted or deleted in that change 398*2286d8edStholo are ignorable lines. */ 399*2286d8edStholo 400*2286d8edStholo static void 401*2286d8edStholo mark_ignorable (script) 402*2286d8edStholo struct change *script; 403*2286d8edStholo { 404*2286d8edStholo while (script) 405*2286d8edStholo { 406*2286d8edStholo struct change *next = script->link; 407*2286d8edStholo int first0, last0, first1, last1, deletes, inserts; 408*2286d8edStholo 409*2286d8edStholo /* Turn this change into a hunk: detach it from the others. */ 410*2286d8edStholo script->link = 0; 411*2286d8edStholo 412*2286d8edStholo /* Determine whether this change is ignorable. */ 413*2286d8edStholo analyze_hunk (script, &first0, &last0, &first1, &last1, &deletes, &inserts); 414*2286d8edStholo /* Reconnect the chain as before. */ 415*2286d8edStholo script->link = next; 416*2286d8edStholo 417*2286d8edStholo /* If the change is ignorable, mark it. */ 418*2286d8edStholo script->ignore = (!deletes && !inserts); 419*2286d8edStholo 420*2286d8edStholo /* Advance to the following change. */ 421*2286d8edStholo script = next; 422*2286d8edStholo } 423*2286d8edStholo } 424*2286d8edStholo 425*2286d8edStholo /* Find the last function-header line in FILE prior to line number LINENUM. 426*2286d8edStholo This is a line containing a match for the regexp in `function_regexp'. 427*2286d8edStholo Store the address of the line text into LINEP and the length of the 428*2286d8edStholo line into LENP. 429*2286d8edStholo Do not store anything if no function-header is found. */ 430*2286d8edStholo 431*2286d8edStholo static void 432*2286d8edStholo find_function (file, linenum, linep, lenp) 433*2286d8edStholo struct file_data const *file; 434*2286d8edStholo int linenum; 435*2286d8edStholo char const **linep; 436*2286d8edStholo size_t *lenp; 437*2286d8edStholo { 438*2286d8edStholo int i = linenum; 439*2286d8edStholo int last = find_function_last_search; 440*2286d8edStholo find_function_last_search = i; 441*2286d8edStholo 442*2286d8edStholo while (--i >= last) 443*2286d8edStholo { 444*2286d8edStholo /* See if this line is what we want. */ 445*2286d8edStholo struct regexp_list *r; 446*2286d8edStholo char const *line = file->linbuf[i]; 447*2286d8edStholo size_t len = file->linbuf[i + 1] - line; 448*2286d8edStholo 449*2286d8edStholo for (r = function_regexp_list; r; r = r->next) 450*2286d8edStholo if (0 <= re_search (&r->buf, line, len, 0, len, 0)) 451*2286d8edStholo { 452*2286d8edStholo *linep = line; 453*2286d8edStholo *lenp = len; 454*2286d8edStholo find_function_last_match = i; 455*2286d8edStholo return; 456*2286d8edStholo } 457*2286d8edStholo } 458*2286d8edStholo /* If we search back to where we started searching the previous time, 459*2286d8edStholo find the line we found last time. */ 460*2286d8edStholo if (find_function_last_match >= - file->prefix_lines) 461*2286d8edStholo { 462*2286d8edStholo i = find_function_last_match; 463*2286d8edStholo *linep = file->linbuf[i]; 464*2286d8edStholo *lenp = file->linbuf[i + 1] - *linep; 465*2286d8edStholo return; 466*2286d8edStholo } 467*2286d8edStholo return; 468*2286d8edStholo } 469