[m-dev.] for review: compiler options for Java backend

[Julien Fischer]

I've fixed the things that Fergus identified in the review.

Julien


--- OLDDIFF	Thu Jan 25 16:19:54 2001
+++ DIFF3	Thu Jan 25 16:22:24 2001
@@ -1,9 +1,10 @@
+Index: compiler/globals.m
 ===================================================================
 RCS file: /home/mercury1/repository/mercury/compiler/globals.m,v
 retrieving revision 1.39
 diff -u -r1.39 globals.m
 --- compiler/globals.m	2001/01/10 10:53:50	1.39
-+++ compiler/globals.m	2001/01/25 01:54:14
++++ compiler/globals.m	2001/01/25 05:02:10
 @@ -26,12 +26,11 @@
  	;	il	% Generate IL assembler code
  			% IL is the Microsoft .NET Intermediate Language
@@ -24,7 +25,7 @@
 retrieving revision 1.99
 diff -u -r1.99 handle_options.m
 --- compiler/handle_options.m	2001/01/10 10:53:50	1.99
-+++ compiler/handle_options.m	2001/01/25 01:54:14
++++ compiler/handle_options.m	2001/01/25 05:02:10
 @@ -85,13 +85,15 @@
  			TargetCodeOnly),
  		globals__io_get_target(Target),
@@ -58,15 +59,15 @@
 -
 +	% Generating Java implies high-level code, turning off nested functions,
 +	% using copy-out for both det and nondet output arguments,
-+	% using no tags, boxing enums, disabling no_tag_types and no
-+	% static ground terms.
++	% using no tags and no static ground terms.
++	% XXX no static ground terms will be eliminated in a later
++	%     version
 +	( { Target = java } ->
 +		globals__io_set_option(highlevel_code, bool(yes)),
 +		globals__io_set_option(gcc_nested_functions, bool(no)),
 +		globals__io_set_option(nondet_copy_out, bool(yes)),
 +		globals__io_set_option(det_copy_out, bool(yes)),
 +		globals__io_set_option(num_tag_bits, int(0)),
-+		globals__io_set_option(line_numbers, bool(no)),
 +		globals__io_set_option(static_ground_terms, bool(no))
 +	;
 +		[]
@@ -104,7 +105,7 @@
 retrieving revision 1.189
 diff -u -r1.189 mercury_compile.m
 --- compiler/mercury_compile.m	2001/01/24 13:18:14	1.189
-+++ compiler/mercury_compile.m	2001/01/25 01:54:14
++++ compiler/mercury_compile.m	2001/01/25 05:02:10
 @@ -62,6 +62,7 @@
  :- import_module ml_elim_nested, ml_tailcall.	% MLDS -> MLDS
  :- import_module ml_optimize.			% MLDS -> MLDS
@@ -202,7 +203,7 @@
 retrieving revision 1.305
 diff -u -r1.305 options.m
 --- compiler/options.m	2001/01/09 04:06:43	1.305
-+++ compiler/options.m	2001/01/25 01:54:15
++++ compiler/options.m	2001/01/25 05:02:11
 @@ -135,6 +135,8 @@
  		;	il			% target il
  		;	il_only			% target il + target_code_only
@@ -320,20 +321,22 @@
  		"--il",
  		"\tAn abbreviation for `--target il'.",
  		"--il-only",
- 		"\tAn abbreviation for `--target il --intermediate-code-only'.",
+-		"\tAn abbreviation for `--target il --intermediate-code-only'.",
 -		"\tGenerate IL code in `<module>.il', but do not generate object code.",
++		"\tAn abbreviation for `--target il --target-code-only'.",
 +		"\tGenerate IL code in `<module>.il', but do not generate",
 +		"\tobject code.",
 +		
 +		"--java",
 +		"\tAn abbreviation for `--target java'.",
 +		"--java-only",
-+		"\tAn abbreviation for `--target java --intermediate-code-only'.",
++		"\tAn abbreviation for `--target java --target-code-only'.",
 +		"\tGenerate Java code in `<module>.java', but do not generate",
 +		"\tobject code.",
 +		
  		"--compile-to-c",
- 		"\tAn abbreviation for `--target c --intermediate-code-only'.",
+-		"\tAn abbreviation for `--target c --intermediate-code-only'.",
++		"\tAn abbreviation for `--target c --target-code-only'.",
  		"\tGenerate C code in `<module>.c', but do not generate object code.",
 +
 +
@@ -347,7 +350,7 @@
 +
 +		"--javac",
 +		"--java-compiler",
-+		"\tSpecify which Java compiler to use.",
++		"\tSpecify which Java compiler to use.  The default is javac.",
 +		
 +		"--java-flags",
 +		"\tSpecify options to be passed to the Java compiler.",
@@ -367,7 +370,7 @@
 retrieving revision 1.233
 diff -u -r1.233 user_guide.texi
 --- doc/user_guide.texi	2001/01/18 03:01:52	1.233
-+++ doc/user_guide.texi	2001/01/25 01:54:15
++++ doc/user_guide.texi	2001/01/25 05:02:11
 @@ -3125,7 +3125,8 @@
  @item -C
  @itemx --target-code-only
@@ -432,7 +435,7 @@
 + at sp 1
 + at item --javac @var{compiler-name}
 + at item --java-compiler @var{compiler-name}
-+Specify which Java compiler to use.
++Specify which Java compiler to use.  The default is @samp{javac}.
 +
 + at sp 1
 + at item --java-flags @var{options}
@@ -445,7 +448,7 @@
 + at sp 1
 + at item --java-object-file-extension @var{extension}
 +Specify an extension for Java object (bytecode) files.  By default this
-+is `.class'. 
++is @samp{.class}. 
  
  @sp 1
  @item --fact-table-max-array-size @var{size}
@@ -455,7 +458,7 @@
 retrieving revision 1.6
 diff -u -r1.6 final_grade_options.sh-subr
 --- scripts/final_grade_options.sh-subr	2001/01/17 02:45:07	1.6
-+++ scripts/final_grade_options.sh-subr	2001/01/25 01:54:16
++++ scripts/final_grade_options.sh-subr	2001/01/25 05:02:11
 @@ -39,9 +39,9 @@
  esac
  
@@ -474,7 +477,7 @@
 retrieving revision 1.13
 diff -u -r1.13 init_grade_options.sh-subr
 --- scripts/init_grade_options.sh-subr	2001/01/17 02:45:07	1.13
-+++ scripts/init_grade_options.sh-subr	2001/01/25 01:54:16
++++ scripts/init_grade_options.sh-subr	2001/01/25 05:02:11
 @@ -23,7 +23,7 @@
  grade_usage="\
  Grade options:
@@ -490,7 +493,7 @@
 retrieving revision 1.18
 diff -u -r1.18 parse_grade_options.sh-subr
 --- scripts/parse_grade_options.sh-subr	2001/01/17 02:45:07	1.18
-+++ scripts/parse_grade_options.sh-subr	2001/01/25 01:54:16
++++ scripts/parse_grade_options.sh-subr	2001/01/25 05:02:11
 @@ -28,6 +28,8 @@
  				target=c ;;
  			il|IL)


--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------