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

Undo dylan's changes in the names of some library entities,

Browse Source 
Estimated hours taken: 1.5

Undo dylan's changes in the names of some library entities,
by applying the following sed script

	s/term_atom/term__atom/g
	s/term_string/term__string/g
	s/term_integer/term__integer/g
	s/term_float/term__float/g
	s/term_context/term__context/g
	s/term_functor/term__functor/g
	s/term_variable/term__variable/g
	s/_term__/_term_/g
	s/std_util__bool_/bool__/g

to all the `.m' and `.pp' files in the compiler and library directories.
The reason for undoing these changes was to minimize incompatibilities
with 0.4 (and besides, the changes were not a really good idea in the first
place).

I also moved `bool' to a separate module.
The main reason for that change is to ensure that the `__' prefix is
only used when it genuinely represents a module qualifier.
(That's what dylan's changes were trying to acheive, but `term__'
does genuinely represent a module qualifier.)

compiler/*.m:
	Apply sed script above;
	where appropriate, add `bool' to the list of imported modules.
This commit is contained in:
Fergus Henderson
1996-02-03 17:30:14 +00:00
parent 69bcd95e19
commit 6d7f4b9b30
65 changed files with 759 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/prog_util.m
View File

@@ -6,7 +6,7 @@
:- module prog_util.
:- interface.
:- import_module prog_io, list.
:- import_module string, varset, prog_io, list.
%-----------------------------------------------------------------------------%
@@ -63,7 +63,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
:- import_module std_util, varset, term.
:- import_module bool, std_util, term.
%-----------------------------------------------------------------------------%
%-----------------------------------------------------------------------------%
@@ -192,14 +192,14 @@ prog_util__replace_eqv_type_ctor(TName - Targs0, Name, Args, Body, Found0,
type, bool, type, bool).
:- mode prog_util__replace_eqv_type_type(in, in, in, in, in, out, out) is det.
prog_util__replace_eqv_type_type(term_variable(V), _Name, _Args, _Body, Found,
term_variable(V), Found).
prog_util__replace_eqv_type_type(term_functor(F, TArgs0, Context), Name, Args,
prog_util__replace_eqv_type_type(term__variable(V), _Name, _Args, _Body, Found,
term__variable(V), Found).
prog_util__replace_eqv_type_type(term__functor(F, TArgs0, Context), Name, Args,
Body, Found0, Type, Found) :-
prog_util__replace_eqv_type_uu(TArgs0, Name, Args, Body, Found0,
TArgs1, Found1),
(
F = term_atom(Name),
F = term__atom(Name),
list__same_length(TArgs1, Args)
->
term__term_list_to_var_list(Args, Args2),
@@ -209,7 +209,7 @@ prog_util__replace_eqv_type_type(term_functor(F, TArgs0, Context), Name, Args,
% could we improve efficiency here by reclaiming
% garbage (or avoiding allocating it in the first place)?
Found = Found1,
Type = term_functor(F, TArgs1, Context)
Type = term__functor(F, TArgs1, Context)
).
:- pred prog_util__replace_eqv_type_pred(list(type_and_mode), string,