diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add support for compilers without dynamic arrays

Browse Source
This commit is contained in:
Denys Duchier 2011-08-09 15:03:45 +02:00
parent d4d4dbaddf
commit 292f89360b
2 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/gecode/Makefile.in
View File

@ -23,8 +23,7 @@ SHAREDIR=$(ROOTDIR)/share
# #
# #
CXX=@CXX@ CXX=@CXX@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include $(CPPFLAGS) CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -I. -I$(srcdir) -I../.. -I$(srcdir)/../../include
CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include $(CPPFLAGS)
# #
# #
# You shouldn't need to change what follows. # You shouldn't need to change what follows.

50
library/gecode/gecode_yap.cc
View File

@ -261,18 +261,34 @@ extern "C"
return n; return n;
} }
#ifndef HAVE_DYNARRAY
struct SpecArray
{
int* _array;
SpecArray(int n): _array(new int[n][2]) {}
~SpecArray() { delete[] _array; }
typedef int (*_specarray)[][2];
T& operator()(int i,int j) { return ((_specarray)_array)[i][j]; }
};
#define SPECARRAY(A,N) SpecArray A(N)
#define SPECARRAYELEM(A,I,J) A(I,J)
#else
#define SPECARRAY(A,N) int A[N][2]
#define SPECARRAYELEM(A,I,J) A[I][J]
#endif
static IntSet static IntSet
gecode_IntSet_from_term(YAP_Term specs) gecode_IntSet_from_term(YAP_Term specs)
{ {
int n = gecode_list_length(specs); int n = gecode_list_length(specs);
int r[n][2]; SPECARRAY(r,n);
int i = 0; int i = 0;
while (YAP_IsPairTerm(specs)) while (YAP_IsPairTerm(specs))
{ {
YAP_Term head = YAP_HeadOfTerm(specs); YAP_Term head = YAP_HeadOfTerm(specs);
specs = YAP_TailOfTerm(specs); specs = YAP_TailOfTerm(specs);
r[i][0] = YAP_IntOfTerm(YAP_ArgOfTerm(1, head)); SPECARRAYELEM(r,i,0) = YAP_IntOfTerm(YAP_ArgOfTerm(1, head));
r[i][1] = YAP_IntOfTerm(YAP_ArgOfTerm(2, head)); SPECARRAYELEM(r,i,1) = YAP_IntOfTerm(YAP_ArgOfTerm(2, head));
i += 1; i += 1;
} }
return IntSet(r, n); return IntSet(r, n);
@ -828,6 +844,19 @@ extern "C"
return YAP_Unify(result, YAP_MkIntTerm(x.glbMax())); return YAP_Unify(result, YAP_MkIntTerm(x.glbMax()));
} }
#ifndef HAVE_DYNARRAY
template <typename T> struct DynArray
{
T* _array;
DynArray(int n): _array(new T[n]) {}
~DynArray() { delete[] _array; }
T& operator[](int i) { return _array[i]; }
};
#define DYNARRAY(T,A,N) DynArray<T> A(N)
#else
#define DYNARRAY(T,A,N) T A[N]
#endif
static YAP_Functor gecode_COMMA2; static YAP_Functor gecode_COMMA2;
static int gecode_setvar_glb_ranges(void) static int gecode_setvar_glb_ranges(void)
@ -837,7 +866,8 @@ extern "C"
SetVar x = gecode_SetVar_from_term(space, YAP_ARG3); SetVar x = gecode_SetVar_from_term(space, YAP_ARG3);
int n = 0; int n = 0;
{ SetVarGlbRanges it(x); while (it()) { ++n; ++it; } } { SetVarGlbRanges it(x); while (it()) { ++n; ++it; } }
int min[n], max[n]; DYNARRAY(int,min,n);
DYNARRAY(int,max,n);
{ SetVarGlbRanges it(x); int i=0; { SetVarGlbRanges it(x); int i=0;
while (it()) { min[i]=it.min(); max[i]=it.max(); ++it; ++i; } } while (it()) { min[i]=it.min(); max[i]=it.max(); ++it; ++i; } }
YAP_Term lst = YAP_TermNil(); YAP_Term lst = YAP_TermNil();
@ -859,7 +889,8 @@ extern "C"
SetVar x = gecode_SetVar_from_term(space, YAP_ARG3); SetVar x = gecode_SetVar_from_term(space, YAP_ARG3);
int n = 0; int n = 0;
{ SetVarLubRanges it(x); while (it()) { ++n; ++it; } } { SetVarLubRanges it(x); while (it()) { ++n; ++it; } }
int min[n], max[n]; DYNARRAY(int,min,n);
DYNARRAY(int,max,n);
{ SetVarLubRanges it(x); int i=0; { SetVarLubRanges it(x); int i=0;
while (it()) { min[i]=it.min(); max[i]=it.max(); ++it; ++i; } } while (it()) { min[i]=it.min(); max[i]=it.max(); ++it; ++i; } }
YAP_Term lst = YAP_TermNil(); YAP_Term lst = YAP_TermNil();
@ -881,7 +912,8 @@ extern "C"
SetVar x = gecode_SetVar_from_term(space, YAP_ARG3); SetVar x = gecode_SetVar_from_term(space, YAP_ARG3);
int n = 0; int n = 0;
{ SetVarUnknownRanges it(x); while (it()) { ++n; ++it; } } { SetVarUnknownRanges it(x); while (it()) { ++n; ++it; } }
int min[n], max[n]; DYNARRAY(int,min,n);
DYNARRAY(int,max,n);
{ SetVarUnknownRanges it(x); int i=0; { SetVarUnknownRanges it(x); int i=0;
while (it()) { min[i]=it.min(); max[i]=it.max(); ++it; ++i; } } while (it()) { min[i]=it.min(); max[i]=it.max(); ++it; ++i; } }
YAP_Term lst = YAP_TermNil(); YAP_Term lst = YAP_TermNil();
@ -901,7 +933,7 @@ extern "C"
YAP_Term result = YAP_ARG1; YAP_Term result = YAP_ARG1;
GenericSpace* space = gecode_Space_from_term(YAP_ARG2); GenericSpace* space = gecode_Space_from_term(YAP_ARG2);
SetVar x = gecode_SetVar_from_term(space, YAP_ARG3); SetVar x = gecode_SetVar_from_term(space, YAP_ARG3);
YAP_Term elems[x.glbSize()]; DYNARRAY(YAP_Term,elems,x.glbSize());
SetVarGlbValues it(x); SetVarGlbValues it(x);
int n = 0; int n = 0;
while (it()) { elems[n] = YAP_MkIntTerm(it.val()); ++it; ++n; } while (it()) { elems[n] = YAP_MkIntTerm(it.val()); ++it; ++n; }
@ -915,7 +947,7 @@ extern "C"
YAP_Term result = YAP_ARG1; YAP_Term result = YAP_ARG1;
GenericSpace* space = gecode_Space_from_term(YAP_ARG2); GenericSpace* space = gecode_Space_from_term(YAP_ARG2);
SetVar x = gecode_SetVar_from_term(space, YAP_ARG3); SetVar x = gecode_SetVar_from_term(space, YAP_ARG3);
YAP_Term elems[x.glbSize()]; DYNARRAY(YAP_Term,elems,x.glbSize());
SetVarLubValues it(x); SetVarLubValues it(x);
int n = 0; int n = 0;
while (it()) { elems[n] = YAP_MkIntTerm(it.val()); ++it; ++n; } while (it()) { elems[n] = YAP_MkIntTerm(it.val()); ++it; ++n; }
@ -929,7 +961,7 @@ extern "C"
YAP_Term result = YAP_ARG1; YAP_Term result = YAP_ARG1;
GenericSpace* space = gecode_Space_from_term(YAP_ARG2); GenericSpace* space = gecode_Space_from_term(YAP_ARG2);
SetVar x = gecode_SetVar_from_term(space, YAP_ARG3); SetVar x = gecode_SetVar_from_term(space, YAP_ARG3);
YAP_Term elems[x.glbSize()]; DYNARRAY(YAP_Term,elems,x.glbSize());
SetVarUnknownValues it(x); SetVarUnknownValues it(x);
int n = 0; int n = 0;
while (it()) { elems[n] = YAP_MkIntTerm(it.val()); ++it; ++n; } while (it()) { elems[n] = YAP_MkIntTerm(it.val()); ++it; ++n; }