Skip to content

Commit 1da38b9

Browse files
committed
Remove visit_elsif methods from all visitors
1 parent 99bd4a8 commit 1da38b9

File tree

4 files changed

+5
-54
lines changed

4 files changed

+5
-54
lines changed

lib/syntax_tree/translation/parser.rb

+5-34
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ def visit_aryptn(node)
238238
if !node.rest.value.nil?
239239
children << s(:match_rest, [visit(node.rest)], nil)
240240
elsif node.posts.empty? &&
241-
node.rest.location.start_char == node.rest.location.end_char
241+
node.rest.location.start_char == node.rest.location.end_char
242242
# Here we have an implicit rest, as in [foo,]. parser has a specific
243243
# type for these patterns.
244244
type = :array_pattern_with_tail
@@ -409,7 +409,8 @@ def visit_begin(node)
409409
if node.bodystmt.empty?
410410
s(:kwbegin, [], location)
411411
elsif node.bodystmt.rescue_clause.nil? &&
412-
node.bodystmt.ensure_clause.nil? && node.bodystmt.else_clause.nil?
412+
node.bodystmt.ensure_clause.nil? &&
413+
node.bodystmt.else_clause.nil?
413414
child = visit(node.bodystmt.statements)
414415

415416
s(:kwbegin, child.type == :begin ? child.children : [child], location)
@@ -993,37 +994,6 @@ def visit_else(node)
993994
end
994995
end
995996

996-
# Visit an Elsif node.
997-
def visit_elsif(node)
998-
else_token =
999-
case node.consequent
1000-
when Elsif
1001-
source_range_length(node.consequent.location.start_char, 5)
1002-
when Else
1003-
source_range_length(node.consequent.location.start_char, 4)
1004-
end
1005-
1006-
expression =
1007-
source_range(
1008-
node.location.start_char,
1009-
node.statements.location.end_char - 1
1010-
)
1011-
1012-
s(
1013-
:if,
1014-
[
1015-
visit(node.predicate),
1016-
visit(node.statements),
1017-
visit(node.consequent)
1018-
],
1019-
source_map_condition(
1020-
keyword: source_range_length(node.location.start_char, 5),
1021-
else_token: else_token,
1022-
expression: expression
1023-
)
1024-
)
1025-
end
1026-
1027997
# Visit an ENDBlock node.
1028998
def visit_END(node)
1029999
s(
@@ -1381,7 +1351,8 @@ def visit_if(node)
13811351

13821352
else_token =
13831353
case node.consequent
1384-
when Elsif
1354+
when IfNode
1355+
# The `IfNode` represents an `elsif` clause
13851356
source_range_length(node.consequent.location.start_char, 5)
13861357
when Else
13871358
source_range_length(node.consequent.location.start_char, 4)

lib/syntax_tree/visitor.rb

-3
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,6 @@ class Visitor < BasicVisitor
131131
# Visit an Else node.
132132
alias visit_else visit_child_nodes
133133

134-
# Visit an Elsif node.
135-
alias visit_elsif visit_child_nodes
136-
137134
# Visit an EmbDoc node.
138135
alias visit_embdoc visit_child_nodes
139136

lib/syntax_tree/visitor/field_visitor.rb

-9
Original file line numberDiff line numberDiff line change
@@ -352,15 +352,6 @@ def visit_else(node)
352352
end
353353
end
354354

355-
def visit_elsif(node)
356-
node(node, "elsif") do
357-
field("predicate", node.predicate)
358-
field("statements", node.statements)
359-
field("consequent", node.consequent) if node.consequent
360-
comments(node)
361-
end
362-
end
363-
364355
def visit_embdoc(node)
365356
node(node, "embdoc") { field("value", node.value) }
366357
end

lib/syntax_tree/visitor/mutation_visitor.rb

-8
Original file line numberDiff line numberDiff line change
@@ -322,14 +322,6 @@ def visit_else(node)
322322
)
323323
end
324324

325-
# Visit a Elsif node.
326-
def visit_elsif(node)
327-
node.copy(
328-
statements: visit(node.statements),
329-
consequent: visit(node.consequent)
330-
)
331-
end
332-
333325
# Visit a EmbDoc node.
334326
def visit_embdoc(node)
335327
node.copy

0 commit comments

Comments
 (0)