From d6ed2456c71a92984a62008cc7404189b92b4db1 Mon Sep 17 00:00:00 2001 From: Tom Helmuth Date: Tue, 2 Nov 2021 11:11:51 -0400 Subject: [PATCH] Started changing away from macros in files. --- src/propeller/push/instructions/numeric.cljc | 8 ++------ src/propeller/push/utils/macros.cljc | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/propeller/push/instructions/numeric.cljc b/src/propeller/push/instructions/numeric.cljc index 8e5b6f9..da5f5d6 100755 --- a/src/propeller/push/instructions/numeric.cljc +++ b/src/propeller/push/instructions/numeric.cljc @@ -1,12 +1,8 @@ (ns propeller.push.instructions.numeric - #?(:cljs (:require-macros - [propeller.push.utils.macros :refer [def-instruction - generate-instructions]])) (:require [propeller.push.utils.helpers :refer [make-instruction]] [propeller.tools.math :as math] - #?(:cljs [cljs.reader :refer [read-string]] - :clj [propeller.push.utils.macros :refer [def-instruction - generate-instructions]]))) + [propeller.push.utils.macros :refer [def-instruction + generate-instructions]])) ;; ============================================================================= ;; FLOAT and INTEGER Instructions (polymorphic) diff --git a/src/propeller/push/utils/macros.cljc b/src/propeller/push/utils/macros.cljc index bc571fc..939f831 100755 --- a/src/propeller/push/utils/macros.cljc +++ b/src/propeller/push/utils/macros.cljc @@ -33,5 +33,4 @@ (let [instruction-name (keyword (str (name stack) (:name (meta func)))) metadata (make-metadata func stack) new-func (with-meta (partial func stack) metadata)] - (println [instruction-name new-func (meta new-func)]) - (def-instruction instruction-name new-func)))) \ No newline at end of file + (def-instruction instruction-name new-func))))