[m-rev.] diff: don't generate unimplemented Aditi bytecodes

[Simon Taylor]

Estimated hours taken: 0.25
Branches: main, release

compiler/rl_sort.m:
compiler/rl_out.pp:
	Sort-merge semi-joins are not yet implemented in Aditi,
	so don't generate them.

Index: rl_out.pp
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/rl_out.pp,v
retrieving revision 1.16
diff -u -u -r1.16 rl_out.pp
--- rl_out.pp	2001/08/06 12:54:23	1.16
+++ rl_out.pp	2001/08/08 06:10:20
@@ -1227,7 +1227,9 @@
 rl_out__compute_join_bytecode(sort_merge(_, _), no, rl_PROC_join_sm, no).
 rl_out__compute_join_bytecode(sort_merge(_, _), yes(Tuple),
 		rl_PROC_semijoin_sm, Swap) :-
-	rl_out__should_swap_inputs(Tuple, Swap).
+	rl_out__should_swap_inputs(Tuple, Swap),
+	error(
+"rl_out__compute_join_bytecode: sort-merge semi-joins not yet implemented in Aditi").
 
 rl_out__compute_join_bytecode(hash(_, _), no, rl_PROC_join_hj, no).
 rl_out__compute_join_bytecode(hash(_, _), yes(Tuple),
Index: rl_sort.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/rl_sort.m,v
retrieving revision 1.8
diff -u -u -r1.8 rl_sort.m
--- rl_sort.m	2000/03/13 05:24:39	1.8
+++ rl_sort.m	2001/08/08 06:10:43
@@ -1405,6 +1405,9 @@
 		RLInfo, RLInfo) :-
 	Exprn = rl_goal(_, _, _, _, Inputs, _, _, VarBounds),
 	(
+		% XXX Sort-merge semi-joins are not yet implemented in Aditi.
+		SemiJoin = no,
+
 		rl_key__is_equijoin(Inputs, VarBounds, Attrs1, Attrs2),
 
 		map__search(SortMap, Input1, SortSpecs1),
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------