Skip to content

Commit 7fc3458

Browse files
committed
Small code cleanup.
1 parent e553bf3 commit 7fc3458

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
node_modules
77
out/
88
*.jar
9-
9+
.clj-kondo

src/mate/core.cljc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
(ns mate.core
22
#?(:cljs (:require-macros mate.core))
33
(:refer-clojure :exclude [group-by])
4-
(:require [clojure.core :as cc]))
4+
(:require [clojure.core :as cc])
5+
#?(:clj (:import (java.util.regex Matcher
6+
Pattern))))
57

68
(defmacro implies
79
"`(implies x y)` expands to `(or (not x) y)` while being more
@@ -41,23 +43,23 @@
4143
#?(:cljs
4244
(defn re-with-flags
4345
"Returns a new RegEx with additional flags."
44-
[^js re flags]
46+
[^js/RegExp re flags]
4547
(js/RegExp. (.-source re) (str (.-flags re) flags))))
4648

4749
#?(:clj
4850
(defn re-find-indexed
4951
"Same as re-find, but returns a pair `[index match]` when there is a match."
50-
([^java.util.regex.Matcher m]
52+
([^Matcher m]
5153
(when (.find m)
5254
(re-groups-indexed m)))
53-
([^java.util.regex.Pattern re s]
55+
([^Pattern re s]
5456
(let [m (re-matcher re s)]
5557
(re-find-indexed m))))
5658

5759
:cljs
5860
(defn re-find-indexed
5961
"Same as re-find, but returns a pair `[index match]` when there is a match."
60-
[^js re s]
62+
[^js/RegExp re s]
6163
(when-some [^array m (.exec re s)]
6264
(let [group-count (count m)]
6365
(if (== group-count 1)

src/mate/io.cljc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(ns mate.io
2+
#?(:cljs (:require-macros [mate.io]))
23
(:require [clojure.string :as str]
3-
#?(:clj [clojure.java.io :as io]))
4-
#?(:cljs (:require-macros [mate.io])))
4+
#?(:clj [clojure.java.io :as io])))
55

66
(defn- resource-path
77
"Returns the path of a resource.

0 commit comments

Comments
 (0)