eq? predicate supports nan-boxing

This commit is contained in:
Yuichi Nishiwaki
2013-11-06 16:06:31 +09:00
parent 57f4492c4e
commit 27dc840118
5 changed files with 34 additions and 22 deletions
+1 -17
View File
@@ -2,22 +2,6 @@
#include "picrin.h"
bool
pic_eq_p(pic_state *pic, pic_value x, pic_value y)
{
if (pic_type(x) != pic_type(y))
return false;
switch (pic_type(x)) {
case PIC_TT_NIL:
return true;
case PIC_TT_SYMBOL:
return pic_sym(x) == pic_sym(y);
default:
return false;
}
}
static pic_value
pic_bool_eq_p(pic_state *pic)
{
@@ -25,7 +9,7 @@ pic_bool_eq_p(pic_state *pic)
pic_get_args(pic, "oo", &x, &y);
return pic_bool_value(pic_eq_p(pic, x, y));
return pic_bool_value(pic_eq_p(x, y));
}
/* TODO: replace it with native opcode */
+1 -1
View File
@@ -102,7 +102,7 @@ pic_assq(pic_state *pic, pic_value key, pic_value assoc)
return assoc;
cell = pic_car(pic, assoc);
if (pic_eq_p(pic, key, pic_car(pic, cell)))
if (pic_eq_p(key, pic_car(pic, cell)))
return cell;
assoc = pic_cdr(pic, assoc);
+28
View File
@@ -216,3 +216,31 @@ pic_undef_value()
pic_init_value(v, PIC_VTYPE_UNDEF);
return v;
}
#if PIC_NAN_BOXING
bool
pic_eq_p(pic_value x, pic_value y)
{
return x.u.data == y.u.data;
}
#else
bool
pic_eq_p(pic_value x, pic_value y)
{
if (pic_type(x) != pic_type(y))
return false;
switch (pic_type(x)) {
case PIC_TT_NIL:
return true;
case PIC_TT_SYMBOL:
return pic_sym(x) == pic_sym(y);
default:
return false;
}
}
#endif