aboutsummaryrefslogtreecommitdiff
path: root/gdb/c-exp.y
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2020-06-11 10:34:31 -0600
committerTom Tromey <tom@tromey.com>2020-06-11 10:34:31 -0600
commit2b4e6a3f4b66284556254f548716c7b21b93524a (patch)
tree347344736ca24012aceb5c9c8bc4e0dd06e50dcd /gdb/c-exp.y
parent4412332f4b3a4ec570c378ff98ec671dd83a2959 (diff)
downloadgdb-2b4e6a3f4b66284556254f548716c7b21b93524a.zip
gdb-2b4e6a3f4b66284556254f548716c7b21b93524a.tar.gz
gdb-2b4e6a3f4b66284556254f548716c7b21b93524a.tar.bz2
Fix hex floating point lexing
PR gdb/18318 notes that gdb will sometimes incorrectly handle hex floating point input. This turns out to be a bug in the C lexer; the 'p' was not being correctly recognized, and so the exponent was not always passed to the floating point "from_string" method. Tested by the buildbot "Fedora-x86_64-m64" builder. gdb/ChangeLog 2020-06-11 Tom Tromey <tom@tromey.com> PR gdb/18318: * c-exp.y (lex_one_token): Handle 'p' like 'e'. gdb/testsuite/ChangeLog 2020-06-11 Tom Tromey <tom@tromey.com> PR gdb/18318: * gdb.base/printcmds.exp (test_float_accepted): Add more hex floating point tests.
Diffstat (limited to 'gdb/c-exp.y')
-rw-r--r--gdb/c-exp.y11
1 files changed, 7 insertions, 4 deletions
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index e7d0a0d..5ec84eb 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -2748,7 +2748,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
case '9':
{
/* It's a number. */
- int got_dot = 0, got_e = 0, toktype;
+ int got_dot = 0, got_e = 0, got_p = 0, toktype;
const char *p = tokstart;
int hex = input_radix > 10;
@@ -2768,13 +2768,16 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
/* This test includes !hex because 'e' is a valid hex digit
and thus does not indicate a floating point number when
the radix is hex. */
- if (!hex && !got_e && (*p == 'e' || *p == 'E'))
+ if (!hex && !got_e && !got_p && (*p == 'e' || *p == 'E'))
got_dot = got_e = 1;
+ else if (!got_e && !got_p && (*p == 'p' || *p == 'P'))
+ got_dot = got_p = 1;
/* This test does not include !hex, because a '.' always indicates
a decimal floating point number regardless of the radix. */
else if (!got_dot && *p == '.')
got_dot = 1;
- else if (got_e && (p[-1] == 'e' || p[-1] == 'E')
+ else if (((got_e && (p[-1] == 'e' || p[-1] == 'E'))
+ || (got_p && (p[-1] == 'p' || p[-1] == 'P')))
&& (*p == '-' || *p == '+'))
/* This is the sign of the exponent, not the end of the
number. */
@@ -2787,7 +2790,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name)
break;
}
toktype = parse_number (par_state, tokstart, p - tokstart,
- got_dot|got_e, &yylval);
+ got_dot | got_e | got_p, &yylval);
if (toktype == ERROR)
{
char *err_copy = (char *) alloca (p - tokstart + 1);