Remove redundant nestings

babashka · Nov 11, 2024 · fd0cb73 · fd0cb73
1 parent 6d9380f
commit fd0cb73
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 37 deletions.
diff --git a/src/sci/impl/analyzer.cljc b/src/sci/impl/analyzer.cljc
@@ -918,7 +918,7 @@
                   exprs (next exprs)]
               (cond (and (seq? expr) (= 'catch (first expr)))
                     (recur exprs body-exprs (conj catch-exprs expr) finally-expr)
-                    (and (not exprs) (and (seq? expr) (= 'finally (first expr))))
+                    (and (not exprs) (seq? expr) (= 'finally (first expr)))
                     [body-exprs catch-exprs expr]
                     :else
                     ;; TODO: cannot add body expression when catch is not empty

diff --git a/src/sci/impl/deftype.cljc b/src/sci/impl/deftype.cljc
@@ -92,7 +92,7 @@
     (cons 'clojure.core/deftype (rest form))
     (let [factory-fn-str (str "->" record-name)
           factory-fn-sym (symbol factory-fn-str)
-          rec-type (symbol (str (munge (utils/current-ns-name)) "." (str record-name)))
+          rec-type (symbol (str (munge (utils/current-ns-name)) "." record-name))
           protocol-impls (utils/split-when symbol? raw-protocol-impls)
           field-set (set fields)
           protocol-impls

diff --git a/src/sci/impl/interop.cljc b/src/sci/impl/interop.cljc
@@ -114,9 +114,9 @@
                        sym))
                    (when (contains? class->opts sym)
                      sym)))
-        (or (get (:imports env) sym)
-            (let [cnn (utils/current-ns-name)]
-              (get-in env [:namespaces cnn :imports sym]))))))
+        (get (:imports env) sym)
+        (let [cnn (utils/current-ns-name)]
+          (get-in env [:namespaces cnn :imports sym])))))
 
 (defn resolve-class-opts [ctx sym]
   (let [env @(:env ctx)

diff --git a/src/sci/impl/records.cljc b/src/sci/impl/records.cljc
@@ -254,7 +254,7 @@
           constructor-fn-sym (symbol (str "__" factory-fn-str "__ctor__"))
           map-factory-sym (symbol (str "map" factory-fn-str))
           keys (mapv keyword fields)
-          rec-type (symbol (str (munge (utils/current-ns-name)) "." (str record-name)))
+          rec-type (symbol (str (munge (utils/current-ns-name)) "." record-name))
           protocol-impls (utils/split-when symbol? raw-protocol-impls)
           field-set (set fields)
           protocol-impls

diff --git a/src/sci/impl/resolve.cljc b/src/sci/impl/resolve.cljc
@@ -64,37 +64,37 @@
           (or (some-> env :namespaces (get 'clojure.core) (find sym-name))
               (when-let [v (when call? (get ana-macros sym-name))]
                 [sym v])))
-        (or (some-> env :namespaces (get sym-ns) (find sym-name))
-            (when-not only-var?
-              (when-let [clazz (interop/resolve-class ctx sym-ns)]
-                [sym (if (and call? #?(:clj (not (str/starts-with? sym-name-str "."))))
-                       (with-meta
-                         [clazz #?(:clj sym-name
-                                   :cljs (.split (str sym-name) "."))]
-                         #?(:clj
-                            (if (= "new" sym-name-str)
-                              {:sci.impl.analyzer/invoke-constructor true}
-                              {:sci.impl.analyzer/static-access true})
-                            :cljs
-                            {:sci.impl.analyzer/static-access true}))
-                       #?(:clj
-                          (with-meta
-                            [clazz sym-name]
-                            {:sci.impl.analyzer/interop true})
-                          :cljs
-                          (let [stack (assoc (meta sym)
-                                             :file @utils/current-file
-                                             :ns @utils/current-ns)
-                                path (.split (str sym-name) ".")
-                                len (alength path)]
-                            (if (== 1 len)
-                              (->Node
-                                (interop/get-static-field clazz sym-name)
-                                stack)
-                              (->Node
-                                (interop/get-static-fields clazz path)
-                                stack))
-                            )))]))))
+        (some-> env :namespaces (get sym-ns) (find sym-name))
+        (when-not only-var?
+          (when-let [clazz (interop/resolve-class ctx sym-ns)]
+            [sym (if (and call? #?(:clj (not (str/starts-with? sym-name-str "."))))
+                   (with-meta
+                     [clazz #?(:clj sym-name
+                               :cljs (.split (str sym-name) "."))]
+                     #?(:clj
+                        (if (= "new" sym-name-str)
+                          {:sci.impl.analyzer/invoke-constructor true}
+                          {:sci.impl.analyzer/static-access true})
+                        :cljs
+                        {:sci.impl.analyzer/static-access true}))
+                   #?(:clj
+                      (with-meta
+                        [clazz sym-name]
+                        {:sci.impl.analyzer/interop true})
+                      :cljs
+                      (let [stack (assoc (meta sym)
+                                         :file @utils/current-file
+                                         :ns @utils/current-ns)
+                            path (.split (str sym-name) ".")
+                            len (alength path)]
+                        (if (== 1 len)
+                          (->Node
+                           (interop/get-static-field clazz sym-name)
+                           stack)
+                          (->Node
+                           (interop/get-static-fields clazz path)
+                           stack))
+                        )))])))
        ;; no sym-ns
        (or
         ;; prioritize refers over vars in the current namespace, see 527