mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-19 11:23:46 +00:00
e8503e890c
compiler/error_msg_inst.m:
When printing constrained insts, add the ")" at the end separately,
not as part of a suffix. When it was printed as part of a suffix,
it could be printed before a nl_indent_delta(-1) that balanced
an earlier nl_indent_delta(1).
compiler/mode_errors.m:
Don't get error_msg_inst.m, through the report_inst function, add
an nl_indent_delta(-1) as part of the formatting of an inst,
when it is in fact needed only *after* the inst.
Change the representation of "no matching mode" errors to implicitly
encode the invariant that every argument variable has its own inst.
compiler/modecheck_call.m:
compiler/modecheck_util.m:
Conform to the changed representation of "no matching mode" errors.
tests/invalid/constrained_poly_insts2.err_exp:
Expect the fixed formatting.
110 lines
6.3 KiB
Plaintext
110 lines
6.3 KiB
Plaintext
constrained_poly_insts2.m:042: In clause for `test6':
|
|
constrained_poly_insts2.m:042: in argument 2 of call to predicate
|
|
constrained_poly_insts2.m:042: `constrained_poly_insts2.q'/2:
|
|
constrained_poly_insts2.m:042: mode error: variable `V_2' has
|
|
constrained_poly_insts2.m:042: instantiatedness `unique(orange)',
|
|
constrained_poly_insts2.m:042: expected instantiatedness was `bound(apple)'.
|
|
constrained_poly_insts2.m:044: In clause for `test8':
|
|
constrained_poly_insts2.m:044: in argument 2 of call to predicate
|
|
constrained_poly_insts2.m:044: `constrained_poly_insts2.q'/2:
|
|
constrained_poly_insts2.m:044: mode error: variable `V_2' has
|
|
constrained_poly_insts2.m:044: instantiatedness `unique(orange)',
|
|
constrained_poly_insts2.m:044: expected instantiatedness was
|
|
constrained_poly_insts2.m:044: `( I =< bound(apple) )'.
|
|
constrained_poly_insts2.m:049: In clause for `p((pred(in((I =< ground))) is
|
|
constrained_poly_insts2.m:049: det), in)':
|
|
constrained_poly_insts2.m:049: in argument 2 (i.e. argument 1 of the called
|
|
constrained_poly_insts2.m:049: predicate) of higher-order predicate call:
|
|
constrained_poly_insts2.m:049: mode error: argument `X' has the following
|
|
constrained_poly_insts2.m:049: inst:
|
|
constrained_poly_insts2.m:049: ground
|
|
constrained_poly_insts2.m:049: which does not match any of the modes for
|
|
constrained_poly_insts2.m:049: higher-order predicate call.
|
|
constrained_poly_insts2.m:049: The first argument `X' has inst `ground',
|
|
constrained_poly_insts2.m:049: which does not match any of those modes.
|
|
constrained_poly_insts2.m:054: In clause for `p2((pred(in((I =< ground))) is
|
|
constrained_poly_insts2.m:054: det), in((J =<
|
|
constrained_poly_insts2.m:054: (constrained_poly_insts2.apple))))':
|
|
constrained_poly_insts2.m:054: in argument 2 (i.e. argument 1 of the called
|
|
constrained_poly_insts2.m:054: predicate) of higher-order predicate call:
|
|
constrained_poly_insts2.m:054: mode error: argument `X' has the following
|
|
constrained_poly_insts2.m:054: inst:
|
|
constrained_poly_insts2.m:054: ( J =< named inst apple
|
|
constrained_poly_insts2.m:054: which expands to
|
|
constrained_poly_insts2.m:054: bound(
|
|
constrained_poly_insts2.m:054: apple
|
|
constrained_poly_insts2.m:054: )
|
|
constrained_poly_insts2.m:054: )
|
|
constrained_poly_insts2.m:054: which does not match any of the modes for
|
|
constrained_poly_insts2.m:054: higher-order predicate call.
|
|
constrained_poly_insts2.m:054: The first argument `X' has inst
|
|
constrained_poly_insts2.m:054: ( J =< named inst apple
|
|
constrained_poly_insts2.m:054: which expands to
|
|
constrained_poly_insts2.m:054: bound(
|
|
constrained_poly_insts2.m:054: apple
|
|
constrained_poly_insts2.m:054: )
|
|
constrained_poly_insts2.m:054: ),
|
|
constrained_poly_insts2.m:054: which does not match any of those modes.
|
|
constrained_poly_insts2.m:059: In clause for `p3((pred(in((I =<
|
|
constrained_poly_insts2.m:059: (constrained_poly_insts2.apple)))) is det),
|
|
constrained_poly_insts2.m:059: in((constrained_poly_insts2.orange)))':
|
|
constrained_poly_insts2.m:059: in argument 2 (i.e. argument 1 of the called
|
|
constrained_poly_insts2.m:059: predicate) of higher-order predicate call:
|
|
constrained_poly_insts2.m:059: mode error: variable `X' has instantiatedness
|
|
constrained_poly_insts2.m:059: named inst orange
|
|
constrained_poly_insts2.m:059: which expands to
|
|
constrained_poly_insts2.m:059: bound(
|
|
constrained_poly_insts2.m:059: orange
|
|
constrained_poly_insts2.m:059: ),
|
|
constrained_poly_insts2.m:059: expected instantiatedness was
|
|
constrained_poly_insts2.m:059: ( I =< named inst apple
|
|
constrained_poly_insts2.m:059: which expands to
|
|
constrained_poly_insts2.m:059: bound(
|
|
constrained_poly_insts2.m:059: apple
|
|
constrained_poly_insts2.m:059: )
|
|
constrained_poly_insts2.m:059: ).
|
|
constrained_poly_insts2.m:064: In clause for `p4((pred(in((I =<
|
|
constrained_poly_insts2.m:064: (constrained_poly_insts2.apple)))) is det),
|
|
constrained_poly_insts2.m:064: in((J =< (constrained_poly_insts2.apple))))':
|
|
constrained_poly_insts2.m:064: in argument 2 (i.e. argument 1 of the called
|
|
constrained_poly_insts2.m:064: predicate) of higher-order predicate call:
|
|
constrained_poly_insts2.m:064: mode error: argument `X' has the following
|
|
constrained_poly_insts2.m:064: inst:
|
|
constrained_poly_insts2.m:064: ( J =< named inst apple
|
|
constrained_poly_insts2.m:064: which expands to
|
|
constrained_poly_insts2.m:064: bound(
|
|
constrained_poly_insts2.m:064: apple
|
|
constrained_poly_insts2.m:064: )
|
|
constrained_poly_insts2.m:064: )
|
|
constrained_poly_insts2.m:064: which does not match any of the modes for
|
|
constrained_poly_insts2.m:064: higher-order predicate call.
|
|
constrained_poly_insts2.m:064: The first argument `X' has inst
|
|
constrained_poly_insts2.m:064: ( J =< named inst apple
|
|
constrained_poly_insts2.m:064: which expands to
|
|
constrained_poly_insts2.m:064: bound(
|
|
constrained_poly_insts2.m:064: apple
|
|
constrained_poly_insts2.m:064: )
|
|
constrained_poly_insts2.m:064: ),
|
|
constrained_poly_insts2.m:064: which does not match any of those modes.
|
|
constrained_poly_insts2.m:069: In clause for `p5((pred(in((I =<
|
|
constrained_poly_insts2.m:069: (constrained_poly_insts2.apple)))) is det),
|
|
constrained_poly_insts2.m:069: in((constrained_poly_insts2.apple)))':
|
|
constrained_poly_insts2.m:069: in argument 2 (i.e. argument 1 of the called
|
|
constrained_poly_insts2.m:069: predicate) of higher-order predicate call:
|
|
constrained_poly_insts2.m:069: mode error: argument `X' has the following
|
|
constrained_poly_insts2.m:069: inst:
|
|
constrained_poly_insts2.m:069: named inst apple
|
|
constrained_poly_insts2.m:069: which expands to
|
|
constrained_poly_insts2.m:069: bound(
|
|
constrained_poly_insts2.m:069: apple
|
|
constrained_poly_insts2.m:069: )
|
|
constrained_poly_insts2.m:069: which does not match any of the modes for
|
|
constrained_poly_insts2.m:069: higher-order predicate call.
|
|
constrained_poly_insts2.m:069: The first argument `X' has inst
|
|
constrained_poly_insts2.m:069: named inst apple
|
|
constrained_poly_insts2.m:069: which expands to
|
|
constrained_poly_insts2.m:069: bound(
|
|
constrained_poly_insts2.m:069: apple
|
|
constrained_poly_insts2.m:069: ),
|
|
constrained_poly_insts2.m:069: which does not match any of those modes.
|