Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-15 16:57:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug fixes

Browse source
This commit is contained in:
Justin Ethier 2016-07-07 23:39:49 -04:00
parent 6794da5159
commit 8e0e7309a2
1 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
runtime.c
View file

@ -880,13 +880,13 @@ object memqp(void *data, object x, list l)
*/
object equalp(object x, object y)
{
object slow_lis = x, fast_lis;
object slow_lis = x, fast_lis = NULL;
int second_cycle = 0;
// if (Cyc_is_pair(x) == boolean_t &&
// Cyc_is_pair(cdr(x)) == boolean_t){
// fast_lis = cdr(x);
// }
if (Cyc_is_pair(x) == boolean_t &&
Cyc_is_pair(cdr(x)) == boolean_t){
fast_lis = cdr(x);
}
for (;; x = cdr(x), y = cdr(y)) {
if (equal(x, y))
@ -900,30 +900,31 @@ object equalp(object x, object y)
if (boolean_f == equalp(car(x), car(y)))
return boolean_f;
// // If there is no cycle, keep checking equality
// if (fast_lis == NULL ||
// Cyc_is_pair(fast_lis) == boolean_f ||
// cdr(fast_lis) == NULL ||
// Cyc_is_pair(cdr(fast_lis)) == boolean_f ||
// cddr(fast_lis) == NULL){
// continue;
// }
//
// // If there is a cycle, handle it
// if (slow_lis == fast_lis) {
// // if this is y, both lists have cycles and are equal, return #t
// if (second_cycle)
// return boolean_t;
// // if this is x, keep going and check for a cycle in y
// second_cycle = 1;
// slow_lis = y;
// if (Cyc_is_pair(y) == boolean_t) {
// fast_lis = cdr(y);
// }
// continue;
// }
// slow_lis = cdr(slow_lis);
// fast_lis = cddr(fast_lis);
// If there is no cycle, keep checking equality
if (fast_lis == NULL ||
Cyc_is_pair(fast_lis) == boolean_f ||
cdr(fast_lis) == NULL ||
Cyc_is_pair(cdr(fast_lis)) == boolean_f ||
cddr(fast_lis) == NULL){
continue;
}
// If there is a cycle, handle it
if (slow_lis == fast_lis) {
// if this is y, both lists have cycles and are equal, return #t
if (second_cycle)
return boolean_t;
// if this is x, keep going and check for a cycle in y
second_cycle = 1;
slow_lis = y;
fast_lis = NULL;
if (Cyc_is_pair(y) == boolean_t) {
fast_lis = cdr(y);
}
continue;
}
slow_lis = cdr(slow_lis);
fast_lis = cddr(fast_lis);
}
}