[m-dev.] trivial diff: aditi_bottom_up lambda expressions

[Simon Taylor]

Estimated hours taken: 0.25

compiler/lambda.m:
	Don't require an `aditi_bottom_up' annotation for
	aggregate input closures -- the interface in
	extras/aditi/aditi.m has not yet been changed
	to require `aditi_bottom_up' closures.

Index: lambda.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/lambda.m,v
retrieving revision 1.53
diff -u -u -r1.53 lambda.m
--- lambda.m	1999/07/14 04:17:12	1.53
+++ lambda.m	1999/07/30 05:07:31
@@ -488,9 +488,9 @@
 			% queries. Currently all nondet lambda expressions
 			% within Aditi predicates are treated as aggregate
 			% inputs.
+			% EvalMethod = (aditi_bottom_up),
 			determinism_components(Detism, _, at_most_many),
-			check_marker(Markers, aditi),
-			EvalMethod = (aditi_bottom_up)
+			check_marker(Markers, aditi)
 		->
 			markers_to_marker_list(Markers, MarkerList0),
 			list__filter(
@@ -509,6 +509,10 @@
 				)),
 				MarkerList0, MarkerList),
 			marker_list_to_markers(MarkerList, LambdaMarkers)
+		;
+			EvalMethod = (aditi_bottom_up)
+		->
+			marker_list_to_markers([aditi], LambdaMarkers)
 		;
 			EvalMethod = (aditi_top_down)
 		->
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------