Skip to content

Commit 8513f07

Browse files
ShE3pyShE3py
committed
squash! Fix Parser::break_up_float fractional part's span
1 parent 27b59b3 commit 8513f07

File tree

3 files changed

+40
-37
lines changed

3 files changed

+40
-37
lines changed

‎compiler/rustc_parse/src/parser/expr.rs‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,38 +1081,34 @@ impl<'a> Parser<'a> {
10811081

10821082
match &*components {
10831083
// 1e2
1084-
[IdentLike(i)] => {
1085-
DestructuredFloat::Single(Symbol::intern(i), span)
1084+
[IdentLike(integral_part)] => {
1085+
DestructuredFloat::Single(Symbol::intern(integral_part), span)
10861086
}
10871087
// 1.
1088-
[IdentLike(i), Punct('.')] => {
1089-
let (ident_span, dot_span) = if can_take_span_apart() {
1090-
let (span, ident_len) = (span.data(), BytePos::from_usize(i.len()));
1091-
let ident_span = span.with_hi(span.lo + ident_len);
1092-
let dot_span = span.with_lo(span.lo + ident_len);
1093-
(ident_span, dot_span)
1088+
[IdentLike(integral_part), Punct('.')] => {
1089+
let (integral_span, dot_span) = if can_take_span_apart() {
1090+
let integral_span = span.with_hi(span.lo() + BytePos::from_usize(integral_part.len()));
1091+
let dot_span = span.with_lo(integral_span.hi());
1092+
(integral_span, dot_span)
10941093
} else {
10951094
(span, span)
10961095
};
1097-
let symbol = Symbol::intern(i);
1098-
DestructuredFloat::TrailingDot(symbol, ident_span, dot_span)
1096+
let integral_part = Symbol::intern(integral_part);
1097+
DestructuredFloat::TrailingDot(integral_part, integral_span, dot_span)
10991098
}
11001099
// 1.2 | 1.2e3
1101-
[IdentLike(i1), Punct('.'), IdentLike(i2)] => {
1102-
let (ident1_span, dot_span, ident2_span) = if can_take_span_apart() {
1103-
let (span, ident1_len) = (span.data(), BytePos::from_usize(i1.len()));
1104-
let ident1_span = span.with_hi(span.lo + ident1_len);
1105-
let dot_span = span
1106-
.with_lo(span.lo + ident1_len)
1107-
.with_hi(span.lo + ident1_len + BytePos(1));
1108-
let ident2_span = span.with_lo(span.lo + ident1_len + BytePos(1));
1109-
(ident1_span, dot_span, ident2_span)
1100+
[IdentLike(integral_part), Punct('.'), IdentLike(fractional_part)] => {
1101+
let (integral_span, dot_span, fractional_span) = if can_take_span_apart() {
1102+
let integral_span = span.with_hi(span.lo() + BytePos::from_usize(integral_part.len()));
1103+
let dot_span = span.with_lo(integral_span.hi()).with_hi(integral_span.hi() + BytePos(1));
1104+
let fractional_span = span.with_lo(dot_span.hi());
1105+
(integral_span, dot_span, fractional_span)
11101106
} else {
11111107
(span, span, span)
11121108
};
1113-
let symbol1 = Symbol::intern(i1);
1114-
let symbol2 = Symbol::intern(i2);
1115-
DestructuredFloat::MiddleDot(symbol1, ident1_span, dot_span, symbol2, ident2_span)
1109+
let integral_part = Symbol::intern(integral_part);
1110+
let fractional_part = Symbol::intern(fractional_part);
1111+
DestructuredFloat::MiddleDot(integral_part, integral_span, dot_span, fractional_part, fractional_span)
11161112
}
11171113
// 1e+ | 1e- (recovered)
11181114
[IdentLike(_), Punct('+' | '-')] |

‎tests/ui/offset-of/offset-of-tuple.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ fn nested() {
3131
offset_of!(((u8, u16), (u32, u16, u8)), 0.2); //~ ERROR no field `2`
3232
offset_of!(((u8, u16), (u32, u16, u8)), 1.2);
3333
offset_of!(((u8, u16), (u32, u16, u8)), 1.2.0); //~ ERROR no field `0`
34+
offset_of!(((u8, u16), (u32, u16, u8)), 0.1e2); //~ ERROR no field `1e2`
3435

3536
// All combinations of spaces (this sends different tokens to the parser)
3637
offset_of!(ComplexTup, 0.0.1.); //~ ERROR unexpected token: `)`

‎tests/ui/offset-of/offset-of-tuple.stderr‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,43 +29,43 @@ LL | { builtin # offset_of((u8, u8), 1 .) };
2929
| ^
3030

3131
error: unexpected token: `)`
32-
--> $DIR/offset-of-tuple.rs:47:45
32+
--> $DIR/offset-of-tuple.rs:48:45
3333
|
3434
LL | { builtin # offset_of(ComplexTup, 0.0.1.) };
3535
| ^
3636

3737
error: unexpected token: `)`
38-
--> $DIR/offset-of-tuple.rs:48:46
38+
--> $DIR/offset-of-tuple.rs:49:46
3939
|
4040
LL | { builtin # offset_of(ComplexTup, 0 .0.1.) };
4141
| ^
4242

4343
error: unexpected token: `)`
44-
--> $DIR/offset-of-tuple.rs:49:47
44+
--> $DIR/offset-of-tuple.rs:50:47
4545
|
4646
LL | { builtin # offset_of(ComplexTup, 0 . 0.1.) };
4747
| ^
4848

4949
error: unexpected token: `)`
50-
--> $DIR/offset-of-tuple.rs:50:46
50+
--> $DIR/offset-of-tuple.rs:51:46
5151
|
5252
LL | { builtin # offset_of(ComplexTup, 0. 0.1.) };
5353
| ^
5454

5555
error: unexpected token: `)`
56-
--> $DIR/offset-of-tuple.rs:51:46
56+
--> $DIR/offset-of-tuple.rs:52:46
5757
|
5858
LL | { builtin # offset_of(ComplexTup, 0.0 .1.) };
5959
| ^
6060

6161
error: unexpected token: `)`
62-
--> $DIR/offset-of-tuple.rs:52:47
62+
--> $DIR/offset-of-tuple.rs:53:47
6363
|
6464
LL | { builtin # offset_of(ComplexTup, 0.0 . 1.) };
6565
| ^
6666

6767
error: unexpected token: `)`
68-
--> $DIR/offset-of-tuple.rs:53:46
68+
--> $DIR/offset-of-tuple.rs:54:46
6969
|
7070
LL | { builtin # offset_of(ComplexTup, 0.0. 1.) };
7171
| ^
@@ -104,43 +104,43 @@ LL | offset_of!((u8, u8), 1 .);
104104
| ^
105105

106106
error: unexpected token: `)`
107-
--> $DIR/offset-of-tuple.rs:36:34
107+
--> $DIR/offset-of-tuple.rs:37:34
108108
|
109109
LL | offset_of!(ComplexTup, 0.0.1.);
110110
| ^
111111

112112
error: unexpected token: `)`
113-
--> $DIR/offset-of-tuple.rs:37:35
113+
--> $DIR/offset-of-tuple.rs:38:35
114114
|
115115
LL | offset_of!(ComplexTup, 0 .0.1.);
116116
| ^
117117

118118
error: unexpected token: `)`
119-
--> $DIR/offset-of-tuple.rs:38:36
119+
--> $DIR/offset-of-tuple.rs:39:36
120120
|
121121
LL | offset_of!(ComplexTup, 0 . 0.1.);
122122
| ^
123123

124124
error: unexpected token: `)`
125-
--> $DIR/offset-of-tuple.rs:39:35
125+
--> $DIR/offset-of-tuple.rs:40:35
126126
|
127127
LL | offset_of!(ComplexTup, 0. 0.1.);
128128
| ^
129129

130130
error: unexpected token: `)`
131-
--> $DIR/offset-of-tuple.rs:40:35
131+
--> $DIR/offset-of-tuple.rs:41:35
132132
|
133133
LL | offset_of!(ComplexTup, 0.0 .1.);
134134
| ^
135135

136136
error: unexpected token: `)`
137-
--> $DIR/offset-of-tuple.rs:41:36
137+
--> $DIR/offset-of-tuple.rs:42:36
138138
|
139139
LL | offset_of!(ComplexTup, 0.0 . 1.);
140140
| ^
141141

142142
error: unexpected token: `)`
143-
--> $DIR/offset-of-tuple.rs:42:35
143+
--> $DIR/offset-of-tuple.rs:43:35
144144
|
145145
LL | offset_of!(ComplexTup, 0.0. 1.);
146146
| ^
@@ -205,6 +205,12 @@ error[E0609]: no field `0` on type `u8`
205205
LL | offset_of!(((u8, u16), (u32, u16, u8)), 1.2.0);
206206
| ^
207207

208-
error: aborting due to 33 previous errors
208+
error[E0609]: no field `1e2` on type `(u8, u16)`
209+
--> $DIR/offset-of-tuple.rs:34:47
210+
|
211+
LL | offset_of!(((u8, u16), (u32, u16, u8)), 0.1e2);
212+
| ^^^
213+
214+
error: aborting due to 34 previous errors
209215

210216
For more information about this error, try `rustc --explain E0609`.

0 commit comments

Comments
 (0)