[m-rev.] [reuse] trivial diff: rename alias/reuse-pragma's

[Nancy Mazur]

Hi,


===================================================================


Estimated hours taken: 0.1
Branches: reuse

Rename "pa_alias_info"-pragma's to "possible_alias"-pragma's, and
"sr_reuse_info"-pragma's to "structure_reuse"-pragma's.

hlds_module.m:
make_hlds.m:
mercury_to_mercury.m:
module_qual.m:
modules.m:
pa_run.m:
prog_data.m:
prog_io_pragma.m:
recompilation.version.m:
sr_top.m:
trans_opt.m:


Index: hlds_module.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/hlds_module.m,v
retrieving revision 1.59.2.12
diff -u -r1.59.2.12 hlds_module.m
--- hlds_module.m	2 Jun 2004 10:30:35 -0000	1.59.2.12
+++ hlds_module.m	11 Jun 2004 05:53:42 -0000
@@ -124,7 +124,7 @@
 	% the entries correspond to the transformed versions of predicates (ie
 	% type-infos and so on).
 	% The types in unproc_alias_pragma match the types in the 
-	% pa_alias_info-pragma (see prog_data.m).
+	% possible_alias-pragma (see prog_data.m).
 :- type unproc_alias_pragmas == list(unproc_alias_pragma).
 :- type unproc_alias_pragma 
 	--->	unproc_alias_pragma(pred_or_func, sym_name, list(mode),
@@ -136,7 +136,7 @@
 	% the entries correspond to the transformed versions of predicates (ie
 	% type-infos and so on).
 	% The types in unproc_reuse_pragma match the types in the 
-	% sr_reuse_info-pragma (see prog_data.m).
+	% structure_reuse-pragma (see prog_data.m).
 :- type unproc_reuse_pragmas == list(unproc_reuse_pragma).
 :- type unproc_reuse_pragma 
 	---> 	unproc_reuse_pragma(pred_or_func, sym_name, list(mode),
Index: make_hlds.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/make_hlds.m,v
retrieving revision 1.347.2.23
diff -u -r1.347.2.23 make_hlds.m
--- make_hlds.m	2 Jun 2004 10:30:40 -0000	1.347.2.23
+++ make_hlds.m	11 Jun 2004 05:54:10 -0000
@@ -546,7 +546,7 @@
 		{ Pragma = termination_info(_, _, _, _, _) },
 		{ Module = Module0 }
 	;
-		{ Pragma = pa_alias_info(PredOrFunc, SymName, ModeList,
+		{ Pragma = possible_alias(PredOrFunc, SymName, ModeList,
 			HeadVars, Types, MaybeAlias) },
 		% these pragma's should only occur in trans_opt files. 
 		% But as this predicate is also used to read in those
@@ -557,7 +557,7 @@
 					MaybeAlias, Module0, Module)
 		
 	;
-		{ Pragma = sr_reuse_info(PredOrFunc, SymName, ModeList,
+		{ Pragma = structure_reuse(PredOrFunc, SymName, ModeList,
 			HeadVars, Types, Memo, MaybeReuseSymName) },
 		add_pragma_reuse_info( PredOrFunc, SymName, ModeList, 
 					HeadVars, Types, 
Index: mercury_to_mercury.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mercury_to_mercury.m,v
retrieving revision 1.174.2.17
diff -u -r1.174.2.17 mercury_to_mercury.m
--- mercury_to_mercury.m	11 Sep 2002 07:35:26 -0000	1.174.2.17
+++ mercury_to_mercury.m	11 Jun 2004 05:54:17 -0000
@@ -653,10 +653,10 @@
 			PredName, ModeList, Context,
 			MaybeArgSizeInfo, MaybeTerminationInfo)
 	;
-		{ Pragma = pa_alias_info(_,_,_,_,_,_) },
+		{ Pragma = possible_alias(_,_,_,_,_,_) },
 		[]
 	;
-		{ Pragma = sr_reuse_info(_,_,_,_,_,_, _) },
+		{ Pragma = structure_reuse(_,_,_,_,_,_, _) },
 		[]
 	;
 		{ Pragma = terminates(Pred, Arity) },
Index: module_qual.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/module_qual.m,v
retrieving revision 1.57.2.12
diff -u -r1.57.2.12 module_qual.m
--- module_qual.m	11 Sep 2002 07:35:57 -0000	1.57.2.12
+++ module_qual.m	11 Jun 2004 05:54:22 -0000
@@ -946,15 +946,15 @@
 		termination_info(PredOrFunc, SymName, ModeList, Args, Term), 
 		Info0, Info) --> 
 	qualify_mode_list(ModeList0, ModeList, Info0, Info).
-qualify_pragma(pa_alias_info(PredOrFunc, SymName, ModeList0, 
+qualify_pragma(possible_alias(PredOrFunc, SymName, ModeList0, 
 			Vars, Types, MaybeAS),
-		pa_alias_info(PredOrFunc, SymName, ModeList, 
+		possible_alias(PredOrFunc, SymName, ModeList, 
 			Vars, Types, MaybeAS),
 		Info0, Info) -->
 	qualify_mode_list(ModeList0, ModeList, Info0, Info).
-qualify_pragma(sr_reuse_info(PredOrFunc, SymName, ModeList0, Vars, 
+qualify_pragma(structure_reuse(PredOrFunc, SymName, ModeList0, Vars, 
 			Types, TREUSE, N), 
-		sr_reuse_info(PredOrFunc, SymName, ModeList, Vars, 
+		structure_reuse(PredOrFunc, SymName, ModeList, Vars, 
 			Types, TREUSE, N), 
 		Info0, Info) -->
 	qualify_mode_list(ModeList0, ModeList, Info0, Info).
Index: modules.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/modules.m,v
retrieving revision 1.132.2.18
diff -u -r1.132.2.18 modules.m
--- modules.m	11 Sep 2002 07:35:59 -0000	1.132.2.18
+++ modules.m	11 Jun 2004 05:54:36 -0000
@@ -1409,8 +1409,8 @@
 pragma_allowed_in_interface(unused_args(_, _, _, _, _), no).
 pragma_allowed_in_interface(type_spec(_, _, _, _, _, _, _, _), yes).
 pragma_allowed_in_interface(termination_info(_, _, _, _, _), yes).
-pragma_allowed_in_interface(pa_alias_info(_, _, _, _, _,_), yes).
-pragma_allowed_in_interface(sr_reuse_info(_, _, _, _, _, _,_), yes).
+pragma_allowed_in_interface(possible_alias(_, _, _, _, _,_), yes).
+pragma_allowed_in_interface(structure_reuse(_, _, _, _, _, _,_), yes).
 pragma_allowed_in_interface(terminates(_, _), yes).
 pragma_allowed_in_interface(does_not_terminate(_, _), yes).
 pragma_allowed_in_interface(check_termination(_, _), yes).
Index: pa_run.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Attic/pa_run.m,v
retrieving revision 1.1.2.29
diff -u -r1.1.2.29 pa_run.m
--- pa_run.m	8 Jun 2004 05:13:53 -0000	1.1.2.29
+++ pa_run.m	11 Jun 2004 05:54:38 -0000
@@ -710,7 +710,7 @@
 :- mode pa_run__make_pa_interface_pred_proc(in, in, in, di, uo) is det.
 
 pa_run__make_pa_interface_pred_proc(PredInfo, ProcTable, ProcId) -->
-	io__write_string(":- pragma pa_alias_info("),
+	io__write_string(":- pragma possible_alias("),
 
 		% write a simple predicate declaration
 
Index: prog_data.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/prog_data.m,v
retrieving revision 1.58.2.17
diff -u -r1.58.2.17 prog_data.m
--- prog_data.m	11 Jun 2004 02:56:53 -0000	1.58.2.17
+++ prog_data.m	11 Jun 2004 05:54:42 -0000
@@ -299,7 +299,7 @@
 			% termination_info pragmas are used in opt and
 			% trans_opt files.
 
-	;	pa_alias_info(pred_or_func, sym_name, list(mode),
+	;	possible_alias(pred_or_func, sym_name, list(mode),
 				list(prog_var), list( (type) ), 
 				maybe(alias_as))
 			% the list(mode) is the declared argmodes of the
@@ -308,7 +308,7 @@
 			% a predicates possible aliases set. 
 			% These pragma's are used in opt.pa files
 
-	; 	sr_reuse_info(pred_or_func, sym_name, list(mode), 
+	; 	structure_reuse(pred_or_func, sym_name, list(mode), 
 				list(prog_var), 
 				list( (type) ), memo_reuse, maybe(sym_name))
 
@@ -434,7 +434,7 @@
 	;	can_loop.	% This procedure might not terminate.
 
 %
-% Stuff for the 'pa_alias_info' and 'sr_reuse_info' pragma's.
+% Stuff for the 'possible_alias' and 'structure_reuse' pragma's.
 % These pragma's are used for the compile-time garbage collection system as
 % developed in Nancy Mazur's phd-thesis "Compile-time garbage collection for
 % the declarative language Mercury" (K.U.Leuven, May 2004).
Index: prog_io_pragma.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/prog_io_pragma.m,v
retrieving revision 1.23.2.15
diff -u -r1.23.2.15 prog_io_pragma.m
--- prog_io_pragma.m	2 Jun 2004 10:30:51 -0000	1.23.2.15
+++ prog_io_pragma.m	11 Jun 2004 05:54:44 -0000
@@ -1047,7 +1047,7 @@
 		ErrorTerm)
     ).
 	
-parse_pragma_type(ModuleName, "pa_alias_info", PragmaTerms, ErrorTerm, 
+parse_pragma_type(ModuleName, "possible_alias", PragmaTerms, ErrorTerm, 
 		_VarSet, Result) :- 
     (
 	PragmaTerms = [ 
@@ -1057,7 +1057,7 @@
 		AliasInformation
 	],
 	parse_pred_or_func_and_arg_modes(yes(ModuleName), PredAndModesTerm0,
-		ErrorTerm, "`:- pragma pa_alias_info' declaration",
+		ErrorTerm, "`:- pragma possible_alias' declaration",
 		NameAndModesResult),
 	NameAndModesResult = ok(PredName - PredOrFunc, ModeList),
 	
@@ -1082,17 +1082,17 @@
 		MaybeAliasInfo = yes(Alias_as)
 	),
 
-	Result0 = ok(pragma(pa_alias_info(PredOrFunc, PredName, ModeList,
+	Result0 = ok(pragma(possible_alias(PredOrFunc, PredName, ModeList,
 					HeadVars, HVTypes, MaybeAliasInfo)))
    ->
    	Result = Result0
    ;
         Result = error( 
-		"syntax error in `:- pragma pa_alias_info' declaration", 
+		"syntax error in `:- pragma possible_alias' declaration", 
 		ErrorTerm)	
    ).
 
-parse_pragma_type(ModuleName, "sr_reuse_info", PragmaTerms, ErrorTerm, 
+parse_pragma_type(ModuleName, "structure_reuse", PragmaTerms, ErrorTerm, 
 		_VarSet, Result) :- 
     (
 	PragmaTerms = [ 
@@ -1102,7 +1102,7 @@
 		ReuseInformation
 	],
 	parse_pred_or_func_and_arg_modes(yes(ModuleName), PredAndModesTerm0,
-		ErrorTerm, "`:- pragma sr_reuse_info' declaration",
+		ErrorTerm, "`:- pragma structure_reuse' declaration",
 		NameAndModesResult),
 	NameAndModesResult = ok(PredName - PredOrFunc, ModeList),
 	
@@ -1118,14 +1118,14 @@
 	sr_data__memo_reuse_parse(ReuseInformation, ParsedReuse,
 			MaybeReuseName),
 
-	Result0 = ok(pragma(sr_reuse_info(PredOrFunc, PredName, ModeList,
+	Result0 = ok(pragma(structure_reuse(PredOrFunc, PredName, ModeList,
 					HeadVars, HVTypes, ParsedReuse,
 					MaybeReuseName)))
    ->
    	Result = Result0
    ;
         Result = error( 
-		"syntax error in `:- pragma sr_reuse_info' declaration", 
+		"syntax error in `:- pragma structure_reuse' declaration", 
 		ErrorTerm)	
    ).
 
Index: recompilation.version.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/recompilation.version.m,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 recompilation.version.m
--- recompilation.version.m	11 Sep 2002 07:36:31 -0000	1.2.2.1
+++ recompilation.version.m	11 Jun 2004 05:54:45 -0000
@@ -571,10 +571,10 @@
 is_pred_pragma(termination_info(PredOrFunc, Name, Modes, _, _),
 		yes(yes(PredOrFunc) - Name / Arity)) :-
 	adjust_func_arity(PredOrFunc, Arity, list__length(Modes)).	
-is_pred_pragma(pa_alias_info(PredOrFunc, Name, Modes, _, _, _),
+is_pred_pragma(possible_alias(PredOrFunc, Name, Modes, _, _, _),
 		yes(yes(PredOrFunc) - Name / Arity)) :- 
 	adjust_func_arity(PredOrFunc, Arity, list__length(Modes)).
-is_pred_pragma(sr_reuse_info(PredOrFunc, Name, Modes, _, _, _, _),
+is_pred_pragma(structure_reuse(PredOrFunc, Name, Modes, _, _, _, _),
 		yes(yes(PredOrFunc) - Name / Arity)) :- 
 	adjust_func_arity(PredOrFunc, Arity, list__length(Modes)).
 is_pred_pragma(terminates(Name, Arity), yes(no - Name / Arity)).
Index: sr_top.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Attic/sr_top.m,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 sr_top.m
--- sr_top.m	10 Jun 2004 05:21:45 -0000	1.1.2.2
+++ sr_top.m	11 Jun 2004 05:54:52 -0000
@@ -208,7 +208,7 @@
 	{ module_info_pred_proc_info(HLDS, PredId, ProcId,
 			PredInfo, ProcInfo) },
 
-	io__write_string(":- pragma sr_reuse_info("),
+	io__write_string(":- pragma structure_reuse("),
 
 		% write a simple predicate declaration
 
Index: trans_opt.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/trans_opt.m,v
retrieving revision 1.15.4.13
diff -u -r1.15.4.13 trans_opt.m
--- trans_opt.m	2 Jun 2004 10:30:55 -0000	1.15.4.13
+++ trans_opt.m	11 Jun 2004 05:54:52 -0000
@@ -170,7 +170,7 @@
 		->
 		% output possible-alias information.
 		io__write_string(
-			"\n%----------- pa_alias_info/3 ------------- \n\n"),
+			"\n%----------- possible_alias/3 ------------- \n\n"),
 		list__foldl(pa_run__write_pred_pa_info(Module,
 							AllSpecialPredIds),
 				PredIds)
@@ -182,7 +182,7 @@
 		->
 		% output structure-reuse information
 		 io__write_string(
-			"\n%----------- sr_reuse_info/3 ------------- \n\n"),
+			"\n%----------- structure_reuse/3 ------------- \n\n"),
 		list__foldl(sr_top__write_pragma_reuse_info(Module, 
 							AllSpecialPredIds),
 				PredIds)


-- 
nancy.mazur at cs.kuleuven.ac.be ------------ Katholieke Universiteit Leuven -
tel: +32-16-327596 - fax: +32-16-327996 ------- Dept. of Computer Science -
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------