From cdb4f246e472acb8d87c04fe4e244d5a029e8950 Mon Sep 17 00:00:00 2001 From: pkpkpk Date: Wed, 16 Oct 2024 11:48:58 -0400 Subject: [PATCH] refer raise macro in cljs, silence rename warning bug (#35) * refer raise macro in cljs, silence rename warning bug * exclude distinct? too --- src/datalog/parser/impl.cljc | 2 +- src/datalog/parser/impl/util.cljc | 1 + src/datalog/parser/pull.cljc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/datalog/parser/impl.cljc b/src/datalog/parser/impl.cljc index 846eef6..71a43de 100644 --- a/src/datalog/parser/impl.cljc +++ b/src/datalog/parser/impl.cljc @@ -5,7 +5,7 @@ [datalog.parser.impl.proto :as p] [datalog.parser.impl.util :as util #?(:cljs :refer-macros :clj :refer) [raise forv]]) - (:refer-clojure :rename {distinct? core-distinct?}) + (:refer-clojure :rename {distinct? core-distinct?} #?@(:cljs (:exclude (distinct?)))) #?(:clj (:import [datalog.parser.type Not And Or Aggregate SrcVar RulesVar RuleExpr diff --git a/src/datalog/parser/impl/util.cljc b/src/datalog/parser/impl/util.cljc index e2c8320..ceb2282 100644 --- a/src/datalog/parser/impl/util.cljc +++ b/src/datalog/parser/impl/util.cljc @@ -1,6 +1,7 @@ (ns ^:no-doc datalog.parser.impl.util (:require [datalog.parser.impl.proto :as proto] [clojure.string :as str]) + #?(:cljs (:require-macros [datalog.parser.impl.util :refer [raise]])) (:refer-clojure :exclude [seqable?])) #?(:clj (set! *warn-on-reflection* true)) diff --git a/src/datalog/parser/pull.cljc b/src/datalog/parser/pull.cljc index c95688d..1cf43e2 100644 --- a/src/datalog/parser/pull.cljc +++ b/src/datalog/parser/pull.cljc @@ -1,7 +1,7 @@ (ns datalog.parser.pull (:require [datalog.parser.impl.util :as util #?(:cljs :refer-macros :clj :refer) [raise forv]]) - (:refer-clojure :rename {pos? core-pos?})) + (:refer-clojure :rename {pos? core-pos?} #?@(:cljs (:exclude (pos?))))) #?(:clj (set! *warn-on-reflection* true))