Merge branch 'master' of ssh://git.code.sf.net/p/yap/yap-6.3
This commit is contained in:
commit
76ca8c31df
16
C/exo.c
16
C/exo.c
@ -69,10 +69,10 @@ inline BITS32 fmix32 ( BITS32 h )
|
|||||||
return h;
|
return h;
|
||||||
}
|
}
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
extern inline BITS32
|
INLINE_ONLY inline BITS32
|
||||||
HASH_MURMUR3_32 (UInt arity, CELL *cl, UInt bnds[], UInt sz);
|
HASH_MURMUR3_32 (UInt arity, CELL *cl, UInt bnds[], UInt sz);
|
||||||
|
|
||||||
extern inline BITS32
|
INLINE_ONLY inline BITS32
|
||||||
HASH_MURMUR3_32 (UInt arity, CELL *cl, UInt bnds[], UInt sz)
|
HASH_MURMUR3_32 (UInt arity, CELL *cl, UInt bnds[], UInt sz)
|
||||||
{
|
{
|
||||||
UInt hash;
|
UInt hash;
|
||||||
@ -121,10 +121,10 @@ HASH_MURMUR3_32 (UInt arity, CELL *cl, UInt bnds[], UInt sz)
|
|||||||
/*DJB2*/
|
/*DJB2*/
|
||||||
#define DJB2_OFFSET 5381
|
#define DJB2_OFFSET 5381
|
||||||
|
|
||||||
extern inline BITS32
|
INLINE_ONLY inline BITS32
|
||||||
HASH_DJB2(UInt arity, CELL *cl, UInt bnds[], UInt sz);
|
HASH_DJB2(UInt arity, CELL *cl, UInt bnds[], UInt sz);
|
||||||
|
|
||||||
extern inline BITS32
|
INLINE_ONLY inline BITS32
|
||||||
HASH_DJB2(UInt arity, CELL *cl, UInt bnds[], UInt sz)
|
HASH_DJB2(UInt arity, CELL *cl, UInt bnds[], UInt sz)
|
||||||
{
|
{
|
||||||
BITS32 hash;
|
BITS32 hash;
|
||||||
@ -147,11 +147,11 @@ HASH_DJB2(UInt arity, CELL *cl, UInt bnds[], UInt sz)
|
|||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern inline BITS32
|
INLINE_ONLY inline BITS32
|
||||||
HASH_RS(UInt arity, CELL *cl, UInt bnds[], UInt sz);
|
HASH_RS(UInt arity, CELL *cl, UInt bnds[], UInt sz);
|
||||||
|
|
||||||
/* RS Hash Function */
|
/* RS Hash Function */
|
||||||
extern inline BITS32
|
INLINE_ONLY inline BITS32
|
||||||
HASH_RS(UInt arity, CELL *cl, UInt bnds[], UInt sz)
|
HASH_RS(UInt arity, CELL *cl, UInt bnds[], UInt sz)
|
||||||
{
|
{
|
||||||
UInt hash=0;
|
UInt hash=0;
|
||||||
@ -176,7 +176,7 @@ HASH_RS(UInt arity, CELL *cl, UInt bnds[], UInt sz)
|
|||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern inline BITS32
|
INLINE_ONLY inline BITS32
|
||||||
HASH_FVN_1A(UInt arity, CELL *cl, UInt bnds[], UInt sz);
|
HASH_FVN_1A(UInt arity, CELL *cl, UInt bnds[], UInt sz);
|
||||||
|
|
||||||
/* Simple hash function:
|
/* Simple hash function:
|
||||||
@ -185,7 +185,7 @@ HASH_FVN_1A(UInt arity, CELL *cl, UInt bnds[], UInt sz);
|
|||||||
hash0 spreads extensions coming from different elements.
|
hash0 spreads extensions coming from different elements.
|
||||||
spread over j quadrants.
|
spread over j quadrants.
|
||||||
*/
|
*/
|
||||||
extern inline BITS32
|
INLINE_ONLY inline BITS32
|
||||||
HASH_FVN_1A(UInt arity, CELL *cl, UInt bnds[], UInt sz)
|
HASH_FVN_1A(UInt arity, CELL *cl, UInt bnds[], UInt sz)
|
||||||
{
|
{
|
||||||
UInt hash;
|
UInt hash;
|
||||||
|
@ -284,6 +284,8 @@ read_quoted_char(int *scan_nextp, IOSTREAM *inp_stream)
|
|||||||
switch (ch) {
|
switch (ch) {
|
||||||
case 10:
|
case 10:
|
||||||
return 0;
|
return 0;
|
||||||
|
case '\\':
|
||||||
|
return '\\';
|
||||||
case 'a':
|
case 'a':
|
||||||
return '\a';
|
return '\a';
|
||||||
case 'b':
|
case 'b':
|
||||||
|
Reference in New Issue
Block a user