forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#71322 - petrochenkov:tuple00, r=nikomatsakis
Accept tuple.0.0 as tuple indexing (take 2) If we expect something identifier-like when parsing a field name after `.`, but encounter a float token, we break that float token into parts, similarly to how we break `&&` into `&` `&`, or `<<` into `<` `<`, etc. An alternative to rust-lang#70420.
- Loading branch information
Showing
13 changed files
with
614 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
struct S(u8, (u8, u8)); | ||
|
||
macro_rules! generate_field_accesses { | ||
($a:tt, $b:literal, $c:expr) => { | ||
let s = S(0, (0, 0)); | ||
|
||
s.$a; // OK | ||
{ s.$b; } //~ ERROR unexpected token: `1.1` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1` | ||
{ s.$c; } //~ ERROR unexpected token: `1.1` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1` | ||
}; | ||
} | ||
|
||
fn main() { | ||
generate_field_accesses!(1.1, 1.1, 1.1); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
error: unexpected token: `1.1` | ||
--> $DIR/float-field-interpolated.rs:8:13 | ||
| | ||
LL | { s.$b; } | ||
| ^^ | ||
... | ||
LL | generate_field_accesses!(1.1, 1.1, 1.1); | ||
| ---------------------------------------- in this macro invocation | ||
| | ||
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1` | ||
--> $DIR/float-field-interpolated.rs:8:13 | ||
| | ||
LL | { s.$b; } | ||
| ^^ expected one of `.`, `;`, `?`, `}`, or an operator | ||
... | ||
LL | generate_field_accesses!(1.1, 1.1, 1.1); | ||
| ---------------------------------------- in this macro invocation | ||
| | ||
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: unexpected token: `1.1` | ||
--> $DIR/float-field-interpolated.rs:10:13 | ||
| | ||
LL | { s.$c; } | ||
| ^^ | ||
... | ||
LL | generate_field_accesses!(1.1, 1.1, 1.1); | ||
| ---------------------------------------- in this macro invocation | ||
| | ||
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1` | ||
--> $DIR/float-field-interpolated.rs:10:13 | ||
| | ||
LL | { s.$c; } | ||
| ^^ expected one of `.`, `;`, `?`, `}`, or an operator | ||
... | ||
LL | generate_field_accesses!(1.1, 1.1, 1.1); | ||
| ---------------------------------------- in this macro invocation | ||
| | ||
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
error: aborting due to 4 previous errors | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
struct S(u8, (u8, u8)); | ||
|
||
fn main() { | ||
let s = S(0, (0, 0)); | ||
|
||
s.1e1; //~ ERROR no field `1e1` on type `S` | ||
s.1.; //~ ERROR unexpected token: `;` | ||
s.1.1; | ||
s.1.1e1; //~ ERROR no field `1e1` on type `(u8, u8)` | ||
{ s.1e+; } //~ ERROR unexpected token: `1e+` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1e+` | ||
//~| ERROR expected at least one digit in exponent | ||
{ s.1e-; } //~ ERROR unexpected token: `1e-` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1e-` | ||
//~| ERROR expected at least one digit in exponent | ||
{ s.1e+1; } //~ ERROR unexpected token: `1e+1` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1e+1` | ||
{ s.1e-1; } //~ ERROR unexpected token: `1e-1` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1e-1` | ||
{ s.1.1e+1; } //~ ERROR unexpected token: `1.1e+1` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1e+1` | ||
{ s.1.1e-1; } //~ ERROR unexpected token: `1.1e-1` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1e-1` | ||
s.0x1e1; //~ ERROR no field `0x1e1` on type `S` | ||
s.0x1.; //~ ERROR no field `0x1` on type `S` | ||
//~| ERROR hexadecimal float literal is not supported | ||
//~| ERROR unexpected token: `;` | ||
s.0x1.1; //~ ERROR no field `0x1` on type `S` | ||
//~| ERROR hexadecimal float literal is not supported | ||
s.0x1.1e1; //~ ERROR no field `0x1` on type `S` | ||
//~| ERROR hexadecimal float literal is not supported | ||
{ s.0x1e+; } //~ ERROR expected expression, found `;` | ||
{ s.0x1e-; } //~ ERROR expected expression, found `;` | ||
s.0x1e+1; //~ ERROR no field `0x1e` on type `S` | ||
s.0x1e-1; //~ ERROR no field `0x1e` on type `S` | ||
{ s.0x1.1e+1; } //~ ERROR unexpected token: `0x1.1e+1` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.1e+1` | ||
//~| ERROR hexadecimal float literal is not supported | ||
{ s.0x1.1e-1; } //~ ERROR unexpected token: `0x1.1e-1` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `0x1.1e-1` | ||
//~| ERROR hexadecimal float literal is not supported | ||
s.1e1f32; //~ ERROR no field `1e1` on type `S` | ||
//~| ERROR suffixes on a tuple index are invalid | ||
s.1.f32; //~ ERROR no field `f32` on type `(u8, u8)` | ||
s.1.1f32; //~ ERROR suffixes on a tuple index are invalid | ||
s.1.1e1f32; //~ ERROR no field `1e1` on type `(u8, u8)` | ||
//~| ERROR suffixes on a tuple index are invalid | ||
{ s.1e+f32; } //~ ERROR unexpected token: `1e+f32` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1e+f32` | ||
//~| ERROR expected at least one digit in exponent | ||
{ s.1e-f32; } //~ ERROR unexpected token: `1e-f32` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1e-f32` | ||
//~| ERROR expected at least one digit in exponent | ||
{ s.1e+1f32; } //~ ERROR unexpected token: `1e+1f32` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1e+1f32` | ||
{ s.1e-1f32; } //~ ERROR unexpected token: `1e-1f32` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1e-1f32` | ||
{ s.1.1e+1f32; } //~ ERROR unexpected token: `1.1e+1f32` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1e+1f32` | ||
{ s.1.1e-1f32; } //~ ERROR unexpected token: `1.1e-1f32` | ||
//~| ERROR expected one of `.`, `;`, `?`, `}`, or an operator, found `1.1e-1f32` | ||
} |
Oops, something went wrong.