hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added an equality check primitive function

Browse Source
This commit is contained in:
hyunghwan.chung 2017-01-06 13:27:49 +00:00
parent 0332b5fa5d
commit e12245e398
4 changed files with 104 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
stix/kernel/Collect.st
View File

@ -87,6 +87,20 @@ class(#character) Symbol(String)
0 priorTo: size do: [:i | str at: i put: (self at: i) ].
^str.
}
method = anObject
{
(* for a symbol, equality check is the same as the identity check *)
<primitive: #_identical>
self primitiveFailed.
}
method ~= anObject
{
(* for a symbol, equality check is the same as the identity check *)
<primitive: #_not_identical>
^(self == anObject) not.
}
}
## -------------------------------------------------------------------------------
@ -179,7 +193,6 @@ class Set(Collection)
method do: block
{
| bs |
bs := self.bucket size.
0 priorTo: bs by: 1 do: [:i |
| ass |
@ -187,10 +200,19 @@ class Set(Collection)
].
}
method keysDo: block
{
| bs |
bs := self.bucket size.
0 priorTo: bs by: 1 do: [:i |
| ass |
(ass := self.bucket at: i) notNil ifTrue: [block value: ass key]
].
}
method keysAndValuesDo: block
{
| bs |
bs := self.bucket size.
0 priorTo: bs by: 1 do: [:i |
| ass |
@ -289,9 +311,15 @@ class SystemDictionary(Dictionary)
method at: key
{
(key class = Symbol) ifTrue: [InvalidArgumentException signal: 'argument is not a symbol'].
(key class ~= Symbol) ifTrue: [InvalidArgumentException signal: 'key is not a symbol'].
^super at: key.
}
method at: key put: value
{
(key class ~= Symbol) ifTrue: [InvalidArgumentException signal: 'key is not a symbol'].
^super at: key put: value
}
}
class Namespace(Set)

1
stix/kernel/Context.st
View File

@ -310,6 +310,7 @@ class(#pointer) CompiledMethod(Object)
method preambleCode
{
(* TODO: make this a primtive for performance *)
^(self.preamble bitAnd: 16rFF) bitShift: -2.
}

84
stix/lib/exec.c
View File

@ -1322,33 +1322,84 @@ static stix_pfrc_t pf_not_identical (stix_t* stix, stix_ooi_t nargs)
return STIX_PF_SUCCESS;
}
static stix_pfrc_t pf_equal (stix_t* stix, stix_ooi_t nargs)
static stix_pfrc_t _equal_objects (stix_t* stix, stix_ooi_t nargs)
{
stix_oop_t rcv, arg, b;
stix_oop_t rcv, arg;
int rtag;
STIX_ASSERT (stix, nargs == 1);
rcv = STIX_STACK_GETRCV(stix, nargs);
arg = STIX_STACK_GETARG(stix, nargs, 0);
if (rcv == arg) return 1; /* identical. so equal */
b = (rcv == arg)? stix->_true: stix->_false;
rtag = STIX_OOP_GET_TAG(rcv);
if (rtag != STIX_OOP_GET_TAG(arg)) return 0;
STIX_STACK_SETRET (stix, nargs, b);
return STIX_PF_SUCCESS;
switch (STIX_OOP_GET_TAG(rcv))
{
case STIX_OOP_TAG_SMINT:
return STIX_OOP_TO_SMOOI(rcv) == STIX_OOP_TO_SMOOI(arg)? 1: 0;
case STIX_OOP_TAG_CHAR:
return STIX_OOP_TO_CHAR(rcv) == STIX_OOP_TO_CHAR(arg)? 1: 0;
case STIX_OOP_TAG_ERROR:
return STIX_OOP_TO_ERROR(rcv) == STIX_OOP_TO_ERROR(arg)? 1: 0;
default:
{
STIX_ASSERT (stix, STIX_OOP_IS_POINTER(rcv));
if (STIX_OBJ_GET_CLASS(rcv) != STIX_OBJ_GET_CLASS(arg)) return 0; /* different class, not equal */
STIX_ASSERT (stix, STIX_OBJ_GET_FLAGS_TYPE(rcv) == STIX_OBJ_GET_FLAGS_TYPE(arg));
if (STIX_OBJ_GET_CLASS(rcv) == stix->_class && rcv != arg)
{
/* a class object are supposed to be unique */
return 0;
}
if (STIX_OBJ_GET_SIZE(rcv) != STIX_OBJ_GET_SIZE(arg)) return 0; /* different size, not equal */
switch (STIX_OBJ_GET_FLAGS_TYPE(rcv))
{
case STIX_OBJ_TYPE_BYTE:
case STIX_OBJ_TYPE_CHAR:
case STIX_OBJ_TYPE_HALFWORD:
case STIX_OBJ_TYPE_WORD:
return (STIX_MEMCMP (((stix_oop_byte_t)rcv)->slot, ((stix_oop_byte_t)arg)->slot, STIX_BYTESOF(stix,rcv)) == 0)? 1: 0;
default:
if (rcv == stix->_nil) return arg == stix->_nil? 1: 0;
if (rcv == stix->_true) return arg == stix->_true? 1: 0;
if (rcv == stix->_false) return arg == stix->_false? 1: 0;
/* STIX_OBJ_TYPE_OOP, ... */
STIX_DEBUG1 (stix, "<_equal_objects> Cannot compare objects of type %d\n", (int)STIX_OBJ_GET_FLAGS_TYPE(rcv));
return -1;
}
}
}
}
static stix_pfrc_t pf_equal (stix_t* stix, stix_ooi_t nargs)
{
int n;
n = _equal_objects (stix, nargs);
if (n <= -1) return STIX_PF_FAILURE;
STIX_STACK_SETRET (stix, nargs, (n? stix->_true: stix->_false));
return STIX_PF_SUCCESS;
}
static stix_pfrc_t pf_not_equal (stix_t* stix, stix_ooi_t nargs)
{
stix_oop_t rcv, arg, b;
int n;
STIX_ASSERT (stix, nargs == 1);
n = _equal_objects (stix, nargs);
if (n <= -1) return STIX_PF_FAILURE;
rcv = STIX_STACK_GETRCV(stix, nargs);
arg = STIX_STACK_GETARG(stix, nargs, 0);
b = (rcv != arg)? stix->_true: stix->_false;
STIX_STACK_SETRET (stix, nargs, b);
STIX_STACK_SETRET (stix, nargs, (n? stix->_false: stix->_true));
return STIX_PF_SUCCESS;
}
@ -1651,7 +1702,7 @@ static stix_pfrc_t pf_hash (stix_t* stix, stix_ooi_t nargs)
switch (STIX_OOP_GET_TAG(rcv))
{
case STIX_OOP_TAG_SMINT:
hv = STIX_OOP_TO_CHAR(rcv);
hv = STIX_OOP_TO_SMOOI(rcv);
break;
case STIX_OOP_TAG_CHAR:
@ -1695,7 +1746,10 @@ static stix_pfrc_t pf_hash (stix_t* stix, stix_ooi_t nargs)
}
}
hv %= STIX_SMOOI_MAX;
/* stix_hashxxx() functions should limit the return value to fall
* in the range between 0 and STIX_SMOOI_MAX inclusive */
STIX_ASSERT (stix, hv >= 0 && hv <= STIX_SMOOI_MAX);
STIX_STACK_SETRET (stix, nargs, STIX_SMOOI_TO_OOP(hv));
return STIX_PF_SUCCESS;
}

4
stix/lib/utl.c
View File

@ -45,7 +45,9 @@ stix_oow_t stix_hashbytes (const stix_oob_t* ptr, stix_oow_t len)
bp = ptr; be = bp + len;
while (bp < be) h = h * 31 + *bp++;
return h;
/* constrain the hash value to be representable in a small integer
* for convenience sake */
return h % ((stix_oow_t)STIX_SMOOI_MAX + 1);
}
int stix_equaluchars (const stix_uch_t* str1, const stix_uch_t* str2, stix_oow_t len)