kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

add a null node at the top of the stack

Browse source 
this gives us an easier way to iterate the stack
This commit is contained in:
Aaron Patterson 2015-08-10 12:35:57 -07:00
parent 53454bfcb6
commit 8e014f28cc
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
actionpack/lib/action_dispatch/routing/mapper.rb
View file

@ -1702,9 +1702,9 @@ module ActionDispatch
end
def shallow_nesting_depth #:nodoc:
@scope.find_all { |frame|
frame[:scope_level_resource]
}.count { |frame| frame[:scope_level_resource].shallow? }
@scope.find_all { |node|
node.frame[:scope_level_resource]
}.count { |node| node.frame[:scope_level_resource].shallow? }
end
def param_constraint? #:nodoc:
@ -1974,16 +1974,14 @@ module ActionDispatch
self.class.new hash, self, scope_level
end
EMPTY_HASH = {}.freeze
def new_level(level)
self.class.new(self, self, level)
end
def fetch(key, &block)
@hash.fetch(key, &block)
self.class.new(EMPTY_HASH, self, level)
end
def [](key)
@hash.fetch(key) { @parent[key] }
scope = find { |node| node.frame.key? key }
scope && scope.frame[key]
end
include Enumerable
@ -1992,16 +1990,14 @@ module ActionDispatch
node = self
loop do
break if node.equal? NULL
yield node.frame
yield node
node = node.parent
end
end
protected
def frame; @hash; end
NULL = Scope.new({}.freeze, {}.freeze)
NULL = Scope.new(nil, nil)
end
def initialize(set) #:nodoc: