mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-17 06:47:17 +00:00
Code Issues Projects Releases Wiki Activity

This diff contains no algorithmic changes.

Browse Source 
Estimated hours taken: 6
Branches: main

This diff contains no algorithmic changes. It merely renames apart a bunch more
function symbols to reduce ambiguity.

After this diff, the summary line from the mdb command "ambiguity -f" is

	Total: 351 names used 975 times, maximum 31, average: 2.78

browser/*.m:
compiler/*.m:
	Rename function symbols to eliminate ambiguities.

tests/debugger/declarative/dependency.exp:
tests/debugger/declarative/dependency2.exp:
	Update the expected out where some internal function symbol names
	appear in the output of the debugger. (This output is meant for
	implementors only.)
This commit is contained in:
Zoltan Somogyi
2006-08-22 05:04:29 +00:00
parent ca5e5db854
commit 00741b0162
167 changed files with 3471 additions and 3251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/common.m
View File

@@ -368,8 +368,8 @@ common_optimise_deconstruct(Var, ConsId, ArgVars, UniModes, CanFail, Mode,
% Do not delete deconstruction unifications inserted by
% stack_opt.m or tupling.m, which have done a more comprehensive
% cost analysis than common.m can do.
\+ goal_info_has_feature(GoalInfo, stack_opt),
\+ goal_info_has_feature(GoalInfo, tuple_opt),
\+ goal_info_has_feature(GoalInfo, feature_stack_opt),
\+ goal_info_has_feature(GoalInfo, feature_tuple_opt),
map.search(SinceCallStructMap0, TypeCtor, ConsIdMap0),
map.search(ConsIdMap0, ConsId, Structs),
@@ -791,11 +791,12 @@ generate_assign(ToVar, FromVar, UniMode, _, Goal, !Info) :-
:- pred types_match_exactly(mer_type::in, mer_type::in) is semidet.
types_match_exactly(variable(TVar, _), variable(TVar, _)).
types_match_exactly(defined(Name, As, _), defined(Name, Bs, _)) :-
types_match_exactly(type_variable(TVar, _), type_variable(TVar, _)).
types_match_exactly(defined_type(Name, As, _), defined_type(Name, Bs, _)) :-
types_match_exactly_list(As, Bs).
types_match_exactly(builtin(BuiltinType), builtin(BuiltinType)).
types_match_exactly(higher_order(As, AR, P, E), higher_order(Bs, BR, P, E)) :-
types_match_exactly(builtin_type(BuiltinType), builtin_type(BuiltinType)).
types_match_exactly(higher_order_type(As, AR, P, E),
higher_order_type(Bs, BR, P, E)) :-
types_match_exactly_list(As, Bs),
(
AR = yes(A),
@@ -805,11 +806,11 @@ types_match_exactly(higher_order(As, AR, P, E), higher_order(Bs, BR, P, E)) :-
AR = no,
BR = no
).
types_match_exactly(tuple(As, _), tuple(Bs, _)) :-
types_match_exactly(tuple_type(As, _), tuple_type(Bs, _)) :-
types_match_exactly_list(As, Bs).
types_match_exactly(apply_n(TVar, As, _), apply_n(TVar, Bs, _)) :-
types_match_exactly(apply_n_type(TVar, As, _), apply_n_type(TVar, Bs, _)) :-
types_match_exactly_list(As, Bs).
types_match_exactly(kinded(_, _), _) :-
types_match_exactly(kinded_type(_, _), _) :-
unexpected(this_file, "kind annotation").
:- pred types_match_exactly_list(list(mer_type)::in, list(mer_type)::in)