danog/parser
1
0
Fork 0
mirror of https://github.com/danog/parser.git synced 2024-11-26 20:04:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115 from edsrzf/float-e-sign

Browse Source
This commit is contained in:
Ryan Chandler 2022-09-23 20:40:18 +01:00 committed by GitHub
commit cea9e8a704
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
trunk_lexer/src/lexer.rs
View File

@ -956,7 +956,9 @@ impl Lexer {
// Remaining cases: decimal integer, legacy octal integer, or float.
let is_float = match self.peek_buf() {
[b'.', ..] | [b'e' | b'E', b'0'..=b'9', ..] => true,
[b'.', ..]
| [b'e' | b'E', b'-' | b'+', b'0'..=b'9', ..]
| [b'e' | b'E', b'0'..=b'9', ..] => true,
_ => false,
};
if !is_float {
@ -977,6 +979,10 @@ impl Lexer {
if let Some(b'e' | b'E') = self.current {
buffer.push('e');
self.next();
if let Some(b @ (b'-' | b'+')) = self.current {
buffer.push(b as char);
self.next();
}
self.read_digits(&mut buffer, 10);
}
@ -1640,21 +1646,29 @@ function hello_world() {
#[test]
fn floats() {
assert_tokens(
"<?php 200.5 .05 01.1 1. 1e1 3.1e2 1_1.2_2 3_3.2_2e1_1 18446744073709551615 0x10000000000000000 1e",
"<?php 200.5 .05 01.1 1. 1e1 1e+1 1e-1 3.1e2 1_1.2_2 3_3.2_2e1_1 18446744073709551615 0x10000000000000000 1e 1e+ 1e-",
&[
open!(),
TokenKind::Float(200.5),
TokenKind::Float(0.05),
TokenKind::Float(1.1),
TokenKind::Float(1.0),
TokenKind::Float(10.0),
TokenKind::Float(310.0),
TokenKind::Float(11.22),
TokenKind::Float(3322000000000.0),
TokenKind::Float(01.1),
TokenKind::Float(1.),
TokenKind::Float(1e1),
TokenKind::Float(1e+1),
TokenKind::Float(1e-1),
TokenKind::Float(3.1e2),
TokenKind::Float(1_1.2_2),
TokenKind::Float(3_3.2_2e1_1),
TokenKind::Float(18446744073709551615.0),
TokenKind::Float(18446744073709551616.0),
TokenKind::Int(1),
TokenKind::Identifier("e".into()),
TokenKind::Int(1),
TokenKind::Identifier("e".into()),
TokenKind::Plus,
TokenKind::Int(1),
TokenKind::Identifier("e".into()),
TokenKind::Minus,
],
);
}

2
trunk_parser/src/parser/mod.rs
View File

@ -286,7 +286,7 @@ impl Parser {
Statement::HaltCompiler { content }
}
_ => self.statement()?
_ => self.statement()?,
};
self.clear_comments();