diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2023-10-31 15:23:45 +0100 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-16 19:13:15 +0100 |
| commit | 348f028fc2957d13e828030119938b8fccb00fc3 (patch) | |
| tree | f7f03d039aa260ecef8a09134f184b9d26f7c71b | |
| parent | 4bd9f1159ba054c9cacfd9a5cd0186c1791987d1 (diff) | |
| download | gcc-348f028fc2957d13e828030119938b8fccb00fc3.zip gcc-348f028fc2957d13e828030119938b8fccb00fc3.tar.gz gcc-348f028fc2957d13e828030119938b8fccb00fc3.tar.bz2 | |
gccrs: Fix float lexing and tuple index disambiguation
When a float has a floating point but no value after it, a zero was added
this lead to errors when trying to disambiguate a float into a tuple
index.
gcc/rust/ChangeLog:
* lex/rust-lex.cc (Lexer::parse_decimal_int_or_float): Remove
additional zero after empty floating point.
* parse/rust-parse-impl.h (Parser::left_denotation): Handle float with
empty floating point.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
| -rw-r--r-- | gcc/rust/lex/rust-lex.cc | 3 | ||||
| -rw-r--r-- | gcc/rust/parse/rust-parse-impl.h | 18 |
2 files changed, 12 insertions, 9 deletions
diff --git a/gcc/rust/lex/rust-lex.cc b/gcc/rust/lex/rust-lex.cc index b78565e..107dbad 100644 --- a/gcc/rust/lex/rust-lex.cc +++ b/gcc/rust/lex/rust-lex.cc @@ -2351,9 +2351,6 @@ Lexer::parse_decimal_int_or_float (location_t loc) current_char = peek_input (); length++; - // add a '0' after the . to prevent ambiguity - str += '0'; - // type hint not allowed current_column += length; diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index 0e50c9e..fd648c53 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -12892,12 +12892,18 @@ Parser<ManagedTokenSource>::left_denotation (const_TokenPtr tok, auto dot_pos = str.find ("."); auto prefix = str.substr (0, dot_pos); auto suffix = str.substr (dot_pos + 1); - lexer.split_current_token ( - {Token::make_int (current_loc, std::move (prefix), - CORETYPE_PURE_DECIMAL), - Token::make (DOT, current_loc + 1), - Token::make_int (current_loc + 2, std::move (suffix), - CORETYPE_PURE_DECIMAL)}); + if (dot_pos == str.size () - 1) + lexer.split_current_token ( + {Token::make_int (current_loc, std::move (prefix), + CORETYPE_PURE_DECIMAL), + Token::make (DOT, current_loc + 1)}); + else + lexer.split_current_token ( + {Token::make_int (current_loc, std::move (prefix), + CORETYPE_PURE_DECIMAL), + Token::make (DOT, current_loc + 1), + Token::make_int (current_loc + 2, std::move (suffix), + CORETYPE_PURE_DECIMAL)}); return parse_tuple_index_expr (tok, std::move (left), std::move (outer_attrs), restrictions); |