From 0e6bc88cabae683023b96987efcb2cc5df5c13c0 Mon Sep 17 00:00:00 2001
From: yoyo <ghwns674@gmail.com>
Date: Sun, 8 Sep 2024 16:10:49 +0900
Subject: [PATCH] return nil if false on cmp

---
 eval.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/eval.c b/eval.c
index 30b9237..46040f6 100644
--- a/eval.c
+++ b/eval.c
@@ -228,7 +228,7 @@ fnmod(Object *env, Object *list)
 	return newint(gc, sum);
 }
 
-long
+static long
 cmp(Object *env, Object *list)
 {
     Object *a = eval(env, list->car);
@@ -238,51 +238,56 @@ cmp(Object *env, Object *list)
 	return a->num - b->num;	
 }
 
+static Object*
+_newint(int n)
+{
+	if(n == 0)
+		return &Nil;
+	return newint(gc, 1);
+}
+
 Object*
 fneq(Object *env, Object *list)
 {
-	return newint(gc, cmp(env, list) == 0);
+	return _newint(cmp(env, list) == 0);
 }
 
 Object*
 fnge(Object *env, Object *list)
 {
-	return newint(gc, cmp(env, list) >= 0);
+	return _newint(cmp(env, list) >= 0);
 }
 
 Object*
 fngt(Object *env, Object *list)
 {
-	return newint(gc, cmp(env, list) > 0);
+	return _newint(cmp(env, list) > 0);
 }
 
 Object*
 fnle(Object *env, Object *list)
 {
-	return newint(gc, cmp(env, list) <= 0);
+	return _newint(cmp(env, list) <= 0);
 }
 
 Object*
 fnlt(Object *env, Object *list)
 {
-	return newint(gc, cmp(env, list) < 0);
+	return _newint(cmp(env, list) < 0);
 }
 
 Object*
 fnne(Object *env, Object *list)
 {
-	return newint(gc, cmp(env, list) != 0);
+	return _newint(cmp(env, list) != 0);
 }
 
-/* if test then else */
 Object*
 fnif(Object *env, Object *list)
 {
 	if(list->type != OCELL || list->cdr->type != OCELL)
 		error("Malformed if stmt");
-	Object *test = list->car;
-	test = eval(env, test);
-	if(test != &Nil)
+	if(eval(env, list->car)!=&Nil)
 		return eval(env, list->cdr->car);
 	if(list->cdr->cdr == &Nil)
 		return &Nil;