Skip to content

Commit

Permalink
[Fixes ruby#137] Improve reporting
Browse files Browse the repository at this point in the history
  • Loading branch information
marcandre authored and hsbt committed Sep 28, 2020
1 parent 3da3c27 commit 97d1a38
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 25 deletions.
34 changes: 18 additions & 16 deletions lib/racc/grammar.rb
Original file line number Diff line number Diff line change
Expand Up @@ -86,29 +86,31 @@ def useless_nonterminal_exist?
end

def n_useless_nonterminals
@n_useless_nonterminals ||=
begin
n = 0
@symboltable.each_nonterminal do |sym|
n += 1 if sym.useless?
end
n
end
@n_useless_nonterminals ||= each_useless_nonterminal.count
end

def each_useless_nonterminal
return to_enum __method__ unless block_given?

@symboltable.each_nonterminal do |sym|
yield sym if sym.useless?
end
end

def useless_rule_exist?
n_useless_rules() != 0
end

def n_useless_rules
@n_useless_rules ||=
begin
n = 0
each do |r|
n += 1 if r.useless?
end
n
end
@n_useless_rules ||= each_useless_rule.count
end

def each_useless_rule
return to_enum __method__ unless block_given?

each do |r|
yield r if r.useless?
end
end

def nfa
Expand Down
39 changes: 30 additions & 9 deletions libexec/racc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
#
# $Id$
#
#
# Copyright (c) 1999-2006 Minero Aoki
#
Expand Down Expand Up @@ -184,8 +184,12 @@ def main
log_useless states.grammar
log_conflict states
else
report_useless states.grammar
report_conflict states
has_useless = report_useless states.grammar
has_conflicts = report_conflict states
if has_useless || has_conflicts
preamble = make_logfile ? 'C' : 'Turn on logging with "-v" and c'
$stderr.puts %Q{#{preamble}heck ".output" file for details}
end
end

profiler.report
Expand All @@ -201,13 +205,29 @@ def make_filename(path, suffix)
path.sub(/(?:\..*?)?\z/, suffix)
end

LIST_LIMIT = 10
def report_list(enum, label)
c = enum.count
if c > 0
$stderr.puts "#{c} #{label}:"
enum.first(LIST_LIMIT).each do |item|
$stderr.puts " #{yield item}"
end
$stderr.puts " ..." if c > LIST_LIMIT
end
end

# @return [Boolean] if anything was reported
def report_conflict(states)
if states.should_report_srconflict?
reported = true
$stderr.puts "#{states.n_srconflicts} shift/reduce conflicts"
end
if states.rrconflict_exist?
reported = true
$stderr.puts "#{states.n_rrconflicts} reduce/reduce conflicts"
end
reported
end

def log_conflict(states)
Expand All @@ -222,16 +242,17 @@ def log_conflict(states)
}
end

# @return [Boolean] if anything was reported
def report_useless(grammar)
if grammar.useless_nonterminal_exist?
$stderr.puts "#{grammar.n_useless_nonterminals} useless nonterminals"
end
if grammar.useless_rule_exist?
$stderr.puts "#{grammar.n_useless_rules} useless rules"
end
reported = report_list(grammar.each_useless_nonterminal, 'useless nonterminals', &:to_s)

reported ||= report_list(grammar.each_useless_rule, 'useless rules') { |r| "##{r.ident} (#{r.target})" }

if grammar.start.useless?
$stderr.puts 'fatal: start symbol does not derive any sentence'
reported = true
end
reported
end

def log_useless(grammar)
Expand Down
14 changes: 14 additions & 0 deletions test/racc/assets/ifelse.y
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
class C::Parser
token tSOMETHING
rule
statement
: tSOMETHING
| 'if' statement 'then' statement
| 'if' statement 'then' statement 'else' statement
;

dummy
: tSOMETHING '+' tSOMETHING
| tSOMETHING '-' tSOMETHING
;

15 changes: 15 additions & 0 deletions test/racc/test_racc_command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -318,5 +318,20 @@ def test_tp_plus
assert_debugfile 'tp_plus.y', [21, 0, 0, 0]
assert_output_unchanged 'tp_plus.y'
end

def test_ifelse
stderr = nil
racc "-o#{@TAB_DIR}/ifelse", "#{ASSET_DIR}/ifelse.y", stdout_filter: ->(s) { stderr = s }
stderr = stderr.lines[1..-1].join if RUBY_PLATFORM.match? /java/
assert_equal(<<~STDERR, stderr)
1 useless nonterminals:
dummy
2 useless rules:
#4 (dummy)
#5 (dummy)
1 shift/reduce conflicts
Turn on logging with "-v" and check ".output" file for details
STDERR
end
end
end

0 comments on commit 97d1a38

Please sign in to comment.