Add exclusions for operator conflicts with clojure core

scicloj · Apr 18, 2024 · 1d501aa · 1d501aa
1 parent 3d89b17
commit 1d501aa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/src/tablecloth/api.clj b/src/tablecloth/api.clj
@@ -20,7 +20,7 @@
             [tech.v3.dataset]
             [tech.v3.dataset.print]
             [tech.v3.datatype])
-  (:refer-clojure :exclude [group-by drop concat rand-nth first last shuffle]))
+  (:refer-clojure :exclude [group-by drop concat rand-nth first last shuffle * + - / < <= >= > abs and bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-xor even? identity infinite? max min neg? not odd? or pos? quot rem unsigned-bit-shift-right zero?]))
 
 (defn *
   "Applies the operation tablecloth.column.api.operators/* to the columns selected by

diff --git a/src/tablecloth/api/api_template.clj b/src/tablecloth/api/api_template.clj
@@ -1,6 +1,10 @@
 (ns tablecloth.api.api-template
   "Tablecloth API"
-  (:refer-clojure :exclude [group-by drop concat rand-nth first last shuffle])  
+  (:refer-clojure :exclude [group-by drop concat rand-nth first last shuffle * + / - < <= > >=
+                            abs bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set
+                            bit-shift-left bit-shift-right bit-xor and even? identity infinite?
+                            max min neg? not odd? or pos? quot rem unsigned-bit-shift-right
+                            zero?])
   (:require [tech.v3.datatype.export-symbols :as exporter]))
 
 (exporter/export-symbols tech.v3.datatype
@@ -178,4 +182,8 @@
   (exporter/write-api! 'tablecloth.api.api-template
                        'tablecloth.api
                        "src/tablecloth/api.clj"
-                       '[group-by drop concat rand-nth first last shuffle]))
+                       '[group-by drop concat rand-nth first last shuffle * + - / < <= >= >
+                         abs and bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set
+                         bit-shift-left bit-shift-right bit-xor even? identity infinite? max min
+                         neg? not odd? or pos? quot rem unsigned-bit-shift-right zero?])
+  )
diff --git a/src/tablecloth/column/api.clj b/src/tablecloth/column/api.clj
@@ -5,7 +5,8 @@
             [tablecloth.column.api.column]
             [tablecloth.column.api.missing]
             [tablecloth.column.api.operators]
-            [tech.v3.dataset.column]))
+            [tech.v3.dataset.column])
+  (:refer-clojure :exclude [* + - / < <= >= > abs and bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-xor even? identity infinite? max min neg? not odd? or pos? quot rem unsigned-bit-shift-right zero?]))
 
 (defn *
   ([x y]
@@ -693,7 +694,7 @@
 
 
 (defn replace-missing
-  "Replace missing values in column `col` with give `strategy`. Default is `:nearest`. 
+  "Replace missing values in column `col` with give `strategy`.
 
     Strategies may be:
 

diff --git a/src/tablecloth/column/api/api_template.clj b/src/tablecloth/column/api/api_template.clj
@@ -1,5 +1,10 @@
 (ns tablecloth.column.api.api-template
   "Tablecloth Column API"
+  (:refer-clojure :exclude [group-by drop concat rand-nth first last shuffle * + / - < <= > >=
+                            abs bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set
+                            bit-shift-left bit-shift-right bit-xor and even? identity infinite?
+                            max min neg? not odd? or pos? quot rem unsigned-bit-shift-right
+                            zero?])  
   (:require [tech.v3.datatype.export-symbols :as exporter]))
 
 (exporter/export-symbols tablecloth.column.api.column
@@ -31,5 +36,8 @@
   (exporter/write-api! 'tablecloth.column.api.api-template
                        'tablecloth.column.api
                        "src/tablecloth/column/api.clj"
-                       '[])
+                       '[* + - / < <= >= >
+                         abs and bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set
+                         bit-shift-left bit-shift-right bit-xor even? identity infinite? max min
+                         neg? not odd? or pos? quot rem unsigned-bit-shift-right zero?])
   ,)