Merge branch 'master' of github.com:rails/journey

* 'master' of github.com:rails/journey: Sort the alphabet so the order is consistent
ask4prasath · Dec 21, 2011 · 34d0dec · 34d0dec
2 parents e8553d5 + 8aa56f4
commit 34d0dec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/journey/nfa/transition_table.rb b/lib/journey/nfa/transition_table.rb
@@ -109,7 +109,7 @@ def move t, a
       end
 
       def alphabet
-        inverted.values.map(&:keys).flatten.compact.uniq
+        inverted.values.map(&:keys).flatten.compact.uniq.sort_by { |x| x.to_s }
       end
 
       ###

diff --git a/test/nfa/test_transition_table.rb b/test/nfa/test_transition_table.rb
@@ -53,7 +53,7 @@ def test_following_states_regexp
 
       def test_alphabet
         table  = tt 'a|:a'
-        assert_equal ['a', /[^\.\/\?]+/], table.alphabet
+        assert_equal [/[^\.\/\?]+/, 'a'], table.alphabet
 
         table  = tt 'a|a'
         assert_equal ['a'], table.alphabet