From 0308401fb1399186d22722364e262353dcd9d129 Mon Sep 17 00:00:00 2001 From: Karel Klic Date: Thu, 4 Feb 2010 16:31:50 +0100 Subject: Removed 5 shift/reduce conflicts --- src/Backtrace/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Backtrace') diff --git a/src/Backtrace/parser.y b/src/Backtrace/parser.y index c87bfa9..42ac220 100644 --- a/src/Backtrace/parser.y +++ b/src/Backtrace/parser.y @@ -129,7 +129,7 @@ backtrace : /* empty */ %dprec 1 ; threads : thread - | threads wsa thread { $$ = thread_add_sibling($1, $3); } + | threads '\n' thread { $$ = thread_add_sibling($1, $3); } ; thread : keyword_thread wss digit_sequence wsa '(' keyword_thread wss digit_sequence wsa ')' ':' wsa frames -- cgit