WaterLilyDoc.tioga
Copyright Ó 1986, 1988, 1992 by Xerox Corporation. All rights reserved.
Swinehart, November 18, 1985 2:37:08 pm PST
Russ Atkinson (RRA) July 28, 1988 1:13:03 am PDT
Willie-s, February 10, 1992 2:29 pm PST
WATERLILY
CEDAR 10.0 —
Waterlily
Text-file comparison and merger program
Dan Swinehart, Russ Atkinson
© Copyright 1985, 1986, 1988, 1992 Xerox Corporation. All rights reserved.
Abstract: Waterlily will compare two files and produce either a difference file or a merged version of the two files. The minimal documentation here is extracted from the help prompts provided by the three Waterlily commands.
Created by: Karen Kolling
Maintained by: Dan Swinehart <Swinehart.pa>, Russ Atkinson <Atkinson.pa>
Keywords: file comparison, source comparison, file merging
XEROX Xerox Corporation
Palo Alto Research Center
3333 Coyote Hill Road
Palo Alto, California 94304
1. Introduction
The Waterlily package (found in Waterlily.df) compares two files and produces either a difference file or a merged version of the two files. The minimal documentation here is extracted from the help prompts provided by the three Waterlily commands.
2. Waterlily
Line-at-a-time comparison of text files, producing a difference file
Waterlily compares two source files. The command format is one of:
Waterlily file1 file2
Waterlily difFile ← file1 file2
where switches are syntactically before any argument. Differences found are written on the difFile, with default extension '.dif'. The available switches are:
t Tioga format files (default: TRUE)
b Bravo format files (default: FALSE)
u Unformatted files (default: FALSE)
a treat '← & '¬, '^ & ' as equivalent (default: TRUE)
i Ignore blank lines (default: TRUE)
s Strip differences from C2C (default: FALSE)
x Output is a merge (default: FALSE)
Input files must be Tioga-format files.
#m # of matching lines (default: 3)
#c # of trailing context lines (default: 1)
The S switch is useful when comparing two C files produced by the C2C phase of Mimosa. It strips off leading and trailing spaces, and strips off the � part of variable names, so as to better compare structure. The presentation retains the original content in the file, however. This feature is intended to aid Mimosa regression testing.
3. Cedarlily
Token-at-a-time comparison of Mesa or Cedar sources, producing a line-level difference file
CedarLily compares two Cedar-program source files. Comparison is made at the source-language token level, so that only lexical differences will be found (formatting changes and modified comments will not affect the comparison). The command format is one of:
CedarLily file1 file2
CedarLily difFile ← file1 file2
where switches are syntactically before any argument. Differences found are written on the difFile, with default extension '.dif'. The available switches are:
u Unformatted files (default: FALSE)
i Ignore blank lines (default: TRUE)
#m # of matching lines (default: 3)
#c # of trailing context lines (default: 1)
4. Tigerlily
Node-at-a-time comparison of Tioga files, producing a merged file
Tigerlily produces a merged version of two Tioga-format files. Nodes unique to file1 are included and indicated by overstriking. Nodes unique to file2 are included and indicated by underlining. Nodes that are common to both files are unchanged. The command format is one of:
Tigerlily file1 file2
Tigerlily mergedFile ← file1 file2
where switches are syntactically before any argument. The merged file is written on the mergedFile, with default extension '.merger'. The available switches are:
#m # of matching lines (default: 3)
#c # of trailing context lines (default: 1)