[m-rev.] trivial diff: fix indentation in termination.m

Julien Fischer juliensf at students.cs.mu.OZ.AU
Tue Sep 23 15:59:45 AEST 2003


compiler/termination.m:
	Fix some indentation.

Index: termination.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/termination.m,v
retrieving revision 1.29
diff -u -r1.29 termination.m
--- termination.m	25 Jun 2003 06:57:34 -0000	1.29
+++ termination.m	23 Sep 2003 05:09:54 -0000
@@ -198,8 +198,10 @@
 		Module = Module0
 	;
 		SCCTerminationKnown = [KnownPPId | _],
-		module_info_pred_proc_info(Module0, KnownPPId, _, KnownProcInfo),
-		proc_info_get_maybe_termination_info(KnownProcInfo, MaybeKnownTerm),
+		module_info_pred_proc_info(Module0, KnownPPId, _,
+			KnownProcInfo),
+		proc_info_get_maybe_termination_info(KnownProcInfo,
+			MaybeKnownTerm),
 		(
 			MaybeKnownTerm = no,
 			unexpected(this_file, "No termination info. found.")
@@ -207,29 +209,36 @@
 			MaybeKnownTerm  = yes(KnownTermStatus)
 		),
 		(
-			check_procs_known_term(KnownTermStatus, SCCTerminationKnown,
-				Module0)
+			check_procs_known_term(KnownTermStatus,
+				SCCTerminationKnown, Module0)
 		->
-				% Force any procs. in the SCC whose termination status is
-				% unknown to have the same termination status as those that
-				% are known.
-			set_termination_infos(SCCTerminationUnknown, KnownTermStatus,
-				Module0, Module)
+			    % Force any procs. in the SCC whose termination
+			    % status is unknown to have the same termination
+			    % status as those that are known.
+			set_termination_infos(SCCTerminationUnknown,
+				KnownTermStatus, Module0, Module)
 		;
-				% There is a conflict between the user-supplied termination
-				% information for two or more procs. in this SCC.  Emit
-				% a warning and then assume that they all loop.
-			get_context_from_scc(SCCTerminationKnown, Module0, Context),
-			NewTermStatus = can_loop([Context - inconsistent_annotations]),
-			set_termination_infos(SCC, NewTermStatus, Module0, Module),
+			    % There is a conflict between the user-supplied
+			    % termination information for two or more procs.
+			    % in this SCC.  Emit a warning and then assume
+			    % that they all loop.
+			get_context_from_scc(SCCTerminationKnown, Module0,
+				Context),
+			NewTermStatus =
+				can_loop([Context - inconsistent_annotations]),
+			set_termination_infos(SCC, NewTermStatus, Module0,
+				Module),

 			PredIds = list__map((func(proc(PredId, _)) = PredId),
 				SCCTerminationKnown),
-			error_util__describe_several_pred_names(Module, PredIds,
-				PredNames),
-			Piece1 = words("are mutually recursive but some of their"),
-			Piece2 = words("termination pragmas are inconsistent."),
-			Components = [words("Warning:")] ++ PredNames ++ [Piece1, Piece2],
+			error_util__describe_several_pred_names(Module,
+				PredIds, PredNames),
+			Piece1 = words(
+				"are mutually recursive but some of their"),
+			Piece2 = words(
+				"termination pragmas are inconsistent."),
+			Components = [words("Warning:")] ++ PredNames ++
+				[Piece1, Piece2],
 			error_util__report_warning(Context, 0, Components, !IO)
 		)
 	).
@@ -349,8 +358,8 @@
 		{ set_termination_infos(SCCTerminationUnknown,
 			TerminationResult, Module1, Module2) },
 		( { TerminationResult = can_loop(TerminationErrors) } ->
-				report_termination_errors(SCC, TerminationErrors, Module2,
-					Module)
+			report_termination_errors(SCC, TerminationErrors,
+				Module2, Module)
 		;
 			{ Module = Module2 }
 		)
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list