mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-13 04:44:39 +00:00
0821b301f2
compiler/module_qual.m:
The interface of a module A contains items (e.g. predicate declarations)
that refer to entities such as types, insts, modes etc. They may refer
to those entities if (a) they are defined in the interface of module A,
(b) in a parent module of module A, or (c) if they are imported from
another module, module B, which is imported into module A in the interface
of module A.
The old algorithm that attempted to enforce this requirement had a basic
design fault: it based the decision as to whether the use of an entity
in the interface was legal solely on the name of the module that defined
that entity. This correctly implements tests (b) and (c), but it does
not even attempt to implement the interface test part of (a).
It therefore allowed exported items to refer to nonexported entities.
This diff changes the whole design approach to the test. Instead of
keeping a list of modules *all* of whose entities may be used in the
interface of the current module, record for *every* entity whether
it may be used in the interface. Set the permissions differently
in the interface and implementation sections of the current module.
Improve the formatting of the ambiguity error message.
NEWS:
Announce the stricter enforcement of the documented language rules,
in a new section for potentially compatibility-breaking changes.
compiler/check_typeclass.m:
Delete a test for a special case of the situation that module_qual.m
now tests for. If this problem occurs, module_qual.m will pick it up,
and check_typeclass.m will never even be invoked, so this copy of the test
can never succeed.
library/hash_table.m:
Fix code that violated the language rules: we export a type that
includes another type, but didn't export the second type. We now do.
browser/declarative_analyser.m:
browser/declarative_edt.m:
compiler/coverage_profiling.m:
Fix code that violated the language rules. We used to export predicates
and functions whose argument types included nonexported types. As it
happens, none of those predicates and functions actually need to be
exported, so keep them private.
In coverage_profiling.m, don't abstract export a type that is not
used outside the module, and give a function a name that doesn't
clash with a type name.
tests/invalid/bug17.{m,err_exp}:
A new test case to test the error message we get if the module interface
refers to a nonexported type.
tests/invalid/bad_instance.err_exp:
This test case used to get two kinds of errors, one of which was
the illegal use of nonexported type in an exported abstract instance
declaration. We now discover this error earlier, and stop after we
do so. Update the expected error message.
tests/invalid/bad_instance2.{m,err_exp}:
New test case: a modified copy of bad_instance.m, testing the other
kind of error originally tested by bad_instance.m.
tests/invalid/instance_no_type.err_exp:
Update the expected error message.
tests/invalid/Mmakefile:
Enable the new test cases.
tests/benchmarks/query.m:
tests/hard_coded/unused_float_box_test.m:
tests/valid/bug300.m:
tests/valid/deforest_bug.m:
tests/valid/higher_order4.m:
tests/valid/lambda_recompute.m:
tests/valid/mert.m:
tests/valid/reuse_static.m:
tests/valid/switch_detection_bug2.m:
tests/valid/time_yaowl.m:
tests/warnings/unused_args_test.m:
Fix code that violated the language rules, typically by exporting
the type that previously, we illegally used in the module interface.
tests/recompilation/add_type_re.err_exp.2:
Expect the updated ambiguity error message.
77 lines
2.1 KiB
Mathematica
77 lines
2.1 KiB
Mathematica
%---------------------------------------------------------------------------%
|
|
% vim: ts=4 sw=4 et ft=mercury
|
|
%---------------------------------------------------------------------------%
|
|
%
|
|
% Fix a bug where cse_detection wasn't hoisting the common deconstruction
|
|
% for a one-arm switch on argument 2 of display_diff_side_by_side_2.
|
|
% The symptom was a determinism error.
|
|
|
|
:- module switch_detection_bug2.
|
|
|
|
:- interface.
|
|
:- import_module bool.
|
|
:- import_module io.
|
|
:- import_module int.
|
|
:- import_module list.
|
|
:- import_module pair.
|
|
|
|
:- type pos == int.
|
|
|
|
:- type segment == pair(pos, pos).
|
|
|
|
:- type edit
|
|
---> add(pos, segment)
|
|
; delete(segment, pos)
|
|
; change(segment, segment).
|
|
|
|
:- type diff == list(edit).
|
|
|
|
% Parameters to pass around.
|
|
:- type side_by_side_info
|
|
---> side_by_side_info(
|
|
int, % Half width
|
|
int, % Column 2 offset
|
|
bool, % Left column only
|
|
bool, % Suppress common lines
|
|
bool % Help sdiff
|
|
).
|
|
|
|
:- pred display_diff_side_by_side_2(int, side_by_side_info, diff,
|
|
io__state, io__state).
|
|
:- mode display_diff_side_by_side_2(in, in, in, di, uo) is det.
|
|
|
|
%---------------------------------------------------------------------------%
|
|
|
|
:- implementation.
|
|
|
|
:- import_module char.
|
|
:- import_module int.
|
|
:- import_module list.
|
|
:- import_module require.
|
|
:- import_module std_util.
|
|
:- import_module string.
|
|
|
|
display_diff_side_by_side_2(_Prev, SBS, []) -->
|
|
{ SBS = side_by_side_info(_, _, _, Suppress, _) },
|
|
( { Suppress = no } ->
|
|
[]
|
|
;
|
|
[]
|
|
).
|
|
display_diff_side_by_side_2(Prev, SBS, [Edit | Diff]) -->
|
|
{ first_mentioned_positions(Edit, _, _) },
|
|
{ SBS = side_by_side_info(_, _, _, Suppress, _) },
|
|
( { Suppress = no } ->
|
|
[]
|
|
;
|
|
[]
|
|
),
|
|
display_diff_side_by_side_2(Prev, SBS, Diff).
|
|
|
|
:- pred first_mentioned_positions(edit :: in, pos :: out, pos :: out) is det.
|
|
:- pragma no_inline(first_mentioned_positions/3).
|
|
|
|
first_mentioned_positions(_, 42, 42).
|
|
|
|
%---------------------------------------------------------------------------%
|