diff options
| author | Karel Klic <kklic@redhat.com> | 2010-02-04 16:07:11 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2010-02-04 16:07:11 +0100 |
| commit | a4d4a5549684d4b454e4d1acdcaad89d230bb699 (patch) | |
| tree | 3415ab49cd20441f8934e4cff77470447d0b0c13 /src | |
| parent | 16139497c7884fa3304ad66c35a0570d6a20db7a (diff) | |
| download | abrt-a4d4a5549684d4b454e4d1acdcaad89d230bb699.tar.gz abrt-a4d4a5549684d4b454e4d1acdcaad89d230bb699.tar.xz abrt-a4d4a5549684d4b454e4d1acdcaad89d230bb699.zip | |
Removed 4 shift/reduce conflicts
Diffstat (limited to 'src')
| -rw-r--r-- | src/Backtrace/parser.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Backtrace/parser.y b/src/Backtrace/parser.y index 19032829..c87bfa9a 100644 --- a/src/Backtrace/parser.y +++ b/src/Backtrace/parser.y @@ -147,8 +147,8 @@ thread : keyword_thread wss digit_sequence wsa '(' keyword_thread wss digit_s } ; -frames : frame { $$ = $1; } - | frames wsa frame { $$ = frame_add_sibling($1, $3); } +frames : frame { $$ = $1; } + | frames frame { $$ = frame_add_sibling($1, $2); } ; frame : frame_head_1 wss variables %dprec 3 |