From 59560860d8e7f1e67b9b1ce6fea97b67c18df123 Mon Sep 17 00:00:00 2001
From: Tommi Reiman <tommi@iki.fi>
Date: Sun, 3 Mar 2019 20:19:27 +0200
Subject: [PATCH] Finalize Trie & cleanup

---
 modules/reitit-core/java-src/reitit/Trie.java |  5 ++---
 modules/reitit-core/src/reitit/trie.cljc      | 21 ++-----------------
 .../clj/reitit/opensensors_perf_test.clj      |  3 +--
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/modules/reitit-core/java-src/reitit/Trie.java b/modules/reitit-core/java-src/reitit/Trie.java
index adc220e5..83be7bb3 100644
--- a/modules/reitit-core/java-src/reitit/Trie.java
+++ b/modules/reitit-core/java-src/reitit/Trie.java
@@ -40,7 +40,7 @@ public class Trie {
 
   public static class Match {
     public IPersistentMap params;
-    public Object data;
+    public final Object data;
 
     public Match(IPersistentMap params, Object data) {
       this.params = params;
@@ -68,7 +68,7 @@ public class Trie {
     return new StaticMatcher(path, child);
   }
 
-  static class StaticMatcher implements Matcher {
+  static final class StaticMatcher implements Matcher {
     private final Matcher child;
     private final char[] path;
     private final int size;
@@ -238,7 +238,6 @@ public class Trie {
   }
 
   static final class LinearMatcher implements Matcher {
-
     private final Matcher[] childs;
     private final int size;
 
diff --git a/modules/reitit-core/src/reitit/trie.cljc b/modules/reitit-core/src/reitit/trie.cljc
index d4a6c3b6..9a440b35 100644
--- a/modules/reitit-core/src/reitit/trie.cljc
+++ b/modules/reitit-core/src/reitit/trie.cljc
@@ -68,7 +68,7 @@
                  (recur ss from (inc to))
                  (recur (concat ss (-static from to) (-wild to to')) (long to') (long to'))))
           \* (let [to' (count s)]
-               (recur (concat ss (-static from to) (-catch-all to to')) to' to'))
+               (recur (concat ss (-static from to) (-catch-all to to')) (long to') (long to')))
           (recur ss from (inc to)))))))
 
 (defn join-path [xs]
@@ -405,21 +405,4 @@
      ["/v1/orgs/:org-id/topics" 57]]
     (insert)
     (compile)
-    (pretty)
-    (./aprint))
-
-  (-> [["/{a}/2"]
-       ["/{a}.2"]]
-      (insert)
-      (compile))
-
-  (-> [["/kikka" 2]
-       ["/kikka/kakka/kukka" 3]
-       ["/kikka/:kakka/kurkku" 4]
-       ["/kikka/kuri/{user/doc}/html" 5]]
-      (insert)
-      (compile)
-      (pretty))
-
-  (map str (.toCharArray "\u2215\u0048\u0065\u006C\u006C\u006F"))
-  (count ["∕" "H" "e" "l" "l" "o" " " "W" "o" "r" "l" "d"]))
+    (pretty)))
diff --git a/perf-test/clj/reitit/opensensors_perf_test.clj b/perf-test/clj/reitit/opensensors_perf_test.clj
index 7a252918..df5eff17 100644
--- a/perf-test/clj/reitit/opensensors_perf_test.clj
+++ b/perf-test/clj/reitit/opensensors_perf_test.clj
@@ -15,8 +15,7 @@
             [io.pedestal.http.route.map-tree :as map-tree]
             [io.pedestal.http.route.router :as pedestal]
             [reitit.core :as r]
-            [criterium.core :as cc]
-            [reitit.trie :as trie]))
+            [criterium.core :as cc]))
 
 ;;
 ;; start repl with `lein perf repl`