[m-dev.] diff: fix MR_Subgoal undefined problems.

[Tyson Dowd]

Hi,

Zoltan, is this the right fix?

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


Estimated hours taken: 0.3

Fix a problem that was stopping compilation in non-minimal model
tabling grades due to MR_Subgoal being undefined.

library/private_builtin.m:
	Add #ifdef MR_USE_MINIMAL_MODEL around code that does minimal
	model specific manipulations.

Index: library/private_builtin.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/private_builtin.m,v
retrieving revision 1.19
diff -u -r1.19 private_builtin.m
--- private_builtin.m	1999/04/20 11:48:01	1.19
+++ private_builtin.m	1999/04/21 07:09:10
@@ -915,6 +915,7 @@
 	init_label(mercury__table_nondet_return_all_ans_2_0_i1);
 BEGIN_CODE
 Define_entry(mercury__table_nondet_return_all_ans_2_0);
+#ifdef	MR_USE_MINIMAL_MODEL
 	mkframe(""private_builtin:table_nondet_return_all_ans/2"", 1,
 		LABEL(mercury__table_nondet_return_all_ans_2_0_i1));
 	MR_framevar(1) = (Word) MR_SUBGOAL(r1)->answer_list;
@@ -947,6 +948,9 @@
 			((MR_AnswerList) MR_framevar(1))->next_answer;
 		succeed();
 	}
+#else
+	fatal_error(""minimal model code entered when not enabled"");
+#endif
 END_MODULE
 ").
 


-- 
       Tyson Dowd           # There isn't any reason why Linux can't be
                            # implemented as an enterprise computing solution.
     trd at cs.mu.oz.au        # Find out what you've been missing while you've
http://www.cs.mu.oz.au/~trd # been rebooting Windows NT. -- InfoWorld, 1998.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------