mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-16 01:43:35 +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.
23 lines
744 B
Plaintext
23 lines
744 B
Plaintext
# An example of a *short* Mmake file
|
|
# In fact you don't really need any Mmake file at all,
|
|
# just `mmake diff.depend; mmake diff' is enough.
|
|
# But `mmake depend; mmake' is standard, so we will
|
|
# define a target `depend' and a default target `all'
|
|
# to make that work.
|
|
|
|
# This source file is hereby placed in the public domain. -fjh (the author).
|
|
|
|
MAIN_TARGET=all
|
|
depend: diff.depend
|
|
all: diff
|
|
|
|
# Unfortunately, diff does not work quite properly when compiled with gcc
|
|
# 2.7.2 under Digital Unix 3.2 due to a bug in gcc. The bug was fixed
|
|
# in 2.7.2.1, so feel free to comment out this line if you're using
|
|
# an unbuggy compiler.
|
|
#
|
|
# BTW, the predicate which isn't compiled correctly is diff_out__show_file_2
|
|
# in diff_out.m.
|
|
MGNUCFLAGS=-O0
|
|
|