From 08f6c642d015f4afd38f6682ec6456e2e60c8ad5 Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Sun, 8 Jul 2018 11:31:24 -0400
Subject: [PATCH] Fix not= and odd?

---
 src/core/core.dst |  2 +-
 src/core/math.c   | 10 +++++-----
 test/suite1.dst   |  4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/core/core.dst b/src/core/core.dst
index 1934f9c0..02d9d696 100644
--- a/src/core/core.dst
+++ b/src/core/core.dst
@@ -50,7 +50,7 @@
 
 # Basic predicates
 (defn even? [x] (== 0 (% x 2)))
-(defn odd? [x] (== 1 (% x 2)))
+(defn odd? [x] (not= 0 (% x 2)))
 (defn zero? [x] (== x 0))
 (defn pos? [x] (> x 0))
 (defn neg? [x] (< x 0))
diff --git a/src/core/math.c b/src/core/math.c
index fbbe4468..e030f295 100644
--- a/src/core/math.c
+++ b/src/core/math.c
@@ -159,20 +159,20 @@ static int dst_strict_equal(DstArgs args) {
     int32_t i;
     for (i = 0; i < args.n - 1; i++) {
         if (!dst_equals(args.v[i], args.v[i+1])) {
-            DST_RETURN(args, dst_wrap_false());
+            DST_RETURN_FALSE(args);
         }
     }
-    DST_RETURN(args, dst_wrap_true());
+    DST_RETURN_TRUE(args);
 }
 
 static int dst_strict_notequal(DstArgs args) {
     int32_t i;
     for (i = 0; i < args.n - 1; i++) {
-        if (dst_equals(args.v[i], args.v[i+1])) {
-            DST_RETURN(args, dst_wrap_false());
+        if (!dst_equals(args.v[i], args.v[i+1])) {
+            DST_RETURN_TRUE(args);
         }
     }
-    DST_RETURN(args, dst_wrap_true());
+    DST_RETURN_FALSE(args);
 }
 
 static int dst_not(DstArgs args) {
diff --git a/test/suite1.dst b/test/suite1.dst
index 8ecdc21e..98045538 100644
--- a/test/suite1.dst
+++ b/test/suite1.dst
@@ -198,4 +198,8 @@
 (def xs (apply1 tuple (for [x :range [0 10] :when (even? x)] (tuple (/ x 2) x))))
 (assert (= xs '((0 0) (1 2) (2 4) (3 6) (4 8))) "for macro 1")
 
+# Some testing for not=
+(assert (not= 1 1 0) "not= 1")
+(assert (not= 0 1 1) "not= 2")
+
 (end-suite)