From 4a5a3d833af196247182b369a3b5c478f14d1e5d Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Tue, 27 Jan 2015 03:25:56 +0000 Subject: [PATCH] fix tyes. --- H/YapSignals.h | 4 +++- H/YapTerm.h | 2 ++ include/YapDefs.h | 19 ++++++++++++++----- packages/CLPBN/horus/HorusYap.cpp | 22 +++++++++++----------- packages/bdd/cudd.c | 30 +++++++++++++++--------------- packages/prism/src/c/core/bpx.c | 6 +++--- packages/prism/src/c/core/bpx.h | 5 ++++- packages/prism/src/c/core/stuff.h | 4 ++-- packages/udi | 2 +- 9 files changed, 55 insertions(+), 39 deletions(-) diff --git a/H/YapSignals.h b/H/YapSignals.h index afa58da1f..abf769de3 100755 --- a/H/YapSignals.h +++ b/H/YapSignals.h @@ -74,7 +74,9 @@ typedef enum #define Yap_has_signal(S) Yap_has_signal__(S PASS_REGS) #define Yap_only_has_signal(S) Yap_only_has_signal__(S PASS_REGS) -inline static uint64_t +INLINE_ONLY inline EXTERN uint64_t SIGNAL_TO_BIT( yap_signals sig); + +INLINE_ONLY inline EXTERN uint64_t SIGNAL_TO_BIT( yap_signals sig) { return ((uint64_t)1 << (sig-1)); diff --git a/H/YapTerm.h b/H/YapTerm.h index d2bfd8d84..9ef7e2e57 100644 --- a/H/YapTerm.h +++ b/H/YapTerm.h @@ -15,6 +15,8 @@ #ifndef YAP_H #include "YapTermConfig.h" +#include "config.h" + #if HAVE_STDINT_H #include diff --git a/include/YapDefs.h b/include/YapDefs.h index a4d2ac528..7f6ac3e69 100755 --- a/include/YapDefs.h +++ b/include/YapDefs.h @@ -20,12 +20,23 @@ #include +#ifdef YAP_H + /* The YAP main types */ #include "YapTerm.h" +#else + +#include "config.h" + +#endif /* YAP_H */ + /* truth-values */ /* stdbool defines the booleam type, bool, and the constants false and true */ +#if HAVE_STDINT_H +#include +#endif #if HAVE_STDBOOL_H #include #else @@ -49,6 +60,9 @@ typedef int _Bool; #ifndef FALSE #define FALSE false #endif +#ifndef YAP_Bool +typedef bool YAP_Bool; +#endif #ifdef YAP_H @@ -72,8 +86,6 @@ typedef int _Bool; #define YAP_Float Float -#define YAP_Bool bool - #define YAP_handle_t yhandle_t #define YAP_PredEntryPtr struct pred_entry * @@ -92,8 +104,6 @@ typedef unsigned long long YAP_CELL; typedef uintptr_t YAP_CELL; #endif -typedef bool YAP_Bool; - typedef YAP_CELL YAP_Term; typedef YAP_CELL YAP_Arity; @@ -136,7 +146,6 @@ typedef int (*YAP_agc_hook)(void *_Atom); #endif - typedef struct YAP_thread_attr_struct { size_t ssize; size_t tsize; diff --git a/packages/CLPBN/horus/HorusYap.cpp b/packages/CLPBN/horus/HorusYap.cpp index b1d95ae5e..6c5c71667 100644 --- a/packages/CLPBN/horus/HorusYap.cpp +++ b/packages/CLPBN/horus/HorusYap.cpp @@ -41,7 +41,7 @@ typedef std::pair LiftedNetwork; -int +static YAP_Bool createLiftedNetwork() { Parfactors parfactors; @@ -79,7 +79,7 @@ createLiftedNetwork() -int +static YAP_Bool createGroundNetwork() { std::string factorsType ((char*) YAP_AtomName (YAP_AtomOfTerm (YAP_ARG1))); @@ -135,7 +135,7 @@ createGroundNetwork() -int +static YAP_Bool runLiftedSolver() { LiftedNetwork* network = (LiftedNetwork*) YAP_IntOfTerm (YAP_ARG1); @@ -193,7 +193,7 @@ runLiftedSolver() -int +static YAP_Bool runGroundSolver() { FactorGraph* fg = (FactorGraph*) YAP_IntOfTerm (YAP_ARG1); @@ -244,7 +244,7 @@ runGroundSolver() -int +static YAP_Bool setParfactorsParams() { LiftedNetwork* network = (LiftedNetwork*) YAP_IntOfTerm (YAP_ARG1); @@ -271,7 +271,7 @@ setParfactorsParams() -int +static YAP_Bool setFactorsParams() { FactorGraph* fg = (FactorGraph*) YAP_IntOfTerm (YAP_ARG1); @@ -297,7 +297,7 @@ setFactorsParams() -int +static YAP_Bool setVarsInformation() { Var::clearVarsInfo(); @@ -327,7 +327,7 @@ setVarsInformation() -int +static YAP_Bool setHorusFlag() { std::string option ((char*) YAP_AtomName (YAP_AtomOfTerm (YAP_ARG1))); @@ -352,7 +352,7 @@ setHorusFlag() -int +static YAP_Bool freeGroundNetwork() { delete (FactorGraph*) YAP_IntOfTerm (YAP_ARG1); @@ -361,7 +361,7 @@ freeGroundNetwork() -int +static YAP_Bool freeLiftedNetwork() { LiftedNetwork* network = (LiftedNetwork*) YAP_IntOfTerm (YAP_ARG1); @@ -547,7 +547,7 @@ fillSolutionList (const std::vector& results) const Params& beliefs = results[i]; YAP_Term queryBeliefsL = YAP_TermNil(); for (size_t j = beliefs.size(); j-- > 0; ) { - YAP_Int sl = YAP_InitSlot (list); + YAP_Int sl = YAP_InitSlot (list); YAP_Term belief = YAP_MkFloatTerm (beliefs[j]); queryBeliefsL = YAP_MkPairTerm (belief, queryBeliefsL); list = YAP_GetFromSlot (sl); diff --git a/packages/bdd/cudd.c b/packages/bdd/cudd.c index 64b449520..337998d58 100644 --- a/packages/bdd/cudd.c +++ b/packages/bdd/cudd.c @@ -262,7 +262,7 @@ term_to_cudd(DdManager *manager, YAP_Term t) return NULL; } -static int +static YAP_Bool p_term_to_cudd(void) { DdManager *manager; @@ -417,7 +417,7 @@ term_to_add(DdManager *manager, YAP_Term t) return NULL; } -static int +static YAP_Bool p_term_to_add(void) { DdManager *manager = Cudd_Init(0,0,CUDD_UNIQUE_SLOTS,CUDD_CACHE_SLOTS,0); @@ -431,16 +431,16 @@ p_term_to_add(void) YAP_Unify(YAP_ARG4, YAP_MkIntTerm((YAP_Int)t)); } -static int complement(int i) +static YAP_Bool complement(int i) { return i == 0 ? 1 : 0; } -static int var(DdManager *manager, DdNode *n, YAP_Int *vals ) { +static YAP_Bool var(DdManager *manager, DdNode *n, YAP_Int *vals ) { return (int)vals[Cudd_ReadPerm(manager,Cudd_NodeReadIndex(n))]; } -static int +static YAP_Bool cudd_eval(DdManager *manager, DdNode *n, YAP_Int *vals ) { if (Cudd_IsConstant(n)) { @@ -461,7 +461,7 @@ cudd_eval(DdManager *manager, DdNode *n, YAP_Int *vals ) } } -static int +static YAP_Bool cudd_eval_top(DdManager *manager, DdNode *n, YAP_Int *vals ) { if (Cudd_IsComplement(n)) { @@ -471,7 +471,7 @@ cudd_eval_top(DdManager *manager, DdNode *n, YAP_Int *vals ) } } -static int +static YAP_Bool p_eval_cudd(void) { DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1); @@ -511,7 +511,7 @@ add_eval(DdManager *manager, DdNode *n, YAP_Int *vals ) } } -static int +static YAP_Bool p_eval_add(void) { DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1); @@ -604,7 +604,7 @@ get_vars(YAP_Term t3) return YAP_ArityOfFunctor(YAP_FunctorOfTerm(t3)); } -static int +static YAP_Bool p_cudd_to_term(void) { DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1); @@ -674,7 +674,7 @@ build_prolog_add(DdManager *manager, DdNode *n, YAP_Term *ar, hash_table_entry * } } -static int +static YAP_Bool p_add_to_term(void) { DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1); @@ -716,7 +716,7 @@ p_add_to_term(void) return YAP_Unify(YAP_ARG4, t); } -static int +static YAP_Bool p_cudd_size(void) { DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1); @@ -784,7 +784,7 @@ build_sp_cudd(DdManager *manager, DdNode *n, double *ar, hash_table_entry_dbl *h } } -static int +static YAP_Bool p_cudd_to_p(void) { DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1); @@ -819,7 +819,7 @@ p_cudd_to_p(void) return YAP_Unify(YAP_ARG4, YAP_MkFloatTerm(p)); } -static int +static YAP_Bool p_cudd_print(void) { DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1); @@ -836,7 +836,7 @@ p_cudd_print(void) return TRUE; } -static int +static YAP_Bool p_cudd_die(void) { DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1); @@ -844,7 +844,7 @@ p_cudd_die(void) return TRUE; } -static int +static YAP_Bool p_cudd_release_node(void) { DdManager *manager = (DdManager *)YAP_IntOfTerm(YAP_ARG1); diff --git a/packages/prism/src/c/core/bpx.c b/packages/prism/src/c/core/bpx.c index 4f12ea541..f28f53e27 100755 --- a/packages/prism/src/c/core/bpx.c +++ b/packages/prism/src/c/core/bpx.c @@ -46,9 +46,9 @@ NORET quit(const char *); NORET myquit(int, const char *); /* unify.c */ -int unify(TERM, TERM); -int is_UNIFIABLE(TERM, TERM); -int is_IDENTICAL(TERM, TERM); +int unify(TERM, TERM); +int is_UNIFIABLE(TERM, TERM); +int is_IDENTICAL(TERM, TERM); /* prism.c */ NORET bp4p_quit(int); diff --git a/packages/prism/src/c/core/bpx.h b/packages/prism/src/c/core/bpx.h index cf84d7827..e6d161314 100755 --- a/packages/prism/src/c/core/bpx.h +++ b/packages/prism/src/c/core/bpx.h @@ -178,7 +178,10 @@ extern BPLONG number_var_exception; extern BPLONG toam_signal_vec; -#define unify YAP_Unify +#define unify YAP_UnifyINT + +extern inline YAP_UnifyINT(YAP_Term t1, YAP_Term t2); +extern inline YAP_UnifyINT(YAP_Term t1, YAP_Term t2) { return YAP_Unify(t1,t2); } INLINE_ONLY extern inline char * bp_term_2_string(TERM t) diff --git a/packages/prism/src/c/core/stuff.h b/packages/prism/src/c/core/stuff.h index 365eea205..13648793e 100644 --- a/packages/prism/src/c/core/stuff.h +++ b/packages/prism/src/c/core/stuff.h @@ -2,9 +2,9 @@ #define STUFF_H /*--------------------------------------------------------------------*/ - +#ifndef bool typedef enum { false, true } bool; - +#endif /*--------------------------------------------------------------------*/ #if defined _MSC_VER diff --git a/packages/udi b/packages/udi index 5e423b2d0..9becd0f06 160000 --- a/packages/udi +++ b/packages/udi @@ -1 +1 @@ -Subproject commit 5e423b2d029c9dbf320649b08fc0253d64853257 +Subproject commit 9becd0f0619379d30b26b14df642872a373f3fa4