1998-01-26 03:09:57 +00:00
|
|
|
|
/* Output routines for ed-script format.
|
1999-03-18 09:21:42 +00:00
|
|
|
|
Copyright (C) 1988, 89, 91, 92, 93, 1998 Free Software Foundation, Inc.
|
1998-01-26 03:09:57 +00:00
|
|
|
|
|
|
|
|
|
This file is part of GNU DIFF.
|
|
|
|
|
|
|
|
|
|
GNU DIFF is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
|
|
GNU DIFF is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
1999-12-11 12:24:21 +00:00
|
|
|
|
*/
|
1998-01-26 03:09:57 +00:00
|
|
|
|
|
|
|
|
|
#include "diff.h"
|
|
|
|
|
|
|
|
|
|
static void print_ed_hunk PARAMS((struct change *));
|
|
|
|
|
static void print_rcs_hunk PARAMS((struct change *));
|
|
|
|
|
static void pr_forward_ed_hunk PARAMS((struct change *));
|
|
|
|
|
|
|
|
|
|
/* Print our script as ed commands. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
print_ed_script (script)
|
|
|
|
|
struct change *script;
|
|
|
|
|
{
|
|
|
|
|
print_script (script, find_reverse_change, print_ed_hunk);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print a hunk of an ed diff */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_ed_hunk (hunk)
|
|
|
|
|
struct change *hunk;
|
|
|
|
|
{
|
|
|
|
|
int f0, l0, f1, l1;
|
|
|
|
|
int deletes, inserts;
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
hunk = flip_script (hunk);
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
debug_script (hunk);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Determine range of line numbers involved in each file. */
|
|
|
|
|
analyze_hunk (hunk, &f0, &l0, &f1, &l1, &deletes, &inserts);
|
|
|
|
|
if (!deletes && !inserts)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
begin_output ();
|
|
|
|
|
|
|
|
|
|
/* Print out the line number header for this hunk */
|
|
|
|
|
print_number_range (',', &files[0], f0, l0);
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output ("%c\n", change_letter (inserts, deletes));
|
1998-01-26 03:09:57 +00:00
|
|
|
|
|
|
|
|
|
/* Print new/changed lines from second file, if needed */
|
|
|
|
|
if (inserts)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int inserting = 1;
|
|
|
|
|
for (i = f1; i <= l1; i++)
|
|
|
|
|
{
|
|
|
|
|
/* Resume the insert, if we stopped. */
|
|
|
|
|
if (! inserting)
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output ("%da\n",
|
|
|
|
|
i - f1 + translate_line_number (&files[0], f0) - 1);
|
1998-01-26 03:09:57 +00:00
|
|
|
|
inserting = 1;
|
|
|
|
|
|
|
|
|
|
/* If the file's line is just a dot, it would confuse `ed'.
|
|
|
|
|
So output it with a double dot, and set the flag LEADING_DOT
|
|
|
|
|
so that we will output another ed-command later
|
|
|
|
|
to change the double dot into a single dot. */
|
|
|
|
|
|
|
|
|
|
if (files[1].linbuf[i][0] == '.'
|
|
|
|
|
&& files[1].linbuf[i][1] == '\n')
|
|
|
|
|
{
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output ("..\n");
|
|
|
|
|
printf_output (".\n");
|
1998-01-26 03:09:57 +00:00
|
|
|
|
/* Now change that double dot to the desired single dot. */
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output ("%ds/^\\.\\././\n",
|
|
|
|
|
i - f1 + translate_line_number (&files[0], f0));
|
1998-01-26 03:09:57 +00:00
|
|
|
|
inserting = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* Line is not `.', so output it unmodified. */
|
|
|
|
|
print_1_line ("", &files[1].linbuf[i]);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* End insert mode, if we are still in it. */
|
|
|
|
|
if (inserting)
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output (".\n");
|
1998-01-26 03:09:57 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print change script in the style of ed commands,
|
|
|
|
|
but print the changes in the order they appear in the input files,
|
|
|
|
|
which means that the commands are not truly useful with ed. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
pr_forward_ed_script (script)
|
|
|
|
|
struct change *script;
|
|
|
|
|
{
|
|
|
|
|
print_script (script, find_change, pr_forward_ed_hunk);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
pr_forward_ed_hunk (hunk)
|
|
|
|
|
struct change *hunk;
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int f0, l0, f1, l1;
|
|
|
|
|
int deletes, inserts;
|
|
|
|
|
|
|
|
|
|
/* Determine range of line numbers involved in each file. */
|
|
|
|
|
analyze_hunk (hunk, &f0, &l0, &f1, &l1, &deletes, &inserts);
|
|
|
|
|
if (!deletes && !inserts)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
begin_output ();
|
|
|
|
|
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output ("%c", change_letter (inserts, deletes));
|
1998-01-26 03:09:57 +00:00
|
|
|
|
print_number_range (' ', files, f0, l0);
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output ("\n");
|
1998-01-26 03:09:57 +00:00
|
|
|
|
|
|
|
|
|
/* If deletion only, print just the number range. */
|
|
|
|
|
|
|
|
|
|
if (!inserts)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* For insertion (with or without deletion), print the number range
|
|
|
|
|
and the lines from file 2. */
|
|
|
|
|
|
|
|
|
|
for (i = f1; i <= l1; i++)
|
|
|
|
|
print_1_line ("", &files[1].linbuf[i]);
|
|
|
|
|
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output (".\n");
|
1998-01-26 03:09:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print in a format somewhat like ed commands
|
|
|
|
|
except that each insert command states the number of lines it inserts.
|
|
|
|
|
This format is used for RCS. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
print_rcs_script (script)
|
|
|
|
|
struct change *script;
|
|
|
|
|
{
|
|
|
|
|
print_script (script, find_change, print_rcs_hunk);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print a hunk of an RCS diff */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
print_rcs_hunk (hunk)
|
|
|
|
|
struct change *hunk;
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int f0, l0, f1, l1;
|
|
|
|
|
int deletes, inserts;
|
|
|
|
|
int tf0, tl0, tf1, tl1;
|
|
|
|
|
|
|
|
|
|
/* Determine range of line numbers involved in each file. */
|
|
|
|
|
analyze_hunk (hunk, &f0, &l0, &f1, &l1, &deletes, &inserts);
|
|
|
|
|
if (!deletes && !inserts)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
begin_output ();
|
|
|
|
|
|
|
|
|
|
translate_range (&files[0], f0, l0, &tf0, &tl0);
|
|
|
|
|
|
|
|
|
|
if (deletes)
|
|
|
|
|
{
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output ("d");
|
1998-01-26 03:09:57 +00:00
|
|
|
|
/* For deletion, print just the starting line number from file 0
|
|
|
|
|
and the number of lines deleted. */
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output ("%d %d\n",
|
|
|
|
|
tf0,
|
|
|
|
|
(tl0 >= tf0 ? tl0 - tf0 + 1 : 1));
|
1998-01-26 03:09:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (inserts)
|
|
|
|
|
{
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output ("a");
|
1998-01-26 03:09:57 +00:00
|
|
|
|
|
|
|
|
|
/* Take last-line-number from file 0 and # lines from file 1. */
|
|
|
|
|
translate_range (&files[1], f1, l1, &tf1, &tl1);
|
1999-03-18 09:21:42 +00:00
|
|
|
|
printf_output ("%d %d\n",
|
|
|
|
|
tl0,
|
|
|
|
|
(tl1 >= tf1 ? tl1 - tf1 + 1 : 1));
|
1998-01-26 03:09:57 +00:00
|
|
|
|
|
|
|
|
|
/* Print the inserted lines. */
|
|
|
|
|
for (i = f1; i <= l1; i++)
|
|
|
|
|
print_1_line ("", &files[1].linbuf[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|