Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/lrama/parser.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions parser.y
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,12 @@ rule
IDENT_COLON named_ref? ":" rhs_list
{
result = val[3].map do |rhs|
if rhs.reject {|sym| sym.is_a?(Grammar::Node::RuleRhs::Action) || sym.is_a?(Grammar::Node::RuleRhs::Prec) }.count > 1
empties = rhs.select { |sym| sym.is_a?(Grammar::Node::RuleRhs::Empty) }
empties.each do |empty|
on_action_error("%empty on non-empty rule", empty)
end
end
Grammar::Node::Rule.new(
id: val[0],
alias_name: val[1],
Expand All @@ -458,12 +464,6 @@ rule
rhs_list:
rhs
{
if val[0].reject {|sym| sym.is_a?(Grammar::Node::RuleRhs::Action) || sym.is_a?(Grammar::Node::RuleRhs::Prec) }.count > 1
empties = val[0].select { |sym| sym.is_a?(Grammar::Node::RuleRhs::Empty) }
empties.each do |empty|
on_action_error("%empty on non-empty rule", empty)
end
end
result = [val[0]]
}
| rhs_list "|" rhs
Expand Down
25 changes: 25 additions & 0 deletions spec/lrama/parser_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4601,6 +4601,31 @@ class : keyword_class tSTRING keyword_end { code 1 }
ERROR
end
end

context "when %empty is misused in a later alternative" do
[
["A | B %empty", 13],
["A | %empty B", 11],
["A | %empty %empty", 11],
["A | A | B %empty", 17],
].each do |rhs, column|
it "rejects #{rhs}" do
y = <<~INPUT
%token A B
%%
start: #{rhs};
INPUT

parser = Lrama::Parser.new(y, "error_messages/parse.y")

expect { parser.parse }.to raise_error(ParseError, <<~ERROR)
error_messages/parse.y:3:#{column}: %empty on non-empty rule
3 | start: #{rhs};
| #{' ' * column}^~~~~~
ERROR
end
end
end
end
end

Expand Down
Loading