Merge branch 'rmc'

* rmc:
  push move_string in to `move`
  combine move_regexp and move_string so we only loop over states once
  do not create memo objects since we'll just throw them away
  only ask if `t` is empty once.

3 files changed, 24 insertions, 30 deletions

diff --git a/actionpack/lib/action_dispatch/journey/gtg/simulator.rb b/actionpack/lib/action_dispatch/journey/gtg/simulator.rb
index 254c2befc4..94b0a24344 100644
--- a/actionpack/lib/action_dispatch/journey/gtg/simulator.rb
+++ b/actionpack/lib/action_dispatch/journey/gtg/simulator.rb
@@ -19,6 +19,14 @@ module ActionDispatch
         end
 
         def simulate(string)
+          ms = memos(string) { return }
+          MatchData.new(ms)
+        end
+
+        alias :=~    :simulate
+        alias :match :simulate
+
+        def memos(string)
           input = StringScanner.new(string)
           state = [0]
           while sym = input.scan(%r([/.?]|[^/.?]+))
@@ -29,15 +37,10 @@ module ActionDispatch
             tt.accepting? s
           }
 
-          return if acceptance_states.empty?
+          return yield if acceptance_states.empty?
 
-          memos = acceptance_states.flat_map { |x| tt.memo(x) }.compact
-
-          MatchData.new(memos)
+          acceptance_states.flat_map { |x| tt.memo(x) }.compact
         end
-
-        alias :=~    :simulate
-        alias :match :simulate
       end
     end
   end
diff --git a/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb b/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
index e6212b1ee2..990d2127ee 100644
--- a/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
+++ b/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
@@ -40,7 +40,19 @@ module ActionDispatch
         end
 
         def move(t, a)
-          move_string(t, a).concat(move_regexp(t, a))
+          return [] if t.empty?
+
+          regexps = []
+
+          t.map { |s|
+            if states = @regexp_states[s]
+              regexps.concat states.map { |re, v| re === a ? v : nil }
+            end
+
+            if states = @string_states[s]
+              states[a]
+            end
+          }.compact.concat regexps
         end
 
         def as_json(options = nil)
@@ -139,26 +151,6 @@ module ActionDispatch
               raise ArgumentError, 'unknown symbol: %s' % sym.class
             end
           end
-
-          def move_regexp(t, a)
-            return [] if t.empty?
-
-            t.flat_map { |s|
-              if states = @regexp_states[s]
-                states.map { |re, v| re === a ? v : nil }
-              end
-            }.compact.uniq
-          end
-
-          def move_string(t, a)
-            return [] if t.empty?
-
-            t.map do |s|
-              if states = @string_states[s]
-                states[a]
-              end
-            end.compact
-          end
       end
     end
   end
diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb
index 419e665d12..36561c71a1 100644
--- a/actionpack/lib/action_dispatch/journey/router.rb
+++ b/actionpack/lib/action_dispatch/journey/router.rb
@@ -121,8 +121,7 @@ module ActionDispatch
 
         def filter_routes(path)
           return [] unless ast
-          data = simulator.match(path)
-          data ? data.memos : []
+          simulator.memos(path) { [] }
         end
 
         def find_routes env