summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-02-03 15:12:29 -0800
committerKaz Kylheku <kaz@kylheku.com>2014-02-03 15:12:29 -0800
commita2665d2f02ce417851719f07c9e88bd642d59641 (patch)
tree647cf82cff328c1196dbd213b6c2a54f7643c0da
parentbcac7015dadee4c22e6e2adf96cb8cded25e2fe2 (diff)
downloadtxr-a2665d2f02ce417851719f07c9e88bd642d59641.tar.gz
txr-a2665d2f02ce417851719f07c9e88bd642d59641.tar.bz2
txr-a2665d2f02ce417851719f07c9e88bd642d59641.zip
* lib.c (nullp): Function removed.
* lib.h (nullp): New inline function. (eq): Removed useless parentheses: it's not a macro.
-rw-r--r--ChangeLog7
-rw-r--r--lib.c5
-rw-r--r--lib.h5
3 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b569dd2..3332e7a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2014-02-03 Kaz Kylheku <kaz@kylheku.com>
+ * lib.c (nullp): Function removed.
+
+ * lib.h (nullp): New inline function.
+ (eq): Removed useless parentheses: it's not a macro.
+
+2014-02-03 Kaz Kylheku <kaz@kylheku.com>
+
* eval.c (op_modplace): Fixing a few argument count mismatches
in format calls.
diff --git a/lib.c b/lib.c
index 09ca61c6..3f01ab85 100644
--- a/lib.c
+++ b/lib.c
@@ -1418,11 +1418,6 @@ val consp(val obj)
return (ty == CONS || ty == LCONS) ? t : nil;
}
-val nullp(val obj)
-{
- return obj == 0 ? t : nil;
-}
-
val atom(val obj)
{
return if3(consp(obj), nil, t);
diff --git a/lib.h b/lib.h
index 37282579..dfc68db0 100644
--- a/lib.h
+++ b/lib.h
@@ -424,7 +424,6 @@ val make_half_lazy_cons(val func, val car);
val lcons_fun(val lcons);
val list(val first, ...); /* terminated by nao */
val consp(val obj);
-val nullp(val obj);
val atom(val obj);
val listp(val obj);
val proper_listp(val obj);
@@ -712,7 +711,9 @@ void breakpt(void);
#define nil ((obj_t *) 0)
-INLINE val eq(val a, val b) { return ((a) == (b) ? t : nil); }
+INLINE val eq(val a, val b) { return a == b ? t : nil; }
+
+INLINE val nullp(val v) { return v ? nil : t; }
#define nao ((obj_t *) (1 << TAG_SHIFT)) /* "not an object" sentinel value. */