[m-rev.] diff: fix failing test cases in .mm grades

Julien Fischer juliensf at csse.unimelb.edu.au
Tue Aug 1 17:32:44 AEST 2006


Estimated hours taken: 1
Branches: main

Fix the failure of a bunch of tabling tests cases in .mm grades.

compiler/table_gen.m:
 	Fix purity disagreements in the inlined foreign_procs introduced by
 	the minimal model tabling transformation.
 	(The problems are showing up now because of a sanity check introduced
 	in Zoltan's trace goal change.)

Julien.

Index: compiler/table_gen.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/table_gen.m,v
retrieving revision 1.113
diff -u -r1.113 table_gen.m
--- compiler/table_gen.m	28 Jul 2006 06:26:39 -0000	1.113
+++ compiler/table_gen.m	1 Aug 2006 07:00:58 -0000
@@ -2819,7 +2819,7 @@
          !VarSet, !VarTypes, AnswerBlockVar),
      ModuleInfo = TableInfo ^ table_module_info,
      generate_call(PredName, Detism, [SubgoalVar, AnswerBlockVar],
-        purity_semipure, ground_vars([AnswerBlockVar]), ModuleInfo,
+        Purity, ground_vars([AnswerBlockVar]), ModuleInfo,
          Context, ReturnAnswerBlocksGoal),
      DebugArgStr = get_debug_arg_string(TableInfo),
      generate_restore_goals(NumberedOutputVars, OrigInstMapDelta,
@@ -2832,8 +2832,9 @@
      Args = [Arg],
      ReturnAllPredName = "table_mm_return_all_shortcut",
      table_generate_foreign_proc(ReturnAllPredName, detism_det,
-        tabling_c_attributes, Args, RestoreArgs, RestoreCodeStr, purity_impure,
-        RestoreInstMapDeltaSrc, ModuleInfo, Context, ReturnAllGoal),
+        tabling_c_attributes, Args, RestoreArgs, RestoreCodeStr,
+        purity_semipure, RestoreInstMapDeltaSrc, ModuleInfo, Context,
+        ReturnAllGoal),
      GoalExpr = conj(plain_conj, [ReturnAnswerBlocksGoal, ReturnAllGoal]),

      set.list_to_set([SubgoalVar | OutputVars], NonLocals),

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------



More information about the reviews mailing list