aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/journey/nfa/builder.rb
diff options
context:
space:
mode:
authorFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-12-20 15:42:39 -0500
committerFrancesco Rodriguez <lrodriguezsanc@gmail.com>2012-12-20 15:42:39 -0500
commiteb493f5ac84f2d65fbd1666e1496f0a8deafa27f (patch)
tree6c8226f652f99648a1898c2cfa33f9aa13041925 /actionpack/lib/action_dispatch/journey/nfa/builder.rb
parent42b555dcf3d3dfc8c4b56e6bf903389f014bf05e (diff)
downloadrails-eb493f5ac84f2d65fbd1666e1496f0a8deafa27f.tar.gz
rails-eb493f5ac84f2d65fbd1666e1496f0a8deafa27f.tar.bz2
rails-eb493f5ac84f2d65fbd1666e1496f0a8deafa27f.zip
update AD::Journey to follow Rails coding conventions
Diffstat (limited to 'actionpack/lib/action_dispatch/journey/nfa/builder.rb')
-rw-r--r--actionpack/lib/action_dispatch/journey/nfa/builder.rb34
1 files changed, 17 insertions, 17 deletions
diff --git a/actionpack/lib/action_dispatch/journey/nfa/builder.rb b/actionpack/lib/action_dispatch/journey/nfa/builder.rb
index 8ba48e097d..ee6494c3e4 100644
--- a/actionpack/lib/action_dispatch/journey/nfa/builder.rb
+++ b/actionpack/lib/action_dispatch/journey/nfa/builder.rb
@@ -5,23 +5,23 @@ module ActionDispatch
module Journey # :nodoc:
module NFA # :nodoc:
class Visitor < Visitors::Visitor # :nodoc:
- def initialize tt
+ def initialize(tt)
@tt = tt
@i = -1
end
- def visit_CAT node
- left = visit node.left
- right = visit node.right
+ def visit_CAT(node)
+ left = visit(node.left)
+ right = visit(node.right)
- @tt.merge left.last, right.first
+ @tt.merge(left.last, right.first)
[left.first, right.last]
end
- def visit_GROUP node
+ def visit_GROUP(node)
from = @i += 1
- left = visit node.left
+ left = visit(node.left)
to = @i += 1
@tt.accepting = to
@@ -33,14 +33,14 @@ module ActionDispatch
[from, to]
end
- def visit_OR node
- from = @i += 1
- children = node.children.map { |c| visit c }
- to = @i += 1
+ def visit_OR(node)
+ from = @i += 1
+ children = node.children.map { |c| visit(c) }
+ to = @i += 1
children.each do |child|
- @tt[from, child.first] = nil
- @tt[child.last, to] = nil
+ @tt[from, child.first] = nil
+ @tt[child.last, to] = nil
end
@tt.accepting = to
@@ -48,26 +48,26 @@ module ActionDispatch
[from, to]
end
- def terminal node
+ def terminal(node)
from_i = @i += 1 # new state
to_i = @i += 1 # new state
@tt[from_i, to_i] = node
@tt.accepting = to_i
- @tt.add_memo to_i, node.memo
+ @tt.add_memo(to_i, node.memo)
[from_i, to_i]
end
end
class Builder # :nodoc:
- def initialize ast
+ def initialize(ast)
@ast = ast
end
def transition_table
tt = TransitionTable.new
- Visitor.new(tt).accept @ast
+ Visitor.new(tt).accept(@ast)
tt
end
end