1 files changed, 34 insertions, 33 deletions

diff --git a/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb b/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
index da0cddd93c..990d2127ee 100644
--- a/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
+++ b/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
@@ -9,8 +9,8 @@ module ActionDispatch
         attr_reader :memos
 
         def initialize
-          @regexp_states = Hash.new { |h,k| h[k] = {} }
-          @string_states = Hash.new { |h,k| h[k] = {} }
+          @regexp_states = {}
+          @string_states = {}
           @accepting     = {}
           @memos         = Hash.new { |h,k| h[k] = [] }
         end
@@ -40,12 +40,22 @@ module ActionDispatch
         end
 
         def move(t, a)
-          move_string(t, a).concat(move_regexp(t, a))
-        end
+          return [] if t.empty?
+
+          regexps = []
 
-        def to_json
-          require 'json'
+          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)
           simple_regexp = Hash.new { |h,k| h[k] = {} }
 
           @regexp_states.each do |from, hash|
@@ -54,11 +64,11 @@ module ActionDispatch
             end
           end
 
-          JSON.dump({
+          {
             regexp_states: simple_regexp,
             string_states: @string_states,
             accepting:     @accepting
-          })
+          }
         end
 
         def to_svg
@@ -111,44 +121,35 @@ module ActionDispatch
         end
 
         def []=(from, to, sym)
-          case sym
-          when String
-            @string_states[from][sym] = to
-          when Regexp
-            @regexp_states[from][sym] = to
-          else
-            raise ArgumentError, 'unknown symbol: %s' % sym.class
-          end
+          to_mappings = states_hash_for(sym)[from] ||= {}
+          to_mappings[sym] = to
         end
 
         def states
-          ss = @string_states.keys + @string_states.values.map(&:values).flatten
-          rs = @regexp_states.keys + @regexp_states.values.map(&:values).flatten
+          ss = @string_states.keys + @string_states.values.flat_map(&:values)
+          rs = @regexp_states.keys + @regexp_states.values.flat_map(&:values)
           (ss + rs).uniq
         end
 
         def transitions
-          @string_states.map { |from, hash|
+          @string_states.flat_map { |from, hash|
             hash.map { |s, to| [from, s, to] }
-          }.flatten(1) + @regexp_states.map { |from, hash|
+          } + @regexp_states.flat_map { |from, hash|
             hash.map { |s, to| [from, s, to] }
-          }.flatten(1)
+          }
         end
 
         private
 
-          def move_regexp(t, a)
-            return [] if t.empty?
-
-            t.map { |s|
-              @regexp_states[s].map { |re, v| re === a ? v : nil }
-            }.flatten.compact.uniq
-          end
-
-          def move_string(t, a)
-            return [] if t.empty?
-
-            t.map { |s| @string_states[s][a] }.compact
+          def states_hash_for(sym)
+            case sym
+            when String
+              @string_states
+            when Regexp
+              @regexp_states
+            else
+              raise ArgumentError, 'unknown symbol: %s' % sym.class
+            end
           end
       end
     end