From 35465b9ffa8ce59a83af54a0637f8e93e4959dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=A9v=C3=A9?= <TimDeve@users.noreply.github.com>
Date: Sat, 10 Apr 2021 08:26:22 +0100
Subject: [PATCH] refactor: Uses def- & defn- macro in core (#1200)

---
 core/Bench.carp  | 28 +++++++---------------------
 core/Random.carp | 16 ++++------------
 2 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/core/Bench.carp b/core/Bench.carp
index ba5b1c06..079e88da 100644
--- a/core/Bench.carp
+++ b/core/Bench.carp
@@ -3,9 +3,7 @@
 (system-include "carp_bench.h")
 
 (defmodule Bench
-  (def min-runs 50)
-  (private min-runs)
-  (hidden min-runs)
+  (def- min-runs 50)
 
   (private get-time-elapsed)
   (hidden get-time-elapsed)
@@ -19,43 +17,33 @@ If your functions takes a large amount of time, experimenting with this might ma
     ; but this is an implementation detail
     (set! min-runs (/ n 2)))
 
-  (private get-unit)
-  (hidden get-unit)
-  (defn get-unit [n]
+  (defn- get-unit [n]
     (cond
       (< n 1000.0) (String.append &(Double.str n) "ns")
       (< n 1000000.0) (String.append &(Double.str (/ n 1000.0)) "µs")
       (< n 1000000000.0) (String.append &(Double.str (/ n 1000000.0)) "ms")
       (String.append &(Double.str (/ n 1000000000.0)) "s")))
 
-  (private print)
-  (hidden print)
-  (defn print [title n]
+  (defn- print [title n]
     (let [unit (get-unit n)]
       (do
         (IO.print title)
         (IO.println &unit))))
 
-  (private ns-iter-inner)
-  (hidden ns-iter-inner)
-  (defn ns-iter-inner [f n]
+  (defn- ns-iter-inner [f n]
     (let [start (get-time-elapsed)]
       (do
         (for [i 0 n] (ignore (~f)))
         (Double.- (get-time-elapsed) start))))
 
-  (private print-bench-results)
-  (hidden print-bench-results)
-  (defn print-bench-results [res total]
+  (defn- print-bench-results [res total]
     (do
       (print "Total time elapsed: " total)
       (print "Best case: " @(Statistics.Summary.min res))
       (print "Worst case: " @(Statistics.Summary.max res))
       (print "Standard deviation: " @(Statistics.Summary.stdev res))))
 
-  (private get-samples)
-  (hidden get-samples)
-  (defn get-samples [f n]
+  (defn- get-samples [f n]
     (let [zero 0.0
           samples (Array.replicate min-runs &zero)]
       (do
@@ -63,9 +51,7 @@ If your functions takes a large amount of time, experimenting with this might ma
           (Array.aset! &samples i (Double./ (ns-iter-inner f (Double.to-int n)) n)))
         (Statistics.summary &(Statistics.winsorize &samples 5.0)))))
 
-  (private min-one)
-  (hidden min-one)
-  (defn min-one [n]
+  (defn- min-one [n]
     (if (> 1.0 n) n 1.0))
 
   ; it is actually possible to make this run forever by supplying a _really_
diff --git a/core/Random.carp b/core/Random.carp
index d7eaa8d7..1d1e13e9 100644
--- a/core/Random.carp
+++ b/core/Random.carp
@@ -1,17 +1,9 @@
 (defmodule Random
 
-  (def a 69069.0)
-  (hidden a)
-  (private a)
-  (def c 1.0)
-  (hidden c)
-  (private c)
-  (def m 4294967296.0)
-  (hidden m)
-  (private m)
-  (def s 19380110.0)
-  (hidden s)
-  (private s)
+  (def- a 69069.0)
+  (def- c 1.0)
+  (def- m 4294967296.0)
+  (def- s 19380110.0)
 
   (doc seed "seed resets the seed of the random number generator.")
   (defn seed []