mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-23 13:23:47 +00:00
35a4f3a2dd
compiler/parse_pragma.m:
Improve error handling in several respects.
First, for several kinds of pragmas the only error message we printed
was some form of "something went wrong". Fix this by generating messages
that say what part of the pragma has a problem, and what that problem is.
Second, specify the "where" part more precisely, as a nested context
(in construct A: in construct B: etc).
Third, make the text of error messages more consistent, using patterns
such as "expected abc, got def", and "In the Nth argument of xyz:".
Fourth, don't stop looking for errors after finding one; keep looking
for others.
Also, replace a bunch of if-then-elses with switches, and break up
a too-large predicate.
compiler/parse_sym_name.m:
Add parse_sym_name_and_no_args, a version of the existing predicate
try_parse_sym_name_and_no_args that generates an error message if it
does not find what it is asked to look for.
Use the same consistent error message phraseology as above (which we
also use elsewhere in the compiler).
compiler/parse_item.m:
Put a newline at the end of context pieces such as "In clause head:",
so that the "error:" that follows is not buried in the middle of a line.
tests/invalid/bad_pragma.{m,err_exp}:
Add a news test case for some of the updated error messages.
tests/invalid/Mmakefile:
Enable the new test case.
tests/invalid/bad_foreign_enum.m:
Add another bad foreign_enum to this test.
tests/invalid/bad_detism_category.err_exp:
tests/invalid/bad_foreign_code.err_exp:
tests/invalid/bad_foreign_enum.err_exp:
tests/invalid/bad_foreign_export.err_exp:
tests/invalid/bad_foreign_export_enum.err_exp:
tests/invalid/bad_foreign_import_module.err_exp:
tests/invalid/bad_foreign_proc.err_exp:
tests/invalid/bad_foreign_type.err_exp:
tests/invalid/bad_with_inst.err_exp:
tests/invalid/impl_def_literal_syntax.err_exp:
tests/invalid/invalid_float_literal.err_exp:
tests/invalid/null_char.err_exp:
tests/invalid/predmode.err_exp:
tests/invalid/require_tailrec_invalid.err_exp:
tests/invalid/some.err_exp:
tests/invalid/specified.err_exp:
tests/invalid/vars_in_wrong_places.err_exp:
Expect the updated error messages.
85 lines
5.3 KiB
Plaintext
85 lines
5.3 KiB
Plaintext
require_tailrec_invalid.m:019: Error: `:- pragma require_tail_recursion'
|
|
require_tailrec_invalid.m:019: declaration in module interface.
|
|
require_tailrec_invalid.m:026: Error: `:- pragma require_tail_recursion' pragma
|
|
require_tailrec_invalid.m:026: for `non_existent_pred'/3 without
|
|
require_tailrec_invalid.m:026: corresponding `:- pred' or `:- func'
|
|
require_tailrec_invalid.m:026: declaration.
|
|
require_tailrec_invalid.m:027: Error: `:- pragma require_tail_recursion' pragma
|
|
require_tailrec_invalid.m:027: for `non_existent_proc'/2 without
|
|
require_tailrec_invalid.m:027: corresponding `:- pred' declaration.
|
|
require_tailrec_invalid.m:028: Error: `:- pragma require_tail_recursion' pragma
|
|
require_tailrec_invalid.m:028: for `non_existent_func_proc'/1 without
|
|
require_tailrec_invalid.m:028: corresponding `:- func' declaration.
|
|
require_tailrec_invalid.m:031: Error: `:- pragma require_tail_recursion'
|
|
require_tailrec_invalid.m:031: declaration for undeclared mode of predicate
|
|
require_tailrec_invalid.m:031: `require_tailrec_invalid.length'/2.
|
|
require_tailrec_invalid.m:034: Error: conflicting
|
|
require_tailrec_invalid.m:034: `:- pragma require_tail_recursion' attributes:
|
|
require_tailrec_invalid.m:034: `error' conflicts with earlier attribute
|
|
require_tailrec_invalid.m:034: `warn'.
|
|
require_tailrec_invalid.m:037: Error: conflicting
|
|
require_tailrec_invalid.m:037: `:- pragma require_tail_recursion' attributes:
|
|
require_tailrec_invalid.m:037: `none' conflicts with earlier attribute
|
|
require_tailrec_invalid.m:037: `warn'.
|
|
require_tailrec_invalid.m:040: Error: conflicting
|
|
require_tailrec_invalid.m:040: `:- pragma require_tail_recursion' attributes:
|
|
require_tailrec_invalid.m:040: `none' conflicts with earlier attribute
|
|
require_tailrec_invalid.m:040: `error'.
|
|
require_tailrec_invalid.m:044: Error: conflicting
|
|
require_tailrec_invalid.m:044: `:- pragma require_tail_recursion' attributes:
|
|
require_tailrec_invalid.m:044: `self_recursion_only' conflicts with earlier
|
|
require_tailrec_invalid.m:044: attribute `self_or_mutual_recursion'.
|
|
require_tailrec_invalid.m:047: Error: conflicting
|
|
require_tailrec_invalid.m:047: `:- pragma require_tail_recursion' attributes:
|
|
require_tailrec_invalid.m:047: `none' conflicts with earlier attribute
|
|
require_tailrec_invalid.m:047: `self_or_mutual_recursion'.
|
|
require_tailrec_invalid.m:051: Error: conflicting
|
|
require_tailrec_invalid.m:051: `:- pragma require_tail_recursion' attributes:
|
|
require_tailrec_invalid.m:051: `none' conflicts with earlier attribute
|
|
require_tailrec_invalid.m:051: `self_recursion_only'.
|
|
require_tailrec_invalid.m:055: Error: unrecognised
|
|
require_tailrec_invalid.m:055: `:- pragma require_tail_recursion' attribute:
|
|
require_tailrec_invalid.m:055: `blahblahblah'.
|
|
require_tailrec_invalid.m:059: Error: `:- pragma require_tail_recursion' pragma
|
|
require_tailrec_invalid.m:059: for `blahblahblah'/0 without corresponding
|
|
require_tailrec_invalid.m:059: `:- pred' declaration.
|
|
require_tailrec_invalid.m:061: In the second argument of
|
|
require_tailrec_invalid.m:061: `:- pragma require_tail_recursion'
|
|
require_tailrec_invalid.m:061: declaration:
|
|
require_tailrec_invalid.m:061: error: expected attribute list, got `Woop'.
|
|
require_tailrec_invalid.m:064: In the second argument of
|
|
require_tailrec_invalid.m:064: `:- pragma require_tail_recursion'
|
|
require_tailrec_invalid.m:064: declaration:
|
|
require_tailrec_invalid.m:064: error: expected attribute list, got `23'.
|
|
require_tailrec_invalid.m:071: Error: conflicting
|
|
require_tailrec_invalid.m:071: `:- pragma require_tail_recursion' attributes:
|
|
require_tailrec_invalid.m:071: `none' conflicts with earlier attribute
|
|
require_tailrec_invalid.m:071: `self_recursion_only'.
|
|
require_tailrec_invalid.m:071: Error: conflicting
|
|
require_tailrec_invalid.m:071: `:- pragma require_tail_recursion' attributes:
|
|
require_tailrec_invalid.m:071: `none' conflicts with earlier attribute
|
|
require_tailrec_invalid.m:071: `warn'.
|
|
require_tailrec_invalid.m:072: Error: unrecognised
|
|
require_tailrec_invalid.m:072: `:- pragma require_tail_recursion' attribute:
|
|
require_tailrec_invalid.m:072: `grasshopper'.
|
|
require_tailrec_invalid.m:077: Error: conflicting
|
|
require_tailrec_invalid.m:077: `:- pragma require_tail_recursion' pragmas for
|
|
require_tailrec_invalid.m:077: `require_tailrec_invalid.length10'/2 or one of
|
|
require_tailrec_invalid.m:077: its modes.
|
|
require_tailrec_invalid.m:075: Earlier pragma is here.
|
|
require_tailrec_invalid.m:080: Error: conflicting
|
|
require_tailrec_invalid.m:080: `:- pragma require_tail_recursion' pragmas for
|
|
require_tailrec_invalid.m:080: `require_tailrec_invalid.length10'/2 or one of
|
|
require_tailrec_invalid.m:080: its modes.
|
|
require_tailrec_invalid.m:075: Earlier pragma is here.
|
|
require_tailrec_invalid.m:094: Error: conflicting
|
|
require_tailrec_invalid.m:094: `:- pragma require_tail_recursion' pragmas for
|
|
require_tailrec_invalid.m:094: `require_tailrec_invalid.append'/3 or one of
|
|
require_tailrec_invalid.m:094: its modes.
|
|
require_tailrec_invalid.m:092: Earlier pragma is here.
|
|
require_tailrec_invalid.m:094: Error: conflicting
|
|
require_tailrec_invalid.m:094: `:- pragma require_tail_recursion' pragmas for
|
|
require_tailrec_invalid.m:094: `require_tailrec_invalid.append'/3 or one of
|
|
require_tailrec_invalid.m:094: its modes.
|
|
require_tailrec_invalid.m:093: Earlier pragma is here.
|