mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-14 21:35:49 +00:00
Estimated hours taken: 50
Add support for nested modules.
- module names may themselves be module-qualified
- modules may contain `:- include_module' declarations
which name sub-modules
- a sub-module has access to all the declarations in the
parent module (including its implementation section).
This support is not yet complete; see the BUGS and LIMITATIONS below.
LIMITATIONS
- source file names must match module names
(just as they did previously)
- mmc doesn't allow path names on the command line any more
(e.g. `mmc --make-int ../library/foo.m').
- import_module declarations must use the fully-qualified module name
- module qualifiers must use the fully-qualified module name
- no support for root-qualified module names
(e.g. `:parent:child' instead of `parent:child').
- modules may not be physically nested (only logical nesting, via
`include_module').
BUGS
- doesn't check that the parent module is imported/used before allowing
import/use of its sub-modules.
- doesn't check that there is an include_module declaration in the
parent for each module claiming to be a child of that parent
- privacy of private modules is not enforced
-------------------
NEWS:
Mention that we support nested modules.
library/ops.m:
library/nc_builtin.nl:
library/sp_builtin.nl:
compiler/mercury_to_mercury.m:
Add `include_module' as a new prefix operator.
Change the associativity of `:' from xfy to yfx
(since this made parsing module qualifiers slightly easier).
compiler/prog_data.m:
Add new `include_module' declaration.
Change the `module_name' and `module_specifier' types
from strings to sym_names, so that module names can
themselves be module qualified.
compiler/modules.m:
Add predicates module_name_to_file_name/2 and
file_name_to_module_name/2.
Lots of changes to handle parent module dependencies,
to create parent interface (`.int0') files, to read them in,
to output correct dependencies information for them to the
`.d' and `.dep' files, etc.
Rewrite a lot of the code to improve the readability
(add comments, use subroutines, better variable names).
Also fix a couple of bugs:
- generate_dependencies was using the transitive implementation
dependencies rather than the transitive interface dependencies
to compute the `.int3' dependencies when writing `.d' files
(this bug was introduced during crs's changes to support
`.trans_opt' files)
- when creating the `.int' file, it was reading in the
interfaces for modules imported in the implementation section,
not just those in the interface section.
This meant that the compiler missed a lot of errors.
library/graph.m:
library/lexer.m:
library/term.m:
library/term_io.m:
library/varset.m:
compiler/*.m:
Add `:- import_module' declarations to the interface needed
by declarations in the interface. (The previous version
of the compiler did not detect these missing interface imports,
due to the above-mentioned bug in modules.m.)
compiler/mercury_compile.m:
compiler/intermod.m:
Change mercury_compile__maybe_grab_optfiles and
intermod__grab_optfiles so that they grab the opt files for
parent modules as well as the ones for imported modules.
compiler/mercury_compile.m:
Minor changes to handle parent module dependencies.
(Also improve the wording of the warning about trans-opt
dependencies.)
compiler/make_hlds.m:
compiler/module_qual.m:
Ignore `:- include_module' declarations.
compiler/module_qual.m:
A couple of small changes to handle nested module names.
compiler/prog_out.m:
compiler/prog_util.m:
Add new predicates string_to_sym_name/3 (prog_util.m) and
sym_name_to_string/{2,3} (prog_out.m).
compiler/*.m:
Replace many occurrences of `string' with `module_name'.
Change code that prints out module names or converts
them to strings or filenames to handle the fact that
module names are now sym_names intead of strings.
Also change a few places (e.g. in intermod.m, hlds_module.m)
where the code assumed that any qualified symbol was
fully-qualified.
compiler/prog_io.m:
compiler/prog_io_goal.m:
Move sym_name_and_args/3, parse_qualified_term/4 and
parse_qualified_term/5 preds from prog_io_goal.m to prog_io.m,
since they are very similar to the parse_symbol_name/2 predicate
already in prog_io.m. Rewrite these predicates, both
to improve maintainability, and to handle the newly
allowed syntax (module-qualified module names).
Rename parse_qualified_term/5 as `parse_implicit_qualified_term'.
compiler/prog_io.m:
Rewrite the handling of `:- module' and `:- end_module'
declarations, so that it can handle nested modules.
Add code to parse `include_module' declarations.
compiler/prog_util.m:
compiler/*.m:
Add new predicates mercury_public_builtin_module/1 and
mercury_private_builtin_module/1 in prog_util.m.
Change most of the hard-coded occurrences of "mercury_builtin"
to call mercury_private_builtin_module/1 or
mercury_public_builtin_module/1 or both.
compiler/llds_out.m:
Add llds_out__sym_name_mangle/2, for mangling module names.
compiler/special_pred.m:
compiler/mode_util.m:
compiler/clause_to_proc.m:
compiler/prog_io_goal.m:
compiler/lambda.m:
compiler/polymorphism.m:
Move the predicates in_mode/1, out_mode/1, and uo_mode/1
from special_pred.m to mode_util.m, and change various
hard-coded definitions to instead call these predicates.
compiler/polymorphism.m:
Ensure that the type names `type_info' and `typeclass_info' are
module-qualified in the generated code. This avoids a problem
where the code generated by polymorphism.m was not considered
type-correct, due to the type `type_info' not matching
`mercury_builtin:type_info'.
compiler/check_typeclass.m:
Simplify the code for check_instance_pred and
get_matching_instance_pred_ids.
compiler/mercury_compile.m:
compiler/modules.m:
Disallow directory names in command-line arguments.
compiler/options.m:
compiler/handle_options.m:
compiler/mercury_compile.m:
compiler/modules.m:
Add a `--make-private-interface' option.
The private interface file `<module>.int0' contains
all the declarations in the module; it is used for
compiling sub-modules.
scripts/Mmake.rules:
scripts/Mmake.vars.in:
Add support for creating `.int0' and `.date0' files
by invoking mmc with `--make-private-interface'.
doc/user_guide.texi:
Document `--make-private-interface' and the `.int0'
and `.date0' file extensions.
doc/reference_manual.texi:
Document nested modules.
util/mdemangle.c:
profiler/demangle.m:
Demangle names with multiple module qualifiers.
tests/general/Mmakefile:
tests/general/string_format_test.m:
tests/general/string_format_test.exp:
tests/general/string__format_test.m:
tests/general/string__format_test.exp:
tests/general/.cvsignore:
Change the `:- module string__format_test' declaration in
`string__format_test.m' to `:- module string_format_test',
because with the original declaration the `__' was taken
as a module qualifier, which lead to an error message.
Hence rename the file accordingly, to avoid the warning
about file name not matching module name.
tests/invalid/Mmakefile:
tests/invalid/missing_interface_import.m:
tests/invalid/missing_interface_import.err_exp:
Regression test to check that the compiler reports
errors for missing `import_module' in the interface section.
tests/invalid/*.err_exp:
tests/warnings/unused_args_test.exp:
tests/warnings/unused_import.exp:
Update the expected diagnostics output for the test cases to
reflect a few minor changes to the warning messages.
tests/hard_coded/Mmakefile:
tests/hard_coded/parent.m:
tests/hard_coded/parent.child.m:
tests/hard_coded/parent.exp:
tests/hard_coded/parent2.m:
tests/hard_coded/parent2.child.m:
tests/hard_coded/parent2.exp:
Two simple tests case for the use of nested modules with
separate compilation.
826 lines
30 KiB
Mathematica
826 lines
30 KiB
Mathematica
%-----------------------------------------------------------------------------%
|
|
% Copyright (C) 1996-1998 The University of Melbourne.
|
|
% This file may only be copied under the terms of the GNU General
|
|
% Public License - see the file COPYING in the Mercury distribution.
|
|
%-----------------------------------------------------------------------------%
|
|
% File: instmap.m
|
|
% Main author: bromage.
|
|
%
|
|
% This module contains code which implements the instmap and instmap_delta
|
|
% ADTs.
|
|
%
|
|
% An instmap stores information on what instantiation states a set of
|
|
% variables have. An instmap_delta stores information on how these
|
|
% instantiation states change across a goal.
|
|
%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- module instmap.
|
|
|
|
:- interface.
|
|
|
|
:- import_module hlds_module, prog_data, mode_info, (inst), mode_errors.
|
|
:- import_module hlds_data.
|
|
|
|
:- import_module map, bool, set, term, list, assoc_list.
|
|
|
|
:- type instmap.
|
|
:- type instmap_delta.
|
|
|
|
% Initialize an empty instmap.
|
|
%
|
|
:- pred instmap__init_reachable(instmap).
|
|
:- mode instmap__init_reachable(out) is det.
|
|
|
|
% Initialize an empty unreachable instmap.
|
|
%
|
|
:- pred instmap__init_unreachable(instmap).
|
|
:- mode instmap__init_unreachable(out) is det.
|
|
|
|
% Initialize an empty reachable instmap_delta.
|
|
%
|
|
:- pred instmap_delta_init_reachable(instmap_delta).
|
|
:- mode instmap_delta_init_reachable(out) is det.
|
|
|
|
% Initialize an empty unreachable instmap_delta.
|
|
%
|
|
:- pred instmap_delta_init_unreachable(instmap_delta).
|
|
:- mode instmap_delta_init_unreachable(out) is det.
|
|
|
|
% For any instmap InstMap, exactly one of
|
|
% instmap__is_reachable(InstMap) and
|
|
% instmap__is_unreachable(InstMap) holds.
|
|
|
|
% Is the instmap reachable?
|
|
%
|
|
:- pred instmap__is_reachable(instmap).
|
|
:- mode instmap__is_reachable(in) is semidet.
|
|
|
|
% Is the instmap unreachable?
|
|
%
|
|
:- pred instmap__is_unreachable(instmap).
|
|
:- mode instmap__is_unreachable(in) is semidet.
|
|
|
|
% For any instmap InstMapDelta, exactly one of
|
|
% instmap_delta_is_reachable(InstMapDelta) and
|
|
% instmap_delta_is_unreachable(InstMapDelta) holds.
|
|
|
|
% Is the instmap_delta reachable?
|
|
%
|
|
:- pred instmap_delta_is_reachable(instmap_delta).
|
|
:- mode instmap_delta_is_reachable(in) is semidet.
|
|
|
|
% Is the instmap_delta unreachable?
|
|
%
|
|
:- pred instmap_delta_is_unreachable(instmap_delta).
|
|
:- mode instmap_delta_is_unreachable(in) is semidet.
|
|
|
|
:- pred instmap__from_assoc_list(assoc_list(var, inst), instmap).
|
|
:- mode instmap__from_assoc_list(in, out) is det.
|
|
|
|
:- pred instmap_delta_from_assoc_list(assoc_list(var, inst), instmap_delta).
|
|
:- mode instmap_delta_from_assoc_list(in, out) is det.
|
|
|
|
:- pred instmap_delta_from_mode_list(list(var), list(mode),
|
|
module_info, instmap_delta).
|
|
:- mode instmap_delta_from_mode_list(in, in, in, out) is det.
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% Return the set of variables in an instmap.
|
|
%
|
|
:- pred instmap__vars(instmap, set(var)).
|
|
:- mode instmap__vars(in, out) is det.
|
|
|
|
% Return the list of variables in an instmap.
|
|
%
|
|
:- pred instmap__vars_list(instmap, list(var)).
|
|
:- mode instmap__vars_list(in, out) is det.
|
|
|
|
% Return the set of variables whose instantiations have
|
|
% changed (or our knowledge about them has changed) across
|
|
% an instmap_delta.
|
|
%
|
|
:- pred instmap_delta_changed_vars(instmap_delta, set(var)).
|
|
:- mode instmap_delta_changed_vars(in, out) is det.
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% Given an instmap and a variable, determine the inst of
|
|
% that variable.
|
|
%
|
|
:- pred instmap__lookup_var(instmap, var, inst).
|
|
:- mode instmap__lookup_var(in, in, out) is det.
|
|
|
|
% Given an instmap_delta and a variable, determine the new inst
|
|
% of that variable (if any).
|
|
%
|
|
:- pred instmap_delta_search_var(instmap_delta, var, inst).
|
|
:- mode instmap_delta_search_var(in, in, out) is semidet.
|
|
|
|
% Given an instmap and a list of variables, return a list
|
|
% containing the insts of those variable.
|
|
%
|
|
:- pred instmap__lookup_vars(list(var), instmap, list(inst)).
|
|
:- mode instmap__lookup_vars(in, in, out) is det.
|
|
|
|
% Insert an entry into an instmap_delta. Note that you
|
|
% cannot call instmap_delta_insert for a variable already
|
|
% present.
|
|
%
|
|
:- pred instmap_delta_insert(instmap_delta, var, inst, instmap_delta).
|
|
:- mode instmap_delta_insert(in, in, in, out) is det.
|
|
|
|
% Set an entry in an instmap.
|
|
%
|
|
:- pred instmap__set(instmap, var, inst, instmap).
|
|
:- mode instmap__set(in, in, in, out) is det.
|
|
|
|
% Set multiple entries in an instmap.
|
|
%
|
|
:- pred instmap__set_vars(instmap, list(var), list(inst), instmap).
|
|
:- mode instmap__set_vars(in, in, in, out) is det.
|
|
|
|
:- pred instmap_delta_set(instmap_delta, var, inst, instmap_delta).
|
|
:- mode instmap_delta_set(in, in, in, out) is det.
|
|
|
|
% Bind a variable in an instmap to a functor at the beginning
|
|
% of a case in a switch. Aborts on compiler generated cons_ids.
|
|
:- pred instmap_delta_bind_var_to_functor(var, cons_id, instmap,
|
|
instmap_delta, instmap_delta, module_info, module_info).
|
|
:- mode instmap_delta_bind_var_to_functor(in, in, in, in, out, in, out) is det.
|
|
|
|
:- pred instmap__bind_var_to_functor(var, cons_id,
|
|
instmap, instmap, module_info, module_info).
|
|
:- mode instmap__bind_var_to_functor(in, in, in, out, in, out) is det.
|
|
|
|
% Update the given instmap to include the initial insts of the
|
|
% lambda variables.
|
|
:- pred instmap__pre_lambda_update(module_info, list(var), list(mode),
|
|
instmap, instmap).
|
|
:- mode instmap__pre_lambda_update(in, in, in, in, out) is det.
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% Given two instmaps and a set of variables, compute an instmap delta
|
|
% which records the change in the instantiation state of those
|
|
% variables.
|
|
%
|
|
:- pred compute_instmap_delta(instmap, instmap, set(var), instmap_delta).
|
|
:- mode compute_instmap_delta(in, in, in, out) is det.
|
|
|
|
% Given an instmap and an instmap_delta, apply the instmap_delta
|
|
% to the instmap to produce a new instmap.
|
|
%
|
|
:- pred instmap__apply_instmap_delta(instmap, instmap_delta, instmap).
|
|
:- mode instmap__apply_instmap_delta(in, in, out) is det.
|
|
|
|
% Given an instmap_delta and an instmap_delta, apply the
|
|
% second instmap_delta to the first to produce a new
|
|
% instmap_delta.
|
|
%
|
|
:- pred instmap_delta_apply_instmap_delta(instmap_delta, instmap_delta,
|
|
instmap_delta).
|
|
:- mode instmap_delta_apply_instmap_delta(in, in, out) is det.
|
|
|
|
% instmap_merge(NonLocalVars, InstMaps, MergeContext):
|
|
% Merge the `InstMaps' resulting from different branches
|
|
% of a disjunction or if-then-else, and update the
|
|
% instantiatedness of all the nonlocal variables,
|
|
% checking that it is the same for every branch.
|
|
%
|
|
:- pred instmap__merge(set(var), list(instmap), merge_context,
|
|
mode_info, mode_info).
|
|
:- mode instmap__merge(in, in, in, mode_info_di, mode_info_uo) is det.
|
|
|
|
% instmap__restrict takes an instmap and a set of vars and
|
|
% returns an instmap with its domain restricted to those
|
|
% vars.
|
|
%
|
|
:- pred instmap__restrict(instmap, set(var), instmap).
|
|
:- mode instmap__restrict(in, in, out) is det.
|
|
|
|
% instmap_delta_restrict takes an instmap and a set of vars
|
|
% and returns an instmap_delta with its domain restricted to
|
|
% those vars.
|
|
%
|
|
:- pred instmap_delta_restrict(instmap_delta, set(var), instmap_delta).
|
|
:- mode instmap_delta_restrict(in, in, out) is det.
|
|
|
|
% instmap_delta_delete_vars takes an instmap_delta and a list of
|
|
% vars and returns an instmap_delta with those vars removed from
|
|
% its domain.
|
|
%
|
|
:- pred instmap_delta_delete_vars(instmap_delta, list(var), instmap_delta).
|
|
:- mode instmap_delta_delete_vars(in, in, out) is det.
|
|
|
|
% `instmap__no_output_vars(Instmap, InstmapDelta, Vars, ModuleInfo)'
|
|
% is true if none of the vars in the set Vars could have become more
|
|
% instantiated when InstmapDelta is applied to Instmap.
|
|
:- pred instmap__no_output_vars(instmap, instmap_delta, set(var), module_info).
|
|
:- mode instmap__no_output_vars(in, in, in, in) is semidet.
|
|
|
|
% merge_instmap_delta(InitialInstMap, NonLocals,
|
|
% InstMapDeltaA, InstMapDeltaB, ModuleInfo0, ModuleInfo)
|
|
% Merge the instmap_deltas of different branches of an ite, disj
|
|
% or switch.
|
|
:- pred merge_instmap_delta(instmap, set(var), instmap_delta, instmap_delta,
|
|
instmap_delta, module_info, module_info).
|
|
:- mode merge_instmap_delta(in, in, in, in, out, in, out) is det.
|
|
|
|
% merge_instmap_deltas(Vars, InstMapDeltas,
|
|
% MergedInstMapDelta, ModuleInfo0, ModuleInfo)
|
|
% takes a list of instmap deltas from the branches of an if-then-else,
|
|
% switch, or disj and merges them. This is used in situations
|
|
% where the bindings are known to be compatible.
|
|
:- pred merge_instmap_deltas(instmap, set(var), list(instmap_delta),
|
|
instmap_delta, module_info, module_info).
|
|
:- mode merge_instmap_deltas(in, in, in, out, in, out) is det.
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% `instmap_delta_apply_sub(InstmapDelta0, Must, Sub, InstmapDelta)'
|
|
% the variable substitution Sub to InstmapDelta0 to get the new
|
|
% instmap_delta InstmapDelta. If there is a variable in
|
|
% InstmapDelta0 which does not appear in Sub, it is ignored if
|
|
% Must is set to no, otherwise it is an error.
|
|
%
|
|
:- pred instmap_delta_apply_sub(instmap_delta, bool, map(var, var),
|
|
instmap_delta).
|
|
:- mode instmap_delta_apply_sub(in, in, in, out) is det.
|
|
|
|
:- pred instmap__apply_sub(instmap, bool, map(var, var), instmap).
|
|
:- mode instmap__apply_sub(in, in, in, out) is det.
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- pred instmap__to_assoc_list(instmap, assoc_list(var, inst)).
|
|
:- mode instmap__to_assoc_list(in, out) is det.
|
|
|
|
:- pred instmap_delta_to_assoc_list(instmap_delta, assoc_list(var, inst)).
|
|
:- mode instmap_delta_to_assoc_list(in, out) is det.
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
:- implementation.
|
|
|
|
:- import_module mode_util, inst_match, prog_data, goal_util.
|
|
:- import_module hlds_data, inst_util.
|
|
|
|
:- import_module std_util, require.
|
|
|
|
:- type instmap_delta == instmap.
|
|
|
|
:- type instmap ---> reachable(instmapping)
|
|
; unreachable.
|
|
|
|
:- type instmapping == map(var, inst).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% Initialize an empty instmap and instmap_delta.
|
|
|
|
instmap__init_reachable(reachable(InstMapping)) :-
|
|
map__init(InstMapping).
|
|
|
|
instmap__init_unreachable(unreachable).
|
|
|
|
instmap_delta_init_reachable(reachable(InstMapping)) :-
|
|
map__init(InstMapping).
|
|
|
|
instmap_delta_init_unreachable(unreachable).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
instmap__is_reachable(reachable(_)).
|
|
|
|
instmap__is_unreachable(unreachable).
|
|
|
|
instmap_delta_is_reachable(reachable(_)).
|
|
|
|
instmap_delta_is_unreachable(unreachable).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
instmap__from_assoc_list(AL, reachable(Instmapping)) :-
|
|
map__from_assoc_list(AL, Instmapping).
|
|
|
|
instmap_delta_from_assoc_list(AL, reachable(Instmapping)) :-
|
|
map__from_assoc_list(AL, Instmapping).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
instmap_delta_from_mode_list(Var, Modes, ModuleInfo, InstMapDelta) :-
|
|
instmap_delta_init_reachable(InstMapDelta0),
|
|
instmap_delta_from_mode_list_2(Var, Modes, ModuleInfo,
|
|
InstMapDelta0, InstMapDelta).
|
|
|
|
:- pred instmap_delta_from_mode_list_2(list(var), list(mode),
|
|
module_info, instmap_delta, instmap_delta).
|
|
:- mode instmap_delta_from_mode_list_2(in, in, in, in, out) is det.
|
|
|
|
instmap_delta_from_mode_list_2([], [], _, InstMapDelta, InstMapDelta).
|
|
instmap_delta_from_mode_list_2([], [_|_], _, _, _) :-
|
|
error("instmap_delta_from_mode_list_2").
|
|
instmap_delta_from_mode_list_2([_|_], [], _, _, _) :-
|
|
error("instmap_delta_from_mode_list_2").
|
|
instmap_delta_from_mode_list_2([Var | Vars], [Mode | Modes], ModuleInfo,
|
|
InstMapDelta0, InstMapDelta) :-
|
|
mode_get_insts(ModuleInfo, Mode, Inst1, Inst2),
|
|
( Inst1 = Inst2 ->
|
|
instmap_delta_from_mode_list_2(Vars, Modes, ModuleInfo,
|
|
InstMapDelta0, InstMapDelta)
|
|
;
|
|
instmap_delta_set(InstMapDelta0, Var, Inst2, InstMapDelta1),
|
|
instmap_delta_from_mode_list_2(Vars, Modes, ModuleInfo,
|
|
InstMapDelta1, InstMapDelta)
|
|
).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
instmap__vars(Instmap, Vars) :-
|
|
instmap__vars_list(Instmap, VarsList),
|
|
set__list_to_set(VarsList, Vars).
|
|
|
|
instmap__vars_list(unreachable, []).
|
|
instmap__vars_list(reachable(InstMapping), VarsList) :-
|
|
map__keys(InstMapping, VarsList).
|
|
|
|
instmap_delta_changed_vars(unreachable, EmptySet) :-
|
|
set__init(EmptySet).
|
|
instmap_delta_changed_vars(reachable(InstMapping), ChangedVars) :-
|
|
map__keys(InstMapping, ChangedVarsList),
|
|
set__sorted_list_to_set(ChangedVarsList, ChangedVars).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% Given an instmap and a variable, determine the inst of
|
|
% that variable.
|
|
|
|
instmap__lookup_var(unreachable, _Var, not_reached).
|
|
instmap__lookup_var(reachable(InstMap), Var, Inst) :-
|
|
instmapping_lookup_var(InstMap, Var, Inst).
|
|
|
|
:- pred instmapping_lookup_var(instmapping, var, inst).
|
|
:- mode instmapping_lookup_var(in, in, out) is det.
|
|
|
|
instmapping_lookup_var(InstMap, Var, Inst) :-
|
|
( map__search(InstMap, Var, VarInst) ->
|
|
Inst = VarInst
|
|
;
|
|
Inst = free
|
|
).
|
|
|
|
instmap_delta_search_var(unreachable, _, not_reached).
|
|
instmap_delta_search_var(reachable(InstMap), Var, Inst) :-
|
|
map__search(InstMap, Var, Inst).
|
|
|
|
instmap__lookup_vars([], _InstMap, []).
|
|
instmap__lookup_vars([Arg|Args], InstMap, [Inst|Insts]) :-
|
|
instmap__lookup_var(InstMap, Arg, Inst),
|
|
instmap__lookup_vars(Args, InstMap, Insts).
|
|
|
|
instmap__set(unreachable, _Var, _Inst, unreachable).
|
|
instmap__set(reachable(InstMapping0), Var, Inst,
|
|
reachable(InstMapping)) :-
|
|
map__set(InstMapping0, Var, Inst, InstMapping).
|
|
|
|
instmap__set_vars(InstMap, [], [], InstMap).
|
|
instmap__set_vars(InstMap0, [V | Vs], [I | Is], InstMap) :-
|
|
instmap__set(InstMap0, V, I, InstMap1),
|
|
instmap__set_vars(InstMap1, Vs, Is, InstMap).
|
|
instmap__set_vars(_, [_ | _], [], _) :-
|
|
error("instmap__set_vars").
|
|
instmap__set_vars(_, [], [_ | _], _) :-
|
|
error("instmap__set_vars").
|
|
|
|
instmap_delta_set(unreachable, _Var, _Inst, unreachable).
|
|
instmap_delta_set(reachable(InstMapping0), Var, Inst, Instmap) :-
|
|
( Inst = not_reached ->
|
|
Instmap = unreachable
|
|
;
|
|
map__set(InstMapping0, Var, Inst, InstMapping),
|
|
Instmap = reachable(InstMapping)
|
|
).
|
|
|
|
instmap_delta_insert(unreachable, _Var, _Inst, unreachable).
|
|
instmap_delta_insert(reachable(InstMapping0), Var, Inst, Instmap) :-
|
|
( Inst = not_reached ->
|
|
Instmap = unreachable
|
|
;
|
|
map__det_insert(InstMapping0, Var, Inst, InstMapping),
|
|
Instmap = reachable(InstMapping)
|
|
).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
instmap_delta_bind_var_to_functor(Var, ConsId, InstMap,
|
|
InstmapDelta0, InstmapDelta, ModuleInfo0, ModuleInfo) :-
|
|
(
|
|
InstmapDelta0 = unreachable,
|
|
InstmapDelta = unreachable,
|
|
ModuleInfo = ModuleInfo0
|
|
;
|
|
InstmapDelta0 = reachable(InstmappingDelta0),
|
|
|
|
%
|
|
% Get the initial inst from the InstMap
|
|
%
|
|
instmap__lookup_var(InstMap, Var, OldInst),
|
|
|
|
%
|
|
% Compute the new inst by taking the old inst,
|
|
% applying the instmap delta to it,
|
|
% and then unifying with bound(ConsId, ...)
|
|
%
|
|
( map__search(InstmappingDelta0, Var, NewInst0) ->
|
|
NewInst1 = NewInst0
|
|
;
|
|
NewInst1 = OldInst
|
|
),
|
|
bind_inst_to_functor(NewInst1, ConsId, NewInst,
|
|
ModuleInfo0, ModuleInfo),
|
|
|
|
%
|
|
% add `Var :: OldInst -> NewInst' to the instmap delta
|
|
%
|
|
( NewInst \= OldInst ->
|
|
instmap_delta_set(InstmapDelta0, Var, NewInst,
|
|
InstmapDelta)
|
|
;
|
|
InstmapDelta = InstmapDelta0
|
|
)
|
|
).
|
|
|
|
instmap__bind_var_to_functor(Var, ConsId, InstMap0, InstMap,
|
|
ModuleInfo0, ModuleInfo) :-
|
|
instmap__lookup_var(InstMap0, Var, Inst0),
|
|
bind_inst_to_functor(Inst0, ConsId, Inst, ModuleInfo0, ModuleInfo),
|
|
instmap__set(InstMap0, Var, Inst, InstMap).
|
|
|
|
:- pred bind_inst_to_functor((inst), cons_id, (inst),
|
|
module_info, module_info).
|
|
:- mode bind_inst_to_functor(in, in, out, in, out) is det.
|
|
|
|
bind_inst_to_functor(Inst0, ConsId, Inst, ModuleInfo0, ModuleInfo) :-
|
|
cons_id_arity(ConsId, Arity),
|
|
list__duplicate(Arity, dead, ArgLives),
|
|
list__duplicate(Arity, free, ArgInsts),
|
|
(
|
|
abstractly_unify_inst_functor(dead, Inst0, ConsId, ArgInsts,
|
|
ArgLives, real_unify, ModuleInfo0, Inst1, _Det,
|
|
ModuleInfo1)
|
|
->
|
|
ModuleInfo = ModuleInfo1,
|
|
Inst = Inst1
|
|
;
|
|
error("bind_inst_to_functor: mode error")
|
|
).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
instmap__pre_lambda_update(ModuleInfo, Vars, Modes, InstMap0, InstMap) :-
|
|
mode_list_get_initial_insts(Modes, ModuleInfo, Insts),
|
|
assoc_list__from_corresponding_lists(Vars, Insts, VarInsts),
|
|
instmap_delta_from_assoc_list(VarInsts, InstMapDelta),
|
|
instmap__apply_instmap_delta(InstMap0, InstMapDelta, InstMap).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% Given an instmap and an instmap_delta, overlay the
|
|
% entries in the instmap_delta on top of those in the
|
|
% instmap to produce a new instmap.
|
|
|
|
instmap__apply_instmap_delta(unreachable, _, unreachable).
|
|
instmap__apply_instmap_delta(reachable(_), unreachable, unreachable).
|
|
instmap__apply_instmap_delta(reachable(InstMapping0),
|
|
reachable(InstMappingDelta), reachable(InstMapping)) :-
|
|
map__overlay(InstMapping0, InstMappingDelta, InstMapping).
|
|
|
|
% Given two instmap_deltas, overlay the entries in the second
|
|
% instmap_delta on top of those in the first to produce a new
|
|
% instmap_delta.
|
|
|
|
instmap_delta_apply_instmap_delta(unreachable, _, unreachable).
|
|
instmap_delta_apply_instmap_delta(reachable(_), unreachable, unreachable).
|
|
instmap_delta_apply_instmap_delta(reachable(InstMappingDelta0),
|
|
reachable(InstMappingDelta1), reachable(InstMappingDelta)) :-
|
|
map__overlay(InstMappingDelta0, InstMappingDelta1, InstMappingDelta).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
instmap__restrict(unreachable, _, unreachable).
|
|
instmap__restrict(reachable(InstMapping0), Vars, reachable(InstMapping)) :-
|
|
map__select(InstMapping0, Vars, InstMapping).
|
|
|
|
instmap_delta_restrict(unreachable, _, unreachable).
|
|
instmap_delta_restrict(reachable(InstMapping0), Vars, reachable(InstMapping)) :-
|
|
map__select(InstMapping0, Vars, InstMapping).
|
|
|
|
instmap_delta_delete_vars(unreachable, _, unreachable).
|
|
instmap_delta_delete_vars(reachable(InstMapping0), Vars,
|
|
reachable(InstMapping)) :-
|
|
map__delete_list(InstMapping0, Vars, InstMapping).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% instmap__merge(NonLocalVars, InstMaps, MergeContext):
|
|
% Merge the `InstMaps' resulting from different branches
|
|
% of a disjunction or if-then-else, and update the
|
|
% instantiatedness of all the nonlocal variables,
|
|
% checking that it is the same for every branch.
|
|
|
|
instmap__merge(NonLocals, InstMapList, MergeContext, ModeInfo0, ModeInfo) :-
|
|
mode_info_get_instmap(ModeInfo0, InstMap0),
|
|
mode_info_get_module_info(ModeInfo0, ModuleInfo0),
|
|
get_reachable_instmaps(InstMapList, InstMappingList),
|
|
( InstMappingList = [] ->
|
|
InstMap = unreachable,
|
|
ModeInfo2 = ModeInfo0
|
|
; InstMap0 = reachable(InstMapping0) ->
|
|
set__to_sorted_list(NonLocals, NonLocalsList),
|
|
instmap__merge_2(NonLocalsList, InstMapList, ModuleInfo0,
|
|
InstMapping0, ModuleInfo, InstMapping, ErrorList),
|
|
mode_info_set_module_info(ModeInfo0, ModuleInfo, ModeInfo1),
|
|
( ErrorList = [FirstError | _] ->
|
|
FirstError = Var - _,
|
|
set__singleton_set(WaitingVars, Var),
|
|
mode_info_error(WaitingVars,
|
|
mode_error_disj(MergeContext, ErrorList),
|
|
ModeInfo1, ModeInfo2
|
|
)
|
|
;
|
|
ModeInfo2 = ModeInfo1
|
|
),
|
|
InstMap = reachable(InstMapping)
|
|
;
|
|
InstMap = unreachable,
|
|
ModeInfo2 = ModeInfo0
|
|
),
|
|
mode_info_set_instmap(InstMap, ModeInfo2, ModeInfo).
|
|
|
|
:- pred get_reachable_instmaps(list(instmap), list(map(var,inst))).
|
|
:- mode get_reachable_instmaps(in, out) is det.
|
|
|
|
get_reachable_instmaps([], []).
|
|
get_reachable_instmaps([InstMap | InstMaps], Reachables) :-
|
|
( InstMap = reachable(InstMapping) ->
|
|
Reachables = [InstMapping | Reachables1],
|
|
get_reachable_instmaps(InstMaps, Reachables1)
|
|
;
|
|
get_reachable_instmaps(InstMaps, Reachables)
|
|
).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% instmap__merge_2(Vars, InstMaps, ModuleInfo, ErrorList):
|
|
% Let `ErrorList' be the list of variables in `Vars' for
|
|
% there are two instmaps in `InstMaps' for which the inst
|
|
% the variable is incompatible.
|
|
|
|
:- pred instmap__merge_2(list(var), list(instmap), module_info, map(var, inst),
|
|
module_info, map(var, inst), merge_errors).
|
|
:- mode instmap__merge_2(in, in, in, in, out, out, out) is det.
|
|
|
|
instmap__merge_2([], _, ModuleInfo, InstMap, ModuleInfo, InstMap, []).
|
|
instmap__merge_2([Var|Vars], InstMapList, ModuleInfo0, InstMap0,
|
|
ModuleInfo, InstMap, ErrorList) :-
|
|
instmap__merge_2(Vars, InstMapList, ModuleInfo0, InstMap0,
|
|
ModuleInfo1, InstMap1, ErrorList1),
|
|
instmap__merge_var(InstMapList, Var, ModuleInfo1,
|
|
Insts, Inst, ModuleInfo, Error),
|
|
( Error = yes ->
|
|
ErrorList = [Var - Insts | ErrorList1],
|
|
map__set(InstMap1, Var, not_reached, InstMap)
|
|
;
|
|
ErrorList = ErrorList1,
|
|
map__set(InstMap1, Var, Inst, InstMap)
|
|
).
|
|
|
|
% instmap_merge_var(InstMaps, Var, ModuleInfo, Insts, Error):
|
|
% Let `Insts' be the list of the inst of `Var' in the
|
|
% corresponding `InstMaps'. Let `Error' be yes iff
|
|
% there are two instmaps for which the inst of `Var'
|
|
% is incompatible.
|
|
|
|
:- pred instmap__merge_var(list(instmap), var, module_info,
|
|
list(inst), inst, module_info, bool).
|
|
:- mode instmap__merge_var(in, in, in, out, out, out, out) is det.
|
|
|
|
instmap__merge_var([], _, ModuleInfo, [], not_reached, ModuleInfo, no).
|
|
instmap__merge_var([InstMap | InstMaps], Var, ModuleInfo0,
|
|
InstList, Inst, ModuleInfo, Error) :-
|
|
instmap__merge_var(InstMaps, Var, ModuleInfo0,
|
|
InstList0, Inst0, ModuleInfo1, Error0),
|
|
instmap__lookup_var(InstMap, Var, VarInst),
|
|
InstList = [VarInst | InstList0],
|
|
( inst_merge(Inst0, VarInst, ModuleInfo1, Inst1, ModuleInfo2) ->
|
|
Inst = Inst1,
|
|
ModuleInfo = ModuleInfo2,
|
|
Error = Error0
|
|
;
|
|
Error = yes,
|
|
ModuleInfo = ModuleInfo1,
|
|
Inst = not_reached
|
|
).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
merge_instmap_deltas(InstMap, NonLocals, InstMapDeltaList, MergedDelta,
|
|
ModuleInfo0, ModuleInfo) :-
|
|
(
|
|
InstMapDeltaList = [],
|
|
error("merge_instmap_deltas: empty instmap_delta list.")
|
|
;
|
|
InstMapDeltaList = [Delta|Deltas],
|
|
merge_instmap_deltas(InstMap, NonLocals, Delta, Deltas,
|
|
MergedDelta, ModuleInfo0, ModuleInfo)
|
|
).
|
|
|
|
:- pred merge_instmap_deltas(instmap, set(var), instmap_delta,
|
|
list(instmap_delta), instmap_delta, module_info, module_info).
|
|
:- mode merge_instmap_deltas(in, in, in, in, out, in, out) is det.
|
|
|
|
merge_instmap_deltas(_InstMap, _NonLocals, MergedDelta, [], MergedDelta,
|
|
ModuleInfo, ModuleInfo).
|
|
merge_instmap_deltas(InstMap, NonLocals, MergedDelta0, [Delta|Deltas],
|
|
MergedDelta, ModuleInfo0, ModuleInfo) :-
|
|
merge_instmap_delta(InstMap, NonLocals, MergedDelta0, Delta,
|
|
MergedDelta1, ModuleInfo0, ModuleInfo1),
|
|
merge_instmap_deltas(InstMap, NonLocals, MergedDelta1, Deltas,
|
|
MergedDelta, ModuleInfo1, ModuleInfo).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% Given two instmaps and a set of variables, compute an instmap delta
|
|
% which records the change in the instantiation state of those
|
|
% variables.
|
|
|
|
compute_instmap_delta(unreachable, _, _, unreachable).
|
|
compute_instmap_delta(reachable(_), unreachable, _, unreachable).
|
|
compute_instmap_delta(reachable(InstMapA), reachable(InstMapB), NonLocals,
|
|
reachable(DeltaInstMap)) :-
|
|
set__to_sorted_list(NonLocals, NonLocalsList),
|
|
compute_instmap_delta_2(NonLocalsList, InstMapA, InstMapB, AssocList),
|
|
map__from_sorted_assoc_list(AssocList, DeltaInstMap).
|
|
|
|
:- pred compute_instmap_delta_2(list(var), instmapping, instmapping,
|
|
assoc_list(var, inst)).
|
|
:- mode compute_instmap_delta_2(in, in, in, out) is det.
|
|
|
|
compute_instmap_delta_2([], _, _, []).
|
|
compute_instmap_delta_2([Var | Vars], InstMapA, InstMapB, AssocList) :-
|
|
instmapping_lookup_var(InstMapA, Var, InstA),
|
|
instmapping_lookup_var(InstMapB, Var, InstB),
|
|
( InstA = InstB ->
|
|
AssocList1 = AssocList
|
|
;
|
|
AssocList = [ Var - InstB | AssocList1 ]
|
|
),
|
|
compute_instmap_delta_2(Vars, InstMapA, InstMapB, AssocList1).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
instmap__no_output_vars(_, unreachable, _, _).
|
|
instmap__no_output_vars(InstMap0, reachable(InstMapDelta), Vars, M) :-
|
|
set__to_sorted_list(Vars, VarList),
|
|
instmap__no_output_vars_2(VarList, InstMap0, InstMapDelta, M).
|
|
|
|
:- pred instmap__no_output_vars_2(list(var), instmap, instmapping, module_info).
|
|
:- mode instmap__no_output_vars_2(in, in, in, in) is semidet.
|
|
|
|
instmap__no_output_vars_2([], _, _, _).
|
|
instmap__no_output_vars_2([Var | Vars], InstMap0, InstMapDelta, ModuleInfo) :-
|
|
% We use `inst_matches_binding' to check that the new inst
|
|
% has only added information or lost uniqueness,
|
|
% not bound anything.
|
|
% If the instmap delta contains the variable, the variable may
|
|
% still not be output, if the change is just an increase in
|
|
% information rather than an increase in instantiatedness.
|
|
% If the instmap delta doesn't contain the variable, it may still
|
|
% have been (partially) output, if its inst is (or contains) `any'.
|
|
instmap__lookup_var(InstMap0, Var, Inst0),
|
|
( map__search(InstMapDelta, Var, Inst1) ->
|
|
Inst = Inst1
|
|
;
|
|
Inst = Inst0
|
|
),
|
|
inst_matches_binding(Inst, Inst0, ModuleInfo),
|
|
instmap__no_output_vars_2(Vars, InstMap0, InstMapDelta, ModuleInfo).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
% Given two instmap deltas, merge them to produce a new instmap_delta.
|
|
|
|
merge_instmap_delta(_, _, unreachable, InstMapDelta, InstMapDelta) --> [].
|
|
merge_instmap_delta(_, _, reachable(InstMapping), unreachable,
|
|
reachable(InstMapping)) --> [].
|
|
merge_instmap_delta(InstMap, NonLocals, reachable(InstMappingA),
|
|
reachable(InstMappingB), reachable(InstMapping)) -->
|
|
merge_instmapping_delta(InstMap, NonLocals, InstMappingA,
|
|
InstMappingB, InstMapping).
|
|
|
|
:- pred merge_instmapping_delta(instmap, set(var), instmapping, instmapping,
|
|
instmapping, module_info, module_info).
|
|
:- mode merge_instmapping_delta(in, in, in, in, out, in, out) is det.
|
|
|
|
merge_instmapping_delta(InstMap, NonLocals, InstMappingA,
|
|
InstMappingB, InstMapping) -->
|
|
{ map__keys(InstMappingA, VarsInA) },
|
|
{ map__keys(InstMappingB, VarsInB) },
|
|
{ set__sorted_list_to_set(VarsInA, SetofVarsInA) },
|
|
{ set__insert_list(SetofVarsInA, VarsInB, SetofVars0) },
|
|
{ set__intersect(SetofVars0, NonLocals, SetofVars) },
|
|
{ map__init(InstMapping0) },
|
|
{ set__to_sorted_list(SetofVars, ListofVars) },
|
|
merge_instmapping_delta_2(ListofVars, InstMap, InstMappingA,
|
|
InstMappingB, InstMapping0, InstMapping).
|
|
|
|
:- pred merge_instmapping_delta_2(list(var), instmap, instmapping, instmapping,
|
|
instmapping, instmapping, module_info, module_info).
|
|
:- mode merge_instmapping_delta_2(in, in, in, in, in, out, in, out) is det.
|
|
|
|
merge_instmapping_delta_2([], _, _, _, InstMapping, InstMapping,
|
|
ModInfo, ModInfo).
|
|
merge_instmapping_delta_2([Var | Vars], InstMap, InstMappingA, InstMappingB,
|
|
InstMapping0, InstMapping, ModuleInfo0, ModuleInfo) :-
|
|
( map__search(InstMappingA, Var, InstInA) ->
|
|
InstA = InstInA
|
|
;
|
|
instmap__lookup_var(InstMap, Var, InstA)
|
|
),
|
|
( map__search(InstMappingB, Var, InstInB) ->
|
|
InstB = InstInB
|
|
;
|
|
instmap__lookup_var(InstMap, Var, InstB)
|
|
),
|
|
(
|
|
inst_merge(InstA, InstB, ModuleInfo0,
|
|
Inst, ModuleInfoPrime)
|
|
->
|
|
ModuleInfo1 = ModuleInfoPrime,
|
|
map__det_insert(InstMapping0, Var, Inst, InstMapping1)
|
|
;
|
|
error("merge_instmapping_delta_2: unexpected mode error")
|
|
),
|
|
merge_instmapping_delta_2(Vars, InstMap, InstMappingA, InstMappingB,
|
|
InstMapping1, InstMapping, ModuleInfo1, ModuleInfo).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
instmap_delta_apply_sub(unreachable, _Must, _Sub, unreachable).
|
|
instmap_delta_apply_sub(reachable(OldInstMapping), Must, Sub,
|
|
reachable(InstMapping)) :-
|
|
map__to_assoc_list(OldInstMapping, InstMappingAL),
|
|
map__init(InstMapping0),
|
|
instmap_delta_apply_sub_2(InstMappingAL, Must, Sub,
|
|
InstMapping0, InstMapping).
|
|
|
|
instmap__apply_sub(InstMap0, Must, Sub, InstMap) :-
|
|
instmap_delta_apply_sub(InstMap0, Must, Sub, InstMap).
|
|
|
|
:- pred instmap_delta_apply_sub_2(assoc_list(var, inst), bool, map(var, var),
|
|
instmapping, instmapping).
|
|
:- mode instmap_delta_apply_sub_2(in, in, in, in, out) is det.
|
|
|
|
instmap_delta_apply_sub_2([], _Must, _Sub, IM, IM).
|
|
instmap_delta_apply_sub_2([V - I | AL], Must, Sub, IM0, IM) :-
|
|
(
|
|
map__search(Sub, V, N0)
|
|
->
|
|
N = N0
|
|
;
|
|
( Must = no,
|
|
N = V
|
|
; Must = yes,
|
|
error("instmap_delta_apply_sub_2: no substitute")
|
|
)
|
|
),
|
|
% XXX temporary hack alert XXX
|
|
% this should be a call to to map__det_insert,
|
|
% rather than a call to map__set. However, if we
|
|
% do that, then the compiler breaks, due to a problem
|
|
% with excess.m not preserving super-homogenous form.
|
|
map__set(IM0, N, I, IM1),
|
|
instmap_delta_apply_sub_2(AL, Must, Sub, IM1, IM).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|
|
|
|
instmap__to_assoc_list(unreachable, []).
|
|
instmap__to_assoc_list(reachable(InstMapping), AL) :-
|
|
map__to_assoc_list(InstMapping, AL).
|
|
|
|
instmap_delta_to_assoc_list(unreachable, []).
|
|
instmap_delta_to_assoc_list(reachable(InstMapping), AL) :-
|
|
map__to_assoc_list(InstMapping, AL).
|
|
|
|
%-----------------------------------------------------------------------------%
|
|
%-----------------------------------------------------------------------------%
|