fix use of exo preds.

C/cdmgr.c

@@ -544,6 +544,9 @@ PredForChoicePt(yamop *p_code) {
     case _retry_me:
     case _trust_me:
       return p_code->u.Otapl.p;
+    case _retry_exo:
+    case _retry_all_exo:
+      return p_code->u.lp.p;
     case _try_logical:
     case _retry_logical:
     case _trust_logical:
@@ -891,7 +894,7 @@ Yap_BuildMegaClause(PredEntry *ap)
   ap->cs.p_code.FirstClause =
     ap->cs.p_code.LastClause =
     mcl->ClCode;
-  ap->PredFlags |= MegaClausePredFlag;
+  ap->PredFlags |= MegaClausePredFlag|SourcePredFlag;
   Yap_inform_profiler_of_clause(mcl, (char *)mcl+required, ap, GPROF_MEGA);
 }
 
@@ -3003,6 +3006,27 @@ p_is_source( USES_REGS1 )
   return(out);
 }
 
+static Int 
+p_is_exo( USES_REGS1 )
+{				/* '$is_dynamic'(+P)	 */
+  PredEntry      *pe;
+  Int             out;
+  MegaClause *mcl;
+
+  pe = get_pred(Deref(ARG1),  Deref(ARG2), "$is_exo");
+  if (EndOfPAEntr(pe))
+    return FALSE;
+  PELOCK(28,pe);
+  out = (pe->PredFlags & MegaClausePredFlag);
+  if (out) {
+    mcl =
+      ClauseCodeToMegaClause(pe->cs.p_code.FirstClause);
+    out = mcl->ClFlags & ExoMask;
+  }
+  UNLOCKPE(46,pe);
+  return(out);
+}
+
 static Int 
 p_owner_file( USES_REGS1 )
 {				/* '$owner_file'(+P,M,F)	 */
@@ -5769,6 +5793,12 @@ p_choicepoint_info( USES_REGS1 )
       pe = ipc->u.Otapl.p;
       t = BuildActivePred(pe, cptr->cp_args);
       break;
+    case _retry_exo:
+    case _retry_all_exo:
+      ncl = NULL;
+      pe = ipc->u.lp.p;
+      t = BuildActivePred(pe, cptr->cp_args);
+      break;      
     case _Nstop:
       { 
 	Atom at = AtomLive;
@@ -5978,7 +6008,7 @@ p_dbload_get_space( USES_REGS1 )
   ap->cs.p_code.FirstClause =
     ap->cs.p_code.LastClause =
     mcl->ClCode;
-  ap->PredFlags |= MegaClausePredFlag;
+  ap->PredFlags |= (MegaClausePredFlag|SourcePredFlag);
   ap->cs.p_code.NOfClauses = ncls;
   if (ap->PredFlags & (SpiedPredFlag|CountPredFlag|ProfiledPredFlag)) {
     ap->OpcodeOfPred = Yap_opcode(_spy_pred);
@@ -6037,6 +6067,7 @@ Yap_InitCdMgr(void)
   Yap_InitCPred("$is_expand_goal_or_meta_predicate", 2, p_is_expandgoalormetapredicate, TestPredFlag | SafePredFlag);
   Yap_InitCPred("$is_log_updatable", 2, p_is_log_updatable, TestPredFlag | SafePredFlag);
   Yap_InitCPred("$is_source", 2, p_is_source, TestPredFlag | SafePredFlag);
+  Yap_InitCPred("$is_exo", 2, p_is_exo, TestPredFlag | SafePredFlag);
   Yap_InitCPred("$owner_file", 3, p_owner_file, SafePredFlag);
   Yap_InitCPred("$mk_d", 2, p_mk_d, SafePredFlag);
   Yap_InitCPred("$pred_exists", 2, p_pred_exists, TestPredFlag | SafePredFlag);

C/dbase.c

@@ -4501,6 +4501,10 @@ p_erase_clause( USES_REGS1 )
 	Yap_EraseMegaClause(Yap_MegaClauseFromTerm(t1), Yap_MegaClausePredicateFromTerm(t1));
 	return TRUE;
       }
+      if (FunctorOfTerm(t1) == FunctorExoClause) {
+	Yap_Error(TYPE_ERROR_DBREF, t1, "erase exo clause");
+	return FALSE;
+      }
     }
     Yap_Error(TYPE_ERROR_DBREF, t1, "erase");
     return FALSE;
@@ -4688,6 +4692,9 @@ p_instance( USES_REGS1 )
       if (FunctorOfTerm(t1) == FunctorMegaClause) {
 	return mega_instance(Yap_MegaClauseFromTerm(t1), Yap_MegaClausePredicateFromTerm(t1) PASS_REGS);
       }
+      if (FunctorOfTerm(t1) == FunctorExoClause) {
+	return Yap_unify(ARG2,ArgOfTerm(2,t1));
+      }
     }
     return FALSE;
   } else {

C/exo.c

@@ -420,7 +420,7 @@ p_exodb_get_space( USES_REGS1 )
   }
   Yap_ClauseSpace += required;
   /* cool, it's our turn to do the conversion */
-  mcl->ClFlags = MegaMask;
+  mcl->ClFlags = MegaMask|ExoMask;
   mcl->ClSize = required-sizeof(MegaClause);
   mcl->ClPred = ap;
   mcl->ClItemSize = arity*sizeof(CELL);
@@ -430,7 +430,7 @@ p_exodb_get_space( USES_REGS1 )
   ap->cs.p_code.FirstClause =
     ap->cs.p_code.LastClause =
     mcl->ClCode;
-  ap->PredFlags |= MegaClausePredFlag;
+  ap->PredFlags |= MegaClausePredFlag|SourcePredFlag;
   ap->cs.p_code.NOfClauses = ncls;
   if (ap->PredFlags & (SpiedPredFlag|CountPredFlag|ProfiledPredFlag)) {
     ap->OpcodeOfPred = Yap_opcode(_spy_pred);

C/heapgc.c

@@ -2307,6 +2307,10 @@ mark_choicepoints(register choiceptr gc_B, tr_fr_ptr saved_TR, int very_verbose
 	mark_ref_in_use((DBRef)rtp->u.OtILl.block PASS_REGS);
 	nargs = rtp->u.OtILl.d->ClPred->ArityOfPE+1;
 	break;
+      case _retry_exo:
+      case _retry_all_exo:
+	nargs = rtp->u.lp.p->ArityOfPE;
+	break;
 #ifdef DEBUG
       case _retry_me:
       case _trust_me:
@@ -3223,6 +3227,10 @@ sweep_choicepoints(choiceptr gc_B USES_REGS)
     case _retry4:
       sweep_b(gc_B, 4 PASS_REGS);
       break;
+    case _retry_exo:
+    case _retry_all_exo:
+      sweep_b(gc_B, rtp->u.lp.p->ArityOfPE PASS_REGS);
+      break;
     case _retry_c:
     case _retry_userc:
       {