From c885d01dd06b0119ab0f784e64e72ce3f94d6882 Mon Sep 17 00:00:00 2001
From: Karel Klic <kklic@redhat.com>
Date: Wed, 25 Nov 2009 17:08:27 +0100
Subject: More backtrace cases handled

---
 src/Backtrace/parser.y | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/Backtrace')

diff --git a/src/Backtrace/parser.y b/src/Backtrace/parser.y
index ae068a1..b2dade6 100644
--- a/src/Backtrace/parser.y
+++ b/src/Backtrace/parser.y
@@ -227,7 +227,7 @@ variables_line : variables_char_no_framestart
 variables_char : '#' | variables_char_no_framestart
 ;
 
-/* Manually synchronized with function_args_char. */
+/* Manually synchronized with function_args_char, except the first line. */
 variables_char_no_framestart : digit | nondigit | '"' | '(' | ')'
                              | '+' | '-' | '<' | '>' | '/' | '.' 
                              | '[' | ']' | '?' | '\'' | '`' | ',' 
@@ -258,12 +258,14 @@ function_args_sequence : function_args_char
                        | function_args_sequence wsa function_args_string
 ;
 
-function_args_string : '"' function_args_string_sequence '"'
-                     | '"' '"'
+function_args_string : '"' wsa function_args_string_sequence wsa '"'
+                     | '"' wsa '"'
 ;
 
-/* Manually synchronized with variables_char_no_framestart. */
-function_args_char : digit | nondigit 
+/* Manually synchronized with variables_char_no_framestart,
+ * except the first line. 
+ */
+function_args_char : digit | nondigit | '#'
                    | '+' | '-' | '<' | '>' | '/' | '.' 
                    | '[' | ']' | '?' | '\'' | '`' | ',' 
                    | '=' | '{' | '}' | '^' | '&' | '$'
-- 
cgit