6 Commits

Author	SHA1	Message	Date
Zoltan Somogyi	9d97d41323	Simplify code constructing error messages. ... compiler/add_type.m: Use tools added to error_util.m since add_type.m was first written to use simpler code to construct error messages. In one place, improve the wording of an error message. tests/invalid/user_eq_dummy.err_exp: Expect that updated wording.	2021-04-01 08:32:17 +11:00
Zoltan Somogyi	2ac8465659	Make the code adding new types to the HLDS readable. ... The motivation for this diff was that I wanted the compiler to generate a warning if a module declared the same type twice. (During the cleanup of unify_proc.m I did recently, I found and fixed such a duplicate declaration.) compiler/add_type.m: The old code of module_add_type_defn was not just long (210+ lines), it is also very complex. Part of this complexity was sort-of justified. It dealt with adding three separate kinds of item_type_defns: abstract type "definitions", which are actually declarations; the definitions of Mercury types, and the definitions of foreign types. A single type could have more than one of these (e.g. declaration and a definition, or a Mercury definition and a foreign definition), and it had to be prepared to process these in any order. Part of this complexity was self-inflicted. The parts of the predicate that dealt with the same kind of definition were not always next to each other, and for some parts, it wasn't even clear *what* kind of definition it was dealing with. It did the same tests on both the old and updated versions of definitions, when those definitions were guaranteed to be identical; the "updating" predicate was a no-op. And it used completely different code for detecting and handling related errors. This diff fixes the above problems. It separates the task of adding an item_type_defn to the HLDS into three subtasks, done in three separate predicates: adding type declarations, adding Mercury definitions, and adding foreign definitions. It specializes each predicate to its task, and simplifies its decision flow. It also delegates the creation of (most) error messages to separate predicates. Together, these changes make each of module_add_type_defn_{abstract,mercury,foreign} easily understandable. Generate a warning if a type is declared twice, i.e. if e.g. ":- type x." is followed by another ":- type x.". Call module_info_incr_errors to register the presence of errors in just one central place. (Before, some of the places that generated error messages incremented the error count, and some places didn't.) Improve the wording of some error messages. Refer to type names in error messages by unqualified sym_names in cases where the module qualifier being elided is obvious from the name of the module being compiled. Add documentation. Add descriptions of potential future improvements. Add some XXXs at places that I think deserve them. Give some predicates and variables better names. compiler/prog_data.m: Change the parse tree representation of type definitions by explicitly specifying a type for storing the contents of each kind of type definition. compiler/hlds_data.m: Give a predicate a better name. Use one of the new types in prog_data.m in the HLDS version of type definitions, to minimize differences between the parse tree and HLDS versions. compiler/add_foreign_enum.m: compiler/add_pragma.m: compiler/add_special_pred.m: compiler/check_typeclass.m: compiler/du_type_layout.m: compiler/equiv_type.m: compiler/equiv_type_hlds.m: compiler/foreign.m: compiler/get_dependencies.m: compiler/hlds_code_util.m: compiler/hlds_out_module.m: compiler/inst_check.m: compiler/intermod.m: compiler/item_util.m: compiler/make_hlds_passes.m: compiler/make_hlds_separate_items.m: compiler/make_tags.m: compiler/ml_type_gen.m: compiler/ml_unify_gen.m: compiler/module_qual.qualify_items.m: compiler/parse_pragma.m: compiler/parse_tree_out.m: compiler/parse_type_defn.m: compiler/post_term_analysis.m: compiler/recompilation.check.m: compiler/recompilation.usage.m: compiler/recompilation.version.m: compiler/resolve_unify_functor.m: compiler/simplify_goal_ite.m: compiler/special_pred.m: compiler/switch_util.m: compiler/term_norm.m: compiler/type_ctor_info.m: compiler/type_util.m: compiler/unify_proc.m: compiler/unused_imports.m: compiler/write_module_interface_files.m: compiler/xml_documentation.m: Conform to the changes in prog_data.m. library/io.m: library/store.m: Delete duplicate type declarations that add_type.m now complains about. tests/invalid/bad_foreign_type.{m,err_exp}: Extend this test to test the new warning. Expect the updated versions of some error messages. tests/invalid/extra_info_prompt.err_exp: tests/invalid/foreign_type_visibility.err_exp: tests/invalid/user_eq_dummy.err_exp: Expect the updated versions of some error messages.	2017-06-27 18:15:58 +02:00
Zoltan Somogyi	4e3af446ef	Give some verbose error explanations only once. ... compiler/error_util.m: Some of the messages we print if --verbose-errors are enabled just explain what an always-printed error message means. If a compiler invocation reports several instances of an error, the explanation is useful only the first time. This diff provides a mechanism for printing such verbose messages only once per invocation of write_error_specs. compiler/*.m: Specify verbose_once for verbose error message components which are (a) not specific to the specific instance of the error they are generated for, and (b) whose usefulness/size ratio is not high enough. Part (b) means that it is ok to repeatedly print a single-line reminder, but not a 20-line missive that reads like an extract from the reference manual. In one case, make an error message clearer. tests/invalid/*.err_exp: tests/warnings/*.exp: Expect the new, slimmed-down output.	2015-02-19 12:38:07 +11:00
Zoltan Somogyi	fdd141bf77	Clean up the tests in the other test directories. ... tests/invalid/*.{m,err_exp}: tests/misc_tests/*.m: tests/mmc_make/*.m: tests/par_conj/*.m: tests/purity/*.m: tests/stm/*.m: tests/string_format/*.m: tests/structure_reuse/*.m: tests/submodules/*.m: tests/tabling/*.m: tests/term/*.m: tests/trailing/*.m: tests/typeclasses/*.m: tests/valid/*.m: tests/warnings/*.{m,exp}: Make these tests use four-space indentation, and ensure that each module is imported on its own line. (I intend to use the latter to figure out which subdirectories' tests can be executed in parallel.) These changes usually move code to different lines. For the tests that check compiler error messages, expect the new line numbers. browser/cterm.m: browser/tree234_cc.m: Import only one module per line. tests/hard_coded/boyer.m: Fix something I missed.	2015-02-16 12:32:18 +11:00
Zoltan Somogyi	5eee81204e	A big step towards cleaning up the way we handle errors. ... Estimated hours taken: 28 Branches: main A big step towards cleaning up the way we handle errors. The main changes are - the provision, in error_util.m, of a mechanism for completely specifying everything to do with a single error in one data structure, - the conversion of typecheck_errors.m from using io.write_string to using this new capability, - the conversion of mode_errors.m and det_report.m from using write_error_pieces to using this new capability, and - consistently using the quoting style `symname'/N instead of `symname/N' in error_util and hlds_error_util (previously, error_util used the former but hlds_error_util used the latter). This diff sets up later diffs which will collect all error specifications in a central place and print them all at once, in order. compiler/error_util.m: The new type error_spec, which completely specifies an error. An error_spec may have multiple components with different contexts and may have parts which are printed only under certain conditions, e.g. a given option being set. Each error_spec has a severity and also records which phase found the error. The new predicate write_error_spec takes care of updates of the exit status for errors and (if --halt-at-warn is set) for warnings. It also takes care of setting the flag that calls for the reminder about -E at the end. This diff also makes it simpler to use the ability to print arbitrary output. It adds the ability to include integers in messages directly, and the ability to create blank lines. It renames some function symbols to avoid ambiguities. Move a predicate that only used by typecheck_errors.m to that file. compiler/hlds_error_util.m: Switch to the `symname'/N quoting style for describing predicates and procedures. compiler/prog_util.m: Switch to the `symname'/N quoting style for describing sym_name_and_arity. compiler/hlds_module.m: Provide a predicate to increment the number of errors not by one, but by the number of errors printed by write_error_spec. Fix some documentation rot. compiler/typecheck_errors.m: Use write_error_spec instead of io.write_strings to print error messages. In several cases, improve the formatting of the messages printed. Mark a number of places where we don't (yet) update the number of errors in the module_info correctly. Rename the checkpoint predicate to avoid potential ambiguity with similar predicates in e.g. mode_info. compiler/typecheck_info.m: Group the code for writing stuff out together in one bunch. For each such predicate, create another that returns a list of format components instead of doing I/O directly. compiler/typecheck.m: Move the code for writing inference messages here from typecheck_errors.m, since these messages aren't errors. compiler/mode_errors.m: compiler/det_report.m: Use write_error_spec instead of write_error_pieces. In the case of mode_errors.m, this means we now get correct the set of circumstances in which we set the flag that calls for the reminder about -E. compiler/add_pragma.m: compiler/add_type.m: Convert some code that used to use write_error_pieces to print error messages to use write_error_spec instead. compiler/assertion.m: compiler/hlds_pred.m: compiler/post_typecheck.m: Assertion.m used to contain some code to check for assertions in the interface that mention predicates that are not exported. Move most of this code to post_typecheck.m (which is where this code used to be called from). One small part, which is a test for a particular property of import_statuses, is moved to hlds_pred.m to be with all the other similar tests of import_statuses. compiler/prog_util.m: Change unqualify_name from a predicate to a function. compiler/pred_table.m: compiler/hlds_out.m: Avoid some ambiguities by adding a suffix to the names of some predicates. compiler/*.m: Conform to the changes above. library/list.m: Add a function that was previously present (with different names) in two compiler modules. tests/hard_coded/allow_stubs.exp: Update the format of the expected exception. tests/invalid/errors2.err_exp2: Remove this file. As far as I can tell, it was never the correct expected output on the main branch. (It originated on the alias branch way back in the mists of time.) tests/invalid/*.err_exp: tests/invalid/purity/*.err_exp: tests/warnings/*.exp: Update the format of the expected error messages. tests/recompilation/*.err_exp.2: Update the format of the expected messages about what was modified.	2006-09-07 05:51:48 +00:00
Julien Fischer	835d8315ef	Do not allow discriminated unions with a single zero-arity constructor to have ... Estimated hours taken: 10 Branches: main, release Do not allow discriminated unions with a single zero-arity constructor to have user-defined equality or comparison. Defining such types causes an assertion failure in the compiler because the types are considered to be dummy types and the runtime currently doesn't support (and probably won't ever) d.u. dummy types with user-defined equality or comparison. Fix another bug where the compiler was not printing out the `recompile with -E' prompt at the appropriate time. The bug was caused by the fact that there were several copies of the globals structure and the one that was being checked at the time the prompt was being printed out was not the one that had been updated during the rest of compilation. compiler/add_types.m: Emit an error message if an attempt is made to define a d.u. dummy type with user-defined equality or comparison. compiler/globals.m: Remove the extra_error_info field from the globals structure and turn it into a mutable. Export access predicates for this mutable. The reason for doing this is that the compiler was sometimes looking at the wrong copy of the globals structure when checking the value of this flag - this meant that sometimes the recompile with `-E' prompt was not being displayed. Turning this flag into a mutable avoids the problem because now there is only one copy. compiler/make_hlds.m: s/__/./ in a few spots. doc/reference_manual.texi: Mention the new restrictions on discriminated union types with user-defined equality or comparison. tests/invalid/exported_unify2.m: tests/invalid/exported_unify3.m: Change some types with user-defined equality or comparison so that they are no longer dummy types. These test cases have not been triggering the assertion failure in the compiler because they are only error checked and the assertion that is failing occurs further along in the compilation process. tests/invalid/user_eq_dummy.{m,err_exp}: Test the new error message for dummy types with user-defined equality or comparison. tests/invalid/extra_info_prompt.{m,err_exp}: Test that the recompile with `-E' prompt is being displayed when it should. tests/invalid/Mercury.options: tests/invalid/Mmakefile: Include the new test cases. Where there is a verbose version of the error message compile with `-E'. tests/recompilation/add_type_re.err_exp.2: tests/invalid/*.err_exp: Update expected outputs to conform to the above.	2006-06-14 08:15:01 +00:00