summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/prism/desugar_compiler.rb2
-rw-r--r--lib/prism/translation/parser/compiler.rb36
-rw-r--r--lib/prism/translation/ripper.rb28
-rw-r--r--lib/prism/translation/ruby_parser.rb10
4 files changed, 38 insertions, 38 deletions
diff --git a/lib/prism/desugar_compiler.rb b/lib/prism/desugar_compiler.rb
index c51bdd2b1c..e3b15fc3b0 100644
--- a/lib/prism/desugar_compiler.rb
+++ b/lib/prism/desugar_compiler.rb
@@ -60,7 +60,7 @@ module Prism
location: node.location,
body: [public_send(read_class, location: node.name_loc, **arguments)]
),
- consequent: else_node(
+ subsequent: else_node(
location: node.location,
else_keyword_loc: node.operator_loc,
statements: statements_node(
diff --git a/lib/prism/translation/parser/compiler.rb b/lib/prism/translation/parser/compiler.rb
index 48f3d4db5c..d57b5757d7 100644
--- a/lib/prism/translation/parser/compiler.rb
+++ b/lib/prism/translation/parser/compiler.rb
@@ -181,7 +181,7 @@ module Prism
if (rescue_clause = node.rescue_clause)
begin
find_start_offset = (rescue_clause.reference&.location || rescue_clause.exceptions.last&.location || rescue_clause.keyword_loc).end_offset
- find_end_offset = (rescue_clause.statements&.location&.start_offset || rescue_clause.consequent&.location&.start_offset || (find_start_offset + 1))
+ find_end_offset = (rescue_clause.statements&.location&.start_offset || rescue_clause.subsequent&.location&.start_offset || (find_start_offset + 1))
rescue_bodies << builder.rescue_body(
token(rescue_clause.keyword_loc),
@@ -191,7 +191,7 @@ module Prism
srange_find(find_start_offset, find_end_offset, [";"]),
visit(rescue_clause.statements)
)
- end until (rescue_clause = rescue_clause.consequent).nil?
+ end until (rescue_clause = rescue_clause.subsequent).nil?
end
begin_body =
@@ -410,8 +410,8 @@ module Prism
token(node.case_keyword_loc),
visit(node.predicate),
visit_all(node.conditions),
- token(node.consequent&.else_keyword_loc),
- visit(node.consequent),
+ token(node.else_clause&.else_keyword_loc),
+ visit(node.else_clause),
token(node.end_keyword_loc)
)
end
@@ -423,8 +423,8 @@ module Prism
token(node.case_keyword_loc),
visit(node.predicate),
visit_all(node.conditions),
- token(node.consequent&.else_keyword_loc),
- visit(node.consequent),
+ token(node.else_clause&.else_keyword_loc),
+ visit(node.else_clause),
token(node.end_keyword_loc)
)
end
@@ -858,8 +858,8 @@ module Prism
visit(node.predicate),
token(node.then_keyword_loc),
visit(node.statements),
- token(node.consequent.else_keyword_loc),
- visit(node.consequent)
+ token(node.subsequent.else_keyword_loc),
+ visit(node.subsequent)
)
elsif node.if_keyword_loc.start_offset == node.location.start_offset
builder.condition(
@@ -868,16 +868,16 @@ module Prism
if node.then_keyword_loc
token(node.then_keyword_loc)
else
- srange_find(node.predicate.location.end_offset, (node.statements&.location || node.consequent&.location || node.end_keyword_loc).start_offset, [";"])
+ srange_find(node.predicate.location.end_offset, (node.statements&.location || node.subsequent&.location || node.end_keyword_loc).start_offset, [";"])
end,
visit(node.statements),
- case node.consequent
+ case node.subsequent
when IfNode
- token(node.consequent.if_keyword_loc)
+ token(node.subsequent.if_keyword_loc)
when ElseNode
- token(node.consequent.else_keyword_loc)
+ token(node.subsequent.else_keyword_loc)
end,
- visit(node.consequent),
+ visit(node.subsequent),
if node.if_keyword != "elsif"
token(node.end_keyword_loc)
end
@@ -885,7 +885,7 @@ module Prism
else
builder.condition_mod(
visit(node.statements),
- visit(node.consequent),
+ visit(node.subsequent),
token(node.if_keyword_loc),
visit(node.predicate)
)
@@ -1784,16 +1784,16 @@ module Prism
if node.then_keyword_loc
token(node.then_keyword_loc)
else
- srange_find(node.predicate.location.end_offset, (node.statements&.location || node.consequent&.location || node.end_keyword_loc).start_offset, [";"])
+ srange_find(node.predicate.location.end_offset, (node.statements&.location || node.else_clause&.location || node.end_keyword_loc).start_offset, [";"])
end,
- visit(node.consequent),
- token(node.consequent&.else_keyword_loc),
+ visit(node.else_clause),
+ token(node.else_clause&.else_keyword_loc),
visit(node.statements),
token(node.end_keyword_loc)
)
else
builder.condition_mod(
- visit(node.consequent),
+ visit(node.else_clause),
visit(node.statements),
token(node.keyword_loc),
visit(node.predicate)
diff --git a/lib/prism/translation/ripper.rb b/lib/prism/translation/ripper.rb
index 79ba0e7ab3..cafe8c3f63 100644
--- a/lib/prism/translation/ripper.rb
+++ b/lib/prism/translation/ripper.rb
@@ -1273,8 +1273,8 @@ module Prism
def visit_case_node(node)
predicate = visit(node.predicate)
clauses =
- node.conditions.reverse_each.inject(visit(node.consequent)) do |consequent, condition|
- on_when(*visit(condition), consequent)
+ node.conditions.reverse_each.inject(visit(node.else_clause)) do |current, condition|
+ on_when(*visit(condition), current)
end
bounds(node.location)
@@ -1286,8 +1286,8 @@ module Prism
def visit_case_match_node(node)
predicate = visit(node.predicate)
clauses =
- node.conditions.reverse_each.inject(visit(node.consequent)) do |consequent, condition|
- on_in(*visit(condition), consequent)
+ node.conditions.reverse_each.inject(visit(node.else_clause)) do |current, condition|
+ on_in(*visit(condition), current)
end
bounds(node.location)
@@ -1908,7 +1908,7 @@ module Prism
if node.then_keyword == "?"
predicate = visit(node.predicate)
truthy = visit(node.statements.body.first)
- falsy = visit(node.consequent.statements.body.first)
+ falsy = visit(node.subsequent.statements.body.first)
bounds(node.location)
on_ifop(predicate, truthy, falsy)
@@ -1921,13 +1921,13 @@ module Prism
else
visit(node.statements)
end
- consequent = visit(node.consequent)
+ subsequent = visit(node.subsequent)
bounds(node.location)
if node.if_keyword == "if"
- on_if(predicate, statements, consequent)
+ on_if(predicate, statements, subsequent)
else
- on_elsif(predicate, statements, consequent)
+ on_elsif(predicate, statements, subsequent)
end
else
statements = visit(node.statements.body.first)
@@ -1960,7 +1960,7 @@ module Prism
# ^^^^^^^^^^^^^^^^^^^^^
def visit_in_node(node)
# This is a special case where we're not going to call on_in directly
- # because we don't have access to the consequent. Instead, we'll return
+ # because we don't have access to the subsequent. Instead, we'll return
# the component parts and let the parent node handle it.
pattern = visit_pattern_node(node.pattern)
statements =
@@ -2808,10 +2808,10 @@ module Prism
visit(node.statements)
end
- consequent = visit(node.consequent)
+ subsequent = visit(node.subsequent)
bounds(node.location)
- on_rescue(exceptions, reference, statements, consequent)
+ on_rescue(exceptions, reference, statements, subsequent)
end
# def foo(*bar); end
@@ -3132,10 +3132,10 @@ module Prism
else
visit(node.statements)
end
- consequent = visit(node.consequent)
+ else_clause = visit(node.else_clause)
bounds(node.location)
- on_unless(predicate, statements, consequent)
+ on_unless(predicate, statements, else_clause)
else
statements = visit(node.statements.body.first)
predicate = visit(node.predicate)
@@ -3176,7 +3176,7 @@ module Prism
# ^^^^^^^^^^^^^
def visit_when_node(node)
# This is a special case where we're not going to call on_when directly
- # because we don't have access to the consequent. Instead, we'll return
+ # because we don't have access to the subsequent. Instead, we'll return
# the component parts and let the parent node handle it.
conditions = visit_arguments(node.conditions)
statements =
diff --git a/lib/prism/translation/ruby_parser.rb b/lib/prism/translation/ruby_parser.rb
index 45b9c4690b..9cd39075ec 100644
--- a/lib/prism/translation/ruby_parser.rb
+++ b/lib/prism/translation/ruby_parser.rb
@@ -147,7 +147,7 @@ module Prism
end
current = node.rescue_clause
- until (current = current.consequent).nil?
+ until (current = current.subsequent).nil?
result << visit(current)
end
end
@@ -347,13 +347,13 @@ module Prism
# case foo; when bar; end
# ^^^^^^^^^^^^^^^^^^^^^^^
def visit_case_node(node)
- s(node, :case, visit(node.predicate)).concat(visit_all(node.conditions)) << visit(node.consequent)
+ s(node, :case, visit(node.predicate)).concat(visit_all(node.conditions)) << visit(node.else_clause)
end
# case foo; in bar; end
# ^^^^^^^^^^^^^^^^^^^^^
def visit_case_match_node(node)
- s(node, :case, visit(node.predicate)).concat(visit_all(node.conditions)) << visit(node.consequent)
+ s(node, :case, visit(node.predicate)).concat(visit_all(node.conditions)) << visit(node.else_clause)
end
# class Foo; end
@@ -700,7 +700,7 @@ module Prism
# foo ? bar : baz
# ^^^^^^^^^^^^^^^
def visit_if_node(node)
- s(node, :if, visit(node.predicate), visit(node.statements), visit(node.consequent))
+ s(node, :if, visit(node.predicate), visit(node.statements), visit(node.subsequent))
end
# 1i
@@ -1470,7 +1470,7 @@ module Prism
# bar unless foo
# ^^^^^^^^^^^^^^
def visit_unless_node(node)
- s(node, :if, visit(node.predicate), visit(node.consequent), visit(node.statements))
+ s(node, :if, visit(node.predicate), visit(node.else_clause), visit(node.statements))
end
# until foo; bar end
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-22 18:36:40 +0000