mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-14 16:45:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add initial capacities, use u32s for indents/spaces.

Browse source
This commit is contained in:
Dimitris Fasarakis Hilliard 2023-01-29 20:20:07 +02:00
parent 838990ae15
commit 38cf933bcb
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
parser/src/lexer.rs
View file

@ -18,8 +18,8 @@ use unic_ucd_ident::{is_xid_continue, is_xid_start};
#[derive(Clone, Copy, PartialEq, Debug, Default)] #[derive(Clone, Copy, PartialEq, Debug, Default)]
struct IndentationLevel { struct IndentationLevel {
tabs: usize, tabs: u32,
spaces: usize, spaces: u32,
} }
impl IndentationLevel { impl IndentationLevel {
@ -225,7 +225,8 @@ where
at_begin_of_line: true, at_begin_of_line: true,
nesting: 0, nesting: 0,
indentations: Indentations::default(), indentations: Indentations::default(),
pending: Vec::new(), // Usually we have less than 5 tokens pending.
pending: Vec::with_capacity(5),
location: start, location: start,
window: CharWindow::new(input), window: CharWindow::new(input),
}; };
@ -257,13 +258,13 @@ where
}; };
let start_pos = self.get_pos(); let start_pos = self.get_pos();
let mut name = String::new(); let mut name = String::with_capacity(8);
while self.is_identifier_continuation() { while self.is_identifier_continuation() {
name.push(self.next_char().unwrap()); name.push(self.next_char().unwrap());
} }
let end_pos = self.get_pos(); let end_pos = self.get_pos();
if let Some(tok) = KEYWORDS.get(name.as_str()) { if let Some(tok) = KEYWORDS.get(&name) {
Ok((start_pos, tok.clone(), end_pos)) Ok((start_pos, tok.clone(), end_pos))
} else { } else {
Ok((start_pos, Tok::Name { name }, end_pos)) Ok((start_pos, Tok::Name { name }, end_pos))
@ -464,7 +465,7 @@ where
self.next_char(); self.next_char();
} }
let quote_char = self.next_char().unwrap(); let quote_char = self.next_char().unwrap();
let mut string_content = String::new(); let mut string_content = String::with_capacity(5);
// If the next two characters are also the quote character, then we have a triple-quoted // If the next two characters are also the quote character, then we have a triple-quoted
// string; consume those two characters and ensure that we require a triple-quote to close // string; consume those two characters and ensure that we require a triple-quote to close
@ -567,8 +568,8 @@ where
/// Given we are at the start of a line, count the number of spaces and/or tabs until the first character. /// Given we are at the start of a line, count the number of spaces and/or tabs until the first character.
fn eat_indentation(&mut self) -> Result<IndentationLevel, LexicalError> { fn eat_indentation(&mut self) -> Result<IndentationLevel, LexicalError> {
// Determine indentation: // Determine indentation:
let mut spaces: usize = 0; let mut spaces: u32 = 0;
let mut tabs: usize = 0; let mut tabs: u32 = 0;
loop { loop {
match self.window[0] { match self.window[0] {
Some(' ') => { Some(' ') => {
@ -1127,7 +1128,7 @@ where
fn eat_single_char(&mut self, ty: Tok) { fn eat_single_char(&mut self, ty: Tok) {
let tok_start = self.get_pos(); let tok_start = self.get_pos();
self.next_char().unwrap(); self.next_char();
let tok_end = self.get_pos(); let tok_end = self.get_pos();
self.emit((tok_start, ty, tok_end)); self.emit((tok_start, ty, tok_end));
} }