From 5d6d25fba86bea0e90a3f93bc229e642a289c380 Mon Sep 17 00:00:00 2001 From: ricroc Date: Tue, 31 May 2005 00:32:02 +0000 Subject: [PATCH] remove abort_yapor function git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1307 b08c6af1-5177-4d33-ba66-4b1c6b8b522a --- C/cdmgr.c | 8 ++++++-- C/init.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/C/cdmgr.c b/C/cdmgr.c index 189c32331..c2391c5c8 100644 --- a/C/cdmgr.c +++ b/C/cdmgr.c @@ -11,8 +11,12 @@ * File: cdmgr.c * * comments: Code manager * * * -* Last rev: $Date: 2005-05-12 03:36:32 $,$Author: vsc $ * +* Last rev: $Date: 2005-05-31 00:30:23 $,$Author: ricroc $ * * $Log: not supported by cvs2svn $ +* Revision 1.157 2005/05/12 03:36:32 vsc +* debugger was making predicates meta instead of testing +* fix handling of dbrefs in facts and in subarguments. +* * Revision 1.156 2005/04/20 04:02:15 vsc * fix a few variable warnings * fix erase clause to pass a pointer to clause, not code @@ -1225,7 +1229,7 @@ add_first_static(PredEntry *p, yamop *cp, int spy_flag) PUT_YAMOP_SEQ(pt); } if (YAMOP_LTT(pt) != 1) - abort_yapor("YAMOP_LTT error in function add_first_static"); + Yap_Error(INTERNAL_ERROR, TermNil, "YAMOP_LTT error (add_first_static)"); #endif /* YAPOR */ #ifdef TABLING if (is_tabled(p)) { diff --git a/C/init.c b/C/init.c index 08e242cc5..3b1603bf7 100644 --- a/C/init.c +++ b/C/init.c @@ -665,7 +665,7 @@ Yap_InitCPredBack(char *Name, unsigned long int Arity, unsigned int Extra, CPred else { StaticClause *cl; yamop *code = ((StaticClause *)NULL)->ClCode; - pe->PredFlags = CompiledPredFlag | StandardPredFlag; + pe->PredFlags = CompiledPredFlag | StandardPredFlag ; #ifdef YAPOR pe->PredFlags |= SequentialPredFlag; #endif /* YAPOR */ @@ -1163,7 +1163,7 @@ Yap_InitWorkspace(int Heap, #ifdef YAPOR worker_id = 0; if (aux_number_workers > MAX_WORKERS) - abort_yapor("excessive number of workers"); + Yap_Error(INTERNAL_ERROR, TermNil, "excessive number of workers (Yap_InitWorkspace)"); #ifdef ENV_COPY INFORMATION_MESSAGE("YapOr: copy model with %d worker%s", aux_number_workers, aux_number_workers == 1 ? "":"s"); #elif ACOW