mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-14 21:35:49 +00:00
b3af56e8fa
Estimated hours taken: 30 Modified files -------------- samples/diff/Mmakefile: Minor documentation update. samples/diff/README: samples/diff/TODO: Update stuff that's now done, do a couple of minor wording changes. samples/diff/diff.m: Fix case of identical filenames (which implicitly assumed no_diff_implies_no_output). Add new match pass, call the new diff algorithm. samples/diff/diff_out.m: Add --cvs-merge-conflict output style. Slight reorganisation of top-level predicate. Lots of small fixes to use better syntax (e.g. functional style for integer maths operations). samples/diff/difftype.m: Added first_mentioned_positions/3, last_mentioned_positions/3, add_edit/4. samples/diff/file.m: Use io__read_line_as_string. samples/diff/filter.m: Minor syntax/wording changes. samples/diff/options.m: Update all the newly handled options. New files --------- samples/diff/myers.m: New diff algorithm. samples/diff/match.m: New pass to match common lines in the files to be diffed. Removed file ------------ samples/diff/lcss.m: Functionality replaced by myers.m.
102 lines
3.0 KiB
Mathematica
102 lines
3.0 KiB
Mathematica
%-----------------------------------------------------------------------------%
|
|
% Copyright (C) 1998 The University of Melbourne.
|
|
% This file may only be copied under the terms of the GNU General
|
|
% Public License - see the file COPYING in the Mercury distribution.
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% Main author: bromage
|
|
|
|
% This module contains code to filter the diff before output, based on
|
|
% the command-line options presented.
|
|
|
|
% At the moment, only one option is handled: --ignore-blank-lines.
|
|
% This causes edits to be dropped if they contain changes which only
|
|
% add, delete or change blank lines.
|
|
|
|
% TO DO: What exactly is a blank line, and does its definition change
|
|
% if --ignore-space-change or --ignore-all-space have been
|
|
% specified? At the moment, we define a blank line to be a line
|
|
% containing zero or more whitespace characters. Check if this is
|
|
% correct or not.
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- module filter.
|
|
|
|
:- interface.
|
|
:- import_module difftype, file, io.
|
|
|
|
:- pred filter_diff(diff :: in, file :: in, file :: in, diff :: out,
|
|
io__state :: di, io__state :: uo) is det.
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- implementation.
|
|
:- import_module globals, options.
|
|
:- import_module bool, list, int, std_util, string, char.
|
|
|
|
filter_diff(Diff0, File1, File2, Diff) -->
|
|
globals__io_lookup_bool_option(ignore_blank_lines, FilterBlank),
|
|
|
|
{ FilterBlank = no ->
|
|
% If we didn't request a filter, skip this pass.
|
|
|
|
Diff = Diff0
|
|
;
|
|
filter__blank_lines(Diff0, File1, File2, Diff)
|
|
}.
|
|
|
|
:- pred filter__blank_lines(diff :: in, file :: in, file :: in, diff :: out)
|
|
is det.
|
|
|
|
filter__blank_lines([], _, _, []).
|
|
filter__blank_lines([Edit | Diff0], File1, File2, Diff) :-
|
|
filter__blank_lines(Diff0, File1, File2, Diff1),
|
|
( Edit = add(_, Y1 - Y2),
|
|
( range_has_only_blank_lines(Y1, Y2, File2) ->
|
|
Diff = Diff1
|
|
;
|
|
Diff = [Edit | Diff1]
|
|
)
|
|
; Edit = delete(X1 - X2, _),
|
|
( range_has_only_blank_lines(X1, X2, File1) ->
|
|
Diff = Diff1
|
|
;
|
|
Diff = [Edit | Diff1]
|
|
)
|
|
; Edit = change(X1 - X2, Y1 - Y2),
|
|
(
|
|
range_has_only_blank_lines(X1, X2, File1),
|
|
range_has_only_blank_lines(Y1, Y2, File2)
|
|
->
|
|
Diff = Diff1
|
|
;
|
|
Diff = [Edit | Diff1]
|
|
)
|
|
).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- pred range_has_only_blank_lines(int, int, file).
|
|
:- mode range_has_only_blank_lines(in, in, in) is semidet.
|
|
|
|
range_has_only_blank_lines(First, Last, File) :-
|
|
(
|
|
First < Last
|
|
=>
|
|
(
|
|
file__get_line(File, First, Line),
|
|
string__to_char_list(Line, Chars),
|
|
all [C] (
|
|
list__member(C, Chars)
|
|
=>
|
|
char__is_whitespace(C)
|
|
),
|
|
range_has_only_blank_lines(First + 1, Last, File)
|
|
)
|
|
).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|