[PATCH Bug breakpoints/14381] Fix linespec to parse file name that begin with decimal numbers

Hui Zhu
2012-07-22T06:30:57Z

Hi,

This issue is because function linespec_lexer_lex_one handle the
string that begin with decimal numbers decimal numbers directly and
use linespec_lexer_lex_number handle it directly.
So when there are a file name that begin with decimal numbers, will a
lot of error around it.

I post a patch make linespec_lexer_lex_number if number followed by
non-space string, use linespec_lexer_lex_string handle linespec as a
string.

Joel, this issue affect 7.5. Does this patch can add to 7.5 branch?

Thanks,
Hui

2012-07-22 Hui Zhu <hui_zhu@mentor.com>

* linespec.c (linespec_lexer_lex_number): Call
linespec_lexer_lex_string if the number is followed by
non-space string.

---
linespec.c | 8 ++++++++
1 file changed, 8 insertions(+)

--- a/linespec.c
+++ b/linespec.c
@@ -368,6 +368,8 @@ static const char *const linespec_quote_
/* Lex a number from the input in PARSER. This only supports
decimal numbers. */

+static linespec_token linespec_lexer_lex_string (linespec_parser *parser);
+
static linespec_token
linespec_lexer_lex_number (linespec_parser *parser)
{
@@ -390,6 +392,12 @@ linespec_lexer_lex_number (linespec_pars
++(PARSER_STREAM (parser));
}

+ if (*PARSER_STREAM (parser) != '\0' && !isspace(*PARSER_STREAM (parser)))
+ {
+ PARSER_STREAM (parser) = LS_TOKEN_STOKEN (token).ptr;
+ return linespec_lexer_lex_string (parser);
+ }
+
return token;
}