for review: new option names

[Fergus Henderson]

I take it no-one has any objections to this one?

Estimated hours taken: 0.5

compiler/options.m:
doc/user_guide.texi:
	Add shorter forms of some options:
		`--make-int' for `--make-interface'
		`--make-opt-int' for `--make-optimization-interface'
		`--make-short-int' for `--make-short-interface'

Index: options.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/options.m,v
retrieving revision 1.193
diff -u -r1.193 options.m
--- options.m	1997/03/27 03:29:09	1.193
+++ options.m	1997/04/11 15:15:34
@@ -542,11 +542,14 @@
 % output options (mutually exclusive)
 long_option("generate-dependencies",	generate_dependencies).
 long_option("make-short-interface",	make_short_interface).
+long_option("make-short-int",		make_short_interface).
 long_option("make-interface",		make_interface).
+long_option("make-int",			make_interface).
 long_option("make-optimization-interface",
 					make_optimization_interface).
 long_option("make-optimisation-interface",
 					make_optimization_interface).
+long_option("make-opt-int",		make_optimization_interface).
 long_option("convert-to-mercury", 	convert_to_mercury).
 long_option("convert-to-Mercury", 	convert_to_mercury). 
 long_option("pretty-print", 		convert_to_mercury).
@@ -1062,14 +1065,14 @@
 	io__write_string("\t-M, --generate-dependencies\n"),
 	io__write_string("\t\tOutput `Make'-style dependencies for the module\n"),
 	io__write_string("\t\tand all of its dependencies to `<module>.dep'.\n"),
-	io__write_string("\t-i, --make-interface\n"),
+	io__write_string("\t-i, --make-int, --make-interface\n"),
 	io__write_string("\t\tWrite the module interface to `<module>.int',\n"),
 	io__write_string("\t\tand write the short interface to `<module>.int2'\n"),
 	io__write_string("\t\tThis option should only be used by mmake.\n"),
-	io__write_string("\t--make-short-interface\n"),
+	io__write_string("\t--make-short-int, --make-short-interface\n"),
 	io__write_string("\t\tWrite the unqualified short interface to `<module>.int3'.\n"),
 	io__write_string("\t\tThis option should only be used by mmake.\n"),
-	io__write_string("\t--make-optimization-interface\n"),
+	io__write_string("\t--make-opt-int, --make-optimization-interface\n"),
 	io__write_string("\t\tWrite inter-module optimization information to\n"),
 	io__write_string("\t\t`<module>.opt'.\n"),
 	io__write_string("\t\tThis option should only be used by mmake.\n"),
Index: user_guide.texi
===================================================================
RCS file: /home/staff/zs/imp/mercury/doc/user_guide.texi,v
retrieving revision 1.82
diff -u -r1.82 user_guide.texi
--- user_guide.texi	1997/02/01 08:38:31	1.82
+++ user_guide.texi	1997/04/11 15:15:05
@@ -129,10 +129,12 @@
 
 Files ending in @file{.int}, @file{.int2} and @file{.int3} are interface files;
 these are generated automatically by the compiler,
-using the @samp{--make-interface} and @samp{--make-short-interface} options.
+using the @samp{--make-interface} (or @samp{--make-int})
+and @samp{--make-short-interface} (or @samp{--make-short-int}) options.
 Files ending in @file{.opt} are 
 interface files used in inter-module optimization,
-and are created using the @samp{--make-optimization-interface} option.
+and are created using the @samp{--make-optimization-interface} 
+(or @samp{--make-opt-int}) option.
 
 Since the interface of a module changes less often than its implementation,
 the @file{.int}, @file{.int2}, @file{.int3}, and @file{.opt}
@@ -205,15 +207,15 @@
 You can create the interface files for one or more modules using the commands
 
 @example
-mc --make-short-interface @var{module1}.m @var{module2}.m ...
-mc --make-interface @var{module1}.m @var{module2}.m ...
+mc --make-short-int @var{module1}.m @var{module2}.m ...
+mc --make-int @var{module1}.m @var{module2}.m ...
 @end example
 
 If you are going to compile with @samp{--intermodule-optimization} enabled,
 then you also need to create the optimization interface files.
 
 @example
-mc --make-optimization-interface @var{module1}.m @var{module2}.m ...
+mc --make-opt-int @var{module1}.m @var{module2}.m ...
 @end example
 
 Given that you have made all the interface files,
@@ -1062,17 +1064,20 @@
 
 @sp 1
 @item -i
+ at itemx --make-int
 @itemx --make-interface
 Write the module interface to @file{@var{module}.int}.
 Also write the short interface to @file{@var{module}.int2}.
 
 @sp 1
- at item --make-short-interface
+ at item --make-short-int
+ at itemx --make-short-interface
 Write the unqualified version of the short interface to
 @file{@var{module}.int3}.
 
 @sp 1
- at item --make-optimization-interface
+ at item --make-opt-int
+ at itemx --make-optimization-interface
 Write information used for inter-module optimization to
 @file{@var{module}.opt}.
 
-- 
Fergus Henderson <fjh at cs.mu.oz.au>   |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>   |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3         |     -- the last words of T. S. Garp.