3 Commits

Author	SHA1	Message	Date
Zoltan Somogyi	d493841c99	Move imports from interface to implementation.	2020-10-11 11:44:13 +11:00
Zoltan Somogyi	409cbcb6a3	Unify getopt.m and getopt_io.m ... ... ... using an approach proposed by Peter, with an extra twist from Julien. Instead of having two modules, getopt.m and getopt_io.m, with the former defining predicates that do not take an I/O state pair, and the latter defining predicates that do take an I/O state pair, put both kinds of predicates into a single module. The versions with an I/O state pair have an "_io" suffix added to their names for disambiguation. Both versions are a veneer on top of a common infrastructure, which relies on a simple type class to implement the operation "give the contents of the file with this name". The predicate versions with I/O state pairs have a normal implementation of this typeclass, while the predicate versions that do not have I/O state pairs have an implementation that always returns an error indication. The above change just about doubles the number of exported predicates. We already had two versions of most exported predicates that differed in whether we returned errors in the form of a string, or in the form of a structured representation, with names of the latter having an "_se" suffix. Since we agreed that the structured representation is the form we want to encourage, this diff deletes the string versions, and deletes the "_se" suffix from the predicate names that used to have them. (It still remains at the end of the name of a type.) This "undoubling" should offset the effect of the doubling in the previous paragraph. Eventually, we want to have just one module, getopt.m, containing the updated code described above, but for now, we put the same code into both getopt_io.m and getopt.m to prevent too big a shock to people with existing code that uses getopt_io.m. library/getopt.m: library/getopt_io.m: Make the changes described above. library/Mmakefile: Instead of building both getopt_io.m and getopt.m from getopt_template, build getopt.m from getopt_io.m. tools/bootcheck: Delete references to getopt_template. compiler/typecheck_errors.m: When a type error involves one of the getopt/getopt_io predicates whose interfaces are changed by this diff, tell the user about how these changes could have caused the error, and thus what the probable fix is. compiler/handle_options.m: browser/parse.m: deep_profiler/mdprof_cgi.m: deep_profiler/mdprof_create_feedback.m: deep_profiler/mdprof_dump.m: deep_profiler/mdprof_procrep.m: deep_profiler/mdprof_report_feedback.m: deep_profiler/mdprof_test.m: profiler/mercury_profile.m: slice/mcov.m: slice/mdice.m: slice/mslice.m: slice/mtc_diff.m: slice/mtc_union.m: tests/hard_coded/space.m: Use the updated getopt interface. compiler/compile_target_code.m: compiler/compute_grade.m: compiler/deforest.m: compiler/det_report.m: compiler/format_call.m: compiler/globals.m: compiler/goal_expr_to_goal.m: compiler/make.build.m: compiler/make.m: compiler/make.module_dep_file.m: compiler/make.program_target.m: compiler/make.util.m: compiler/mercury_compile_main.m: compiler/ml_top_gen.m: compiler/module_cmds.m: compiler/op_mode.m: compiler/optimization_options.m: compiler/options.m: compiler/write_module_interface_files.m: tools/make_optimization_options_middle: tools/make_optimization_options_start: Replace references to getopt_io.m with references to getopt.m. tests/invalid/getopt_io_old.{m,err_exp}: tests/invalid/getopt_old.{m,err_exp}: tests/invalid/getopt_old_se.{m, err_exp}: New test cases for the extra help tests/invalid/Mmakefile: Enable the new test cases.	2020-10-09 19:30:46 +11:00
Zoltan Somogyi	181ada0dbf	Avoid -O<n> resetting previously set options. ... This implements Mantis feature request #495. NEWS: Announce the change. compiler/optimization_options.m: A new module for managing optimization options. It defines a separate bespoke type for every boolean optimization option to make it harder to confuse them. It defines a tuple type (opt_tuple) for accessing optimization options quickly. It implements the turning on (but NOT turning off) of optimizations when a given optimization level is selected. tools/make_optimization_options_middle: tools/make_optimization_options_db: The script that generates the meat of optimization_options.m, and the database of option names, kinds and initial values that it uses as its input. The script also generates some code for the special_handler predicate in compiler/options.m. tools/make_optimization_options_start: tools/make_optimization_options_end: The handwritten initial and final parts of optimization_options.m. tools/make_optimization_options: The script that pulls these parts together to form optimization_options.m. compiler/options.m: Make every optimization option a special option, to be handled by the special_handler predicate. That handling consists of simply adding a representation of the option to the end of a cord of optimization options, to be processed later by optimization_options.m. That processing will record the values of these options in the opt_tuple, which is where every other part of the compiler should get them from. Change the interface of special_handler to make the above possible. Add an "optopt_" (optimization option) prefix to the name of every optimization option, to make them inaccessible to the rest of the compiler under their old name, and thus help enforce the switch to using the opt_tuple. Any access to these options to look up their values would fail anyway, since the option data would no longer be e.g. bool(yes), but bool_special, but the name change makes this failure happen at compile time, not runtime. Reclassify a few options to make the above make sense. Some options (unneeded_code_debug, unneeded_code_debug_pred_name, and common_struct_preds) were classified as oc_opt even though they control only the *debugging* of optimizations, while some options (c_optimize and inline_alloc) were not classified as oc_opt even though we do set them automatically at some optimization levels. Delete the opt_level_number option, since it was not used anywhere. Delete the code for handling -ON and --opt-space, since that is now done in optimization_options.m. Add some XXXs. compiler/handle_options.m: Switch to using getopt_io.process_options_userdata_se, as required by the new interface of the special_handler in options.m. In the absence of errors, invoke optimization_options.m to initialize the opt_tuple. Then update the opt_tuple incrementally when processing option implications that affect optimization options. compiler/globals.m: Put the opt_tuple into a new field of the globals structure. compiler/accumulator.m: compiler/add_pragma_type_spec.m: compiler/add_trail_ops.m: compiler/code_info.m: compiler/code_loc_dep.m: compiler/compile_target_code.m: compiler/const_struct.m: compiler/deforest.m: compiler/dep_par_conj.m: compiler/disj_gen.m: compiler/erl_code_gen.m: compiler/format_call.m: compiler/global_data.m: compiler/grab_modules.m: compiler/higher_order.m: compiler/hlds_pred.m: compiler/inlining.m: compiler/intermod.m: compiler/ite_gen.m: compiler/jumpopt.m: compiler/libs.m: compiler/llds_out_code_addr.m: compiler/llds_out_data.m: compiler/llds_out_file.m: compiler/llds_out_instr.m: compiler/llds_out_util.m: compiler/matching.m: compiler/mercury_compile_front_end.m: compiler/mercury_compile_llds_back_end.m: compiler/mercury_compile_main.m: compiler/mercury_compile_middle_passes.m: compiler/mercury_compile_mlds_back_end.m: compiler/ml_disj_gen.m: compiler/ml_gen_info.m: compiler/ml_lookup_switch.m: compiler/ml_optimize.m: compiler/ml_proc_gen.m: compiler/ml_simplify_switch.m: compiler/ml_switch_gen.m: compiler/ml_unify_gen_construct.m: compiler/optimize.m: compiler/pd_util.m: compiler/peephole.m: compiler/polymorphism.m: compiler/proc_gen.m: compiler/simplify_goal_call.m: compiler/simplify_goal_scope.m: compiler/simplify_info.m: compiler/simplify_proc.m: compiler/simplify_tasks.m: compiler/stack_layout.m: compiler/stack_opt.m: compiler/switch_gen.m: compiler/switch_util.m: compiler/tag_switch.m: compiler/tupling.m: compiler/unify_gen_construct.m: compiler/unneeded_code.m: compiler/unused_args.m: Conform to the changes above, mostly by looking up optimization options in the opt_tuple. In some places, replace bools containing optimization options with the bespoke type of that specific optimization option. library/getopt_template: Fix a bug that screwed up an error message. The bug happened when processing a --file option. If one of the options in the file was a special option whose special handler failed, the code handling that failing option returned both an error indication, and the rest of the argument list read in from the file. The code handling the --file option then *ignored* the error indication from the failed special option, and returned an error message of its own complaining about the unconsumed remaining arguments in the file, believing them to be non-option arguments, even though these arguments were never looked it to see if they were options. The fix is for the code handling --flag options to check whether the code processing the file contents found any errors, and if so, return that error *without* looking at the list of remaining arguments. In an unrelated change, factor out a duplicate call.	2020-09-28 18:16:13 +10:00