artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

core: assq: Prepare for M2-Planet.

Browse source 
* src/mes.c (assq): Prepare for M2-Planet.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2020-07-16 19:01:43 +02:00
parent 4c83a3bc6b
commit 673ca85c64
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/mes.c
View file

@ -244,26 +244,41 @@ assq (SCM x, SCM a)
if (TYPE (a) != TPAIR) if (TYPE (a) != TPAIR)
return cell_f; return cell_f;
int t = TYPE (x); int t = TYPE (x);
if (t == TSYMBOL || t == TSPECIAL) if (t == TSYMBOL || t == TSPECIAL)
while (a != cell_nil && x != CAAR (a)) while (a != cell_nil)
a = CDR (a); {
if (x == CAAR (a))
return CAR (a);
a = CDR (a);
}
else if (t == TCHAR || t == TNUMBER) else if (t == TCHAR || t == TNUMBER)
{ {
long v = VALUE (x); long v = VALUE (x);
while (a != cell_nil && v != VALUE (CAAR (a))) while (a != cell_nil)
a = CDR (a); {
if (v == VALUE (CAAR (a)))
return CAR (a);
a = CDR (a);
}
} }
else if (t == TKEYWORD) else if (t == TKEYWORD)
{ {
while (a != cell_nil && string_equal_p (x, CAAR (a)) == cell_f) while (a != cell_nil)
a = CDR (a); {
if (string_equal_p (x, CAAR (a)) == cell_t)
return CAR (a);
a = CDR (a);
}
} }
else else
/* pointer equality, e.g. on strings. */ /* pointer equality, e.g. on strings. */
while (a != cell_nil && x != CAAR (a)) while (a != cell_nil)
a = CDR (a); {
if (a != cell_nil) if (x == CAAR (a))
return CAR (a); return CAR (a);
a = CDR (a);
}
return cell_f; return cell_f;
} }