diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-04 19:23:22 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-04 19:23:22 +0100 |
| commit | f9d98f594a2b5103f0e88bf33191ad164a77c239 (patch) | |
| tree | 59edafbb544aef35be63dadf09e6e448e27afc6d /src/Backtrace/parser.y | |
| parent | b634e1a482f6871bb4e128f3bc23456f09f85547 (diff) | |
| parent | baacc3cadfd08293e6f46bd84ab322d0cb67bf10 (diff) | |
Merge branch 'master' into rhel6
Diffstat (limited to 'src/Backtrace/parser.y')
| -rw-r--r-- | src/Backtrace/parser.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Backtrace/parser.y b/src/Backtrace/parser.y index 1903282..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 @@ -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 |