Files
mercury/compiler/follow_code.m
Fergus Henderson 11d8161692 Add support for nested modules.
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.
1998-03-03 17:48:14 +00:00

387 lines
14 KiB
Mathematica

%-----------------------------------------------------------------------------%
% Copyright (C) 1994-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.
%-----------------------------------------------------------------------------%
% Main author: conway.
% Extensive modifications by zs.
%-----------------------------------------------------------------------------%
:- module follow_code.
:- interface.
:- import_module hlds_module, hlds_pred, hlds_goal.
:- import_module list.
:- pred move_follow_code_in_proc(proc_info, proc_info,
module_info, module_info).
% :- mode move_follow_code_in_proc(di, uo, di, uo) is det.
:- mode move_follow_code_in_proc(in, out, in, out) is det.
% Split a list of goals into the prefix of builtins and the rest.
:- pred move_follow_code_select(list(hlds_goal), list(hlds_goal),
list(hlds_goal)).
:- mode move_follow_code_select(in, out, out) is det.
%-----------------------------------------------------------------------------%
%-----------------------------------------------------------------------------%
:- implementation.
:- import_module hlds_data, goal_util, mode_util.
:- import_module globals, options, det_analysis, quantification.
:- import_module bool, map, set, term, std_util, require.
%-----------------------------------------------------------------------------%
move_follow_code_in_proc(ProcInfo0, ProcInfo, ModuleInfo0, ModuleInfo) :-
module_info_globals(ModuleInfo0, Globals),
globals__lookup_bool_option(Globals, follow_code, FollowCode),
globals__lookup_bool_option(Globals, prev_code, PrevCode),
Flags = FollowCode - PrevCode,
proc_info_goal(ProcInfo0, Goal0),
proc_info_varset(ProcInfo0, Varset0),
proc_info_vartypes(ProcInfo0, VarTypes0),
(
move_follow_code_in_goal(Goal0, Goal1, Flags, no, Res),
% did the goal change?
Res = yes
->
% we need to fix up the goal_info by recalculating
% the nonlocal vars and the non-atomic instmap deltas.
proc_info_headvars(ProcInfo0, HeadVars),
implicitly_quantify_clause_body(HeadVars, Goal1,
Varset0, VarTypes0, Goal2, Varset, VarTypes, _Warnings),
proc_info_get_initial_instmap(ProcInfo0,
ModuleInfo0, InstMap0),
recompute_instmap_delta(no, Goal2, Goal, InstMap0,
ModuleInfo0, ModuleInfo)
;
Goal = Goal0,
Varset = Varset0,
VarTypes = VarTypes0,
ModuleInfo = ModuleInfo0
),
proc_info_set_goal(ProcInfo0, Goal, ProcInfo1),
proc_info_set_varset(ProcInfo1, Varset, ProcInfo2),
proc_info_set_vartypes(ProcInfo2, VarTypes, ProcInfo).
%-----------------------------------------------------------------------------%
%-----------------------------------------------------------------------------%
:- pred move_follow_code_in_goal(hlds_goal, hlds_goal, pair(bool),
bool, bool).
:- mode move_follow_code_in_goal(in, out, in, in, out) is det.
move_follow_code_in_goal(Goal0 - GoalInfo, Goal - GoalInfo, Flags, R0, R) :-
move_follow_code_in_goal_2(Goal0, Goal, Flags, R0, R).
%-----------------------------------------------------------------------------%
:- pred move_follow_code_in_goal_2(hlds_goal_expr, hlds_goal_expr,
pair(bool), bool, bool).
:- mode move_follow_code_in_goal_2(in, out, in, in, out) is det.
move_follow_code_in_goal_2(conj(Goals0), conj(Goals), Flags, R0, R) :-
move_follow_code_in_conj(Goals0, Goals, Flags, R0, R).
move_follow_code_in_goal_2(disj(Goals0, SM), disj(Goals, SM), Flags, R0, R) :-
move_follow_code_in_disj(Goals0, Goals, Flags, R0, R).
move_follow_code_in_goal_2(not(Goal0), not(Goal), Flags, R0, R) :-
move_follow_code_in_goal(Goal0, Goal, Flags, R0, R).
move_follow_code_in_goal_2(switch(Var, Det, Cases0, SM),
switch(Var, Det, Cases, SM), Flags, R0, R) :-
move_follow_code_in_cases(Cases0, Cases, Flags, R0, R).
move_follow_code_in_goal_2(if_then_else(Vars, Cond0, Then0, Else0, SM),
if_then_else(Vars, Cond, Then, Else, SM), Flags, R0, R) :-
move_follow_code_in_goal(Cond0, Cond, Flags, R0, R1),
move_follow_code_in_goal(Then0, Then, Flags, R1, R2),
move_follow_code_in_goal(Else0, Else, Flags, R2, R).
move_follow_code_in_goal_2(some(Vars, Goal0), some(Vars, Goal), Flags, R0, R) :-
move_follow_code_in_goal(Goal0, Goal, Flags, R0, R).
move_follow_code_in_goal_2(higher_order_call(A,B,C,D,E,F),
higher_order_call(A,B,C,D,E,F), _, R, R).
move_follow_code_in_goal_2(class_method_call(A,B,C,D,E,F),
class_method_call(A,B,C,D,E,F), _, R, R).
move_follow_code_in_goal_2(call(A,B,C,D,E,F), call(A,B,C,D,E,F), _, R, R).
move_follow_code_in_goal_2(unify(A,B,C,D,E), unify(A,B,C,D,E), _, R, R).
move_follow_code_in_goal_2(pragma_c_code(A,B,C,D,E,F,G),
pragma_c_code(A,B,C,D,E,F,G), _, R, R).
%-----------------------------------------------------------------------------%
:- pred move_follow_code_in_disj(list(hlds_goal), list(hlds_goal),
pair(bool), bool, bool).
:- mode move_follow_code_in_disj(in, out, in, in, out) is det.
move_follow_code_in_disj([], [], _, R, R).
move_follow_code_in_disj([Goal0|Goals0], [Goal|Goals], Flags, R0, R) :-
move_follow_code_in_goal(Goal0, Goal, Flags, R0, R1),
move_follow_code_in_disj(Goals0, Goals, Flags, R1, R).
%-----------------------------------------------------------------------------%
:- pred move_follow_code_in_cases(list(case), list(case), pair(bool),
bool, bool).
:- mode move_follow_code_in_cases(in, out, in, in, out) is det.
move_follow_code_in_cases([], [], _, R, R).
move_follow_code_in_cases([case(Cons, Goal0)|Goals0], [case(Cons, Goal)|Goals],
Flags, R0, R) :-
move_follow_code_in_goal(Goal0, Goal, Flags, R0, R1),
move_follow_code_in_cases(Goals0, Goals, Flags, R1, R).
%-----------------------------------------------------------------------------%
:- pred move_follow_code_in_conj(list(hlds_goal), list(hlds_goal),
pair(bool), bool, bool).
:- mode move_follow_code_in_conj(in, out, in, in, out) is det.
% Find the first branched structure, and split the
% conj into those goals before and after it.
move_follow_code_in_conj(Goals0, Goals, Flags, R0, R) :-
move_follow_code_in_conj_2(Goals0, [], RevGoals, Flags, R0, R),
list__reverse(RevGoals, Goals).
:- pred move_follow_code_in_conj_2(list(hlds_goal), list(hlds_goal),
list(hlds_goal), pair(bool), bool, bool).
:- mode move_follow_code_in_conj_2(in, in, out, in, in, out) is det.
move_follow_code_in_conj_2([], RevPrevGoals, RevPrevGoals, _, R, R).
move_follow_code_in_conj_2([Goal0 | Goals0], RevPrevGoals0, RevPrevGoals,
Flags, R0, R) :-
Flags = PushFollowCode - PushPrevCode,
(
PushFollowCode = yes,
Goal0 = GoalExpr0 - _,
goal_util__goal_is_branched(GoalExpr0),
move_follow_code_select(Goals0, FollowGoals, RestGoalsPrime),
FollowGoals \= [],
move_follow_code_move_goals(Goal0, FollowGoals, Goal1Prime)
->
R1 = yes,
Goal1 = Goal1Prime,
RestGoals = RestGoalsPrime
;
R1 = R0,
Goal1 = Goal0,
RestGoals = Goals0
),
(
PushPrevCode = yes
->
move_prev_code_forbidden_vars(RestGoals, ForbiddenVars),
move_prev_code(Goal1, Goal2, ForbiddenVars,
RevPrevGoals0, RevPrevGoals1, R1, R2)
;
RevPrevGoals1 = RevPrevGoals0,
Goal2 = Goal1,
R2 = R1
),
move_follow_code_in_goal(Goal2, Goal, Flags, R2, R3),
RevPrevGoals2 = [Goal | RevPrevGoals1],
move_follow_code_in_conj_2(RestGoals, RevPrevGoals2, RevPrevGoals,
Flags, R3, R).
%-----------------------------------------------------------------------------%
move_follow_code_select([], [], []).
move_follow_code_select([Goal|Goals], FollowGoals, RestGoals) :-
(
move_follow_code_is_builtin(Goal)
->
move_follow_code_select(Goals, FollowGoals0, RestGoals),
FollowGoals = [Goal|FollowGoals0]
;
FollowGoals = [],
RestGoals = [Goal|Goals]
).
%-----------------------------------------------------------------------------%
:- pred move_follow_code_move_goals(hlds_goal, list(hlds_goal), hlds_goal).
:- mode move_follow_code_move_goals(in, in, out) is semidet.
move_follow_code_move_goals(Goal0 - GoalInfo, FollowGoals, Goal - GoalInfo) :-
(
Goal0 = switch(Var, Det, Cases0, SM),
move_follow_code_move_goals_cases(Cases0, FollowGoals, Cases),
Goal = switch(Var, Det, Cases, SM)
;
Goal0 = disj(Goals0, SM),
move_follow_code_move_goals_disj(Goals0, FollowGoals, Goals),
Goal = disj(Goals, SM)
;
Goal0 = if_then_else(Vars, Cond, Then0, Else0, SM),
follow_code__conjoin_goal_and_goal_list(Then0,
FollowGoals, Then),
follow_code__conjoin_goal_and_goal_list(Else0,
FollowGoals, Else),
Goal = if_then_else(Vars, Cond, Then, Else, SM)
).
%-----------------------------------------------------------------------------%
:- pred move_follow_code_move_goals_cases(list(case), list(hlds_goal),
list(case)).
:- mode move_follow_code_move_goals_cases(in, in, out) is semidet.
move_follow_code_move_goals_cases([], _FollowGoals, []).
move_follow_code_move_goals_cases([Case0|Cases0], FollowGoals, [Case|Cases]) :-
Case0 = case(Cons, Goal0),
follow_code__conjoin_goal_and_goal_list(Goal0, FollowGoals, Goal),
Case = case(Cons, Goal),
move_follow_code_move_goals_cases(Cases0, FollowGoals, Cases).
%-----------------------------------------------------------------------------%
:- pred move_follow_code_move_goals_disj(list(hlds_goal), list(hlds_goal),
list(hlds_goal)).
:- mode move_follow_code_move_goals_disj(in, in, out) is semidet.
move_follow_code_move_goals_disj([], _FollowGoals, []).
move_follow_code_move_goals_disj([Goal0|Goals0], FollowGoals, [Goal|Goals]) :-
follow_code__conjoin_goal_and_goal_list(Goal0, FollowGoals, Goal),
move_follow_code_move_goals_disj(Goals0, FollowGoals, Goals).
%-----------------------------------------------------------------------------%
% Takes a goal and a list of goals, and conjoins them
% (with a potentially blank goal_info), checking that the
% determinism of the goal is not changed.
:- pred follow_code__conjoin_goal_and_goal_list(hlds_goal, list(hlds_goal),
hlds_goal).
:- mode follow_code__conjoin_goal_and_goal_list(in, in, out) is semidet.
follow_code__conjoin_goal_and_goal_list(Goal0, FollowGoals, Goal) :-
Goal0 = GoalExpr0 - GoalInfo0,
goal_info_get_determinism(GoalInfo0, Detism0),
determinism_components(Detism0, _CanFail0, MaxSolns0),
( MaxSolns0 = at_most_zero ->
Goal = Goal0
;
check_follow_code_detism(FollowGoals, Detism0),
( GoalExpr0 = conj(GoalList0) ->
list__append(GoalList0, FollowGoals, GoalList),
GoalExpr = conj(GoalList)
;
GoalExpr = conj([Goal0 | FollowGoals])
),
Goal = GoalExpr - GoalInfo0
).
% This check is necessary to make sure that follow_code
% doesn't change the determinism of the goal.
:- pred check_follow_code_detism(list(hlds_goal), determinism).
:- mode check_follow_code_detism(in, in) is semidet.
check_follow_code_detism([], _).
check_follow_code_detism([_ - GoalInfo | Goals], Detism0) :-
goal_info_get_determinism(GoalInfo, Detism1),
det_conjunction_detism(Detism0, Detism1, Detism0),
check_follow_code_detism(Goals, Detism0).
%-----------------------------------------------------------------------------%
:- pred move_follow_code_is_builtin(hlds_goal).
:- mode move_follow_code_is_builtin(in) is semidet.
move_follow_code_is_builtin(unify(_, _, _, Unification, _) - _GoalInfo) :-
Unification \= complicated_unify(_, _).
move_follow_code_is_builtin(call(_, _, _, Builtin, _, _) - _GoalInfo) :-
Builtin = inline_builtin.
%-----------------------------------------------------------------------------%
%-----------------------------------------------------------------------------%
:- pred move_prev_code(hlds_goal, hlds_goal, set(var),
list(hlds_goal), list(hlds_goal), bool, bool).
% :- mode move_prev_code(di, uo, in, di, uo, in, out) is det.
:- mode move_prev_code(in, out, in, in, out, in, out) is det.
move_prev_code(Goal, Goal, _, RevPrevGoals, RevPrevGoals, R, R).
% move_prev_code(Goal0, Goal, ForbiddenVars0, RevPrevGoals0, RevPrevGoals,
% R0, R) :-
% (
% move_prev_code_breakup_branched(Goal0, Cond0, First0, Rest0)
% ->
% move_prev_code_new_forbidden_vars(Cond0, First0,
% ForbiddenVars0, ForbiddenVars1),
% (
% move_prev_code_vars_difference(Cond0, First0, Rest0,
% ForbiddenVars0, LocalVars),
% move_prev_code_can_pull_producer(LocalVars, Producers,
% RevPrevGoals0, RevPrevGoals1)
% ->
% move_prev_code(Rest0, Rest, ForbiddenVars1,
% RevPrevGoals1, RevPrevGoals, R0, R),
% move_prev_code_replace_first(Goal0,
% Producers, Rest, Goal)
% ;
% move_prev_code(Rest0, Rest, ForbiddenVars1,
% RevPrevGoals0, RevPrevGoals, R0, R)
% )
% ;
% R = R0,
% Goal = Goal0,
% RevPrevGoals = [Goal0 | RevPrevGoals0]
% ).
%
% :- pred move_prev_code_breakup_branched(hlds_goal, hlds_goal, hlds_goal,
% hlds_goal).
% :- mode move_prev_code_breakup_branched(in, out, out, out) is semidet.
:- pred move_prev_code_forbidden_vars(list(hlds_goal), set(var)).
:- mode move_prev_code_forbidden_vars(in, out) is det.
move_prev_code_forbidden_vars([], Empty) :-
set__init(Empty).
move_prev_code_forbidden_vars([_Goal - GoalInfo | Goals], Varset) :-
move_prev_code_forbidden_vars(Goals, Varset0),
goal_info_get_nonlocals(GoalInfo, NonLocals),
set__union(Varset0, NonLocals, Varset).
%
% :- pred move_prev_code_new_forbidden_vars(hlds_goal, hlds_goal,
% set(var), set(var)).
% :- mode move_prev_code_new_forbidden_vars(in, in, in, out) is det.
%
% :- pred move_prev_code_vars_difference(hlds_goal, hlds_goal, hlds_goal,
% set(var), set(var)).
% :- mode move_prev_code_vars_difference(in, in, in, in, out) is det.
%
% move_prev_code_vars_difference(Cond, First, Rest, ForbiddenVars, LocalVars) :-
% Cond = _ - CondInfo,
% First = _ - FirstInfo,
% Rest = _ - RestInfo,
% goal_info_get_nonlocals(CondInfo, CondVars),
% goal_info_get_nonlocals(FirstInfo, FirstVars),
% goal_info_get_nonlocals(RestInfo, RestVars),
% set__union(CondVars, FirstVars, ThisBranchVars),
% set__difference(ThisBranchVars, RestVars, LocalVars0),
% set__difference(LocalVars0, ForbiddenVars, LocalVars).
%
% :- pred move_prev_code_can_pull_producer(set(var), list(hlds_goal),
% list(hlds_goal), list(hlds_goal)).
% :- mode move_prev_code_can_pull_producer(in, in, di, uo) is det.
%
% :- pred move_prev_code_replace_first(hlds_goal,
% list(hlds_goal), list(hlds_goal), hlds_goal).
% :- mode move_prev_code_replace_first(di, in, in, uo) is det.