Skip to content

Commit f796146

Browse files
committed
Removing scientific notation for hexdecimal numbers
1 parent 83af066 commit f796146

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

core/src/tokenizer.rs

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,19 +1077,9 @@ impl<'a> Tokenizer<'a> {
10771077
while !self.is_eof() {
10781078
match self.read_byte() {
10791079
b'0'...b'9' => self.bump(),
1080-
b'a'...b'd' => self.bump(),
1081-
b'A'...b'D' => self.bump(),
1082-
b'f' | b'F' => self.bump(),
1083-
b'e' | b'E' => {
1084-
self.bump();
1085-
match self.peek_byte() {
1086-
b'-' | b'+' => {
1087-
return self.read_scientific(start);
1088-
},
1089-
_ => {}
1090-
}
1091-
},
1092-
_ => break
1080+
b'a'...b'f' => self.bump(),
1081+
b'A'...b'F' => self.bump(),
1082+
_ => break
10931083
};
10941084
}
10951085

@@ -1117,11 +1107,10 @@ impl<'a> Tokenizer<'a> {
11171107

11181108
#[inline]
11191109
fn read_scientific(&mut self, start: usize) -> Value {
1120-
while !self.is_eof() {
1121-
let ch = self.read_byte();
1122-
match ch {
1110+
if !self.is_eof() {
1111+
match self.read_byte() {
11231112
b'-' | b'+' => self.bump(),
1124-
_ => break
1113+
_ => {}
11251114
}
11261115
}
11271116

core/tests/tokenizer.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ fn test_scientifix_numbers() {
157157
assert_token!("2e+3", Literal(Value::Number("2e+3".into())), "Value::Number");
158158
assert_token!("0.2e3", Literal(Value::Number("0.2e3".into())), "Value::Number");
159159
assert_token!("0.2e-3", Literal(Value::Number("0.2e-3".into())), "Value::Number");
160-
assert_token!("0x1e3", Literal(Value::Number("0x1e3".into())), "Value::Number");
161-
assert_token!("0x21e3", Literal(Value::Number("0x21e3".into())), "Value::Number");
162-
assert_token!("0x21e-3", Literal(Value::Number("0x21e-3".into())), "Value::Number");
163160
}
164161

165162
#[test]

0 commit comments

Comments
 (0)