From 671ddb5a2f69f856d34eeb62888d2ed70334d513 Mon Sep 17 00:00:00 2001 From: Kira Date: Sun, 21 Jul 2024 15:25:38 +0200 Subject: [PATCH] slightly better names --- crates/nu-parser/src/lex.rs | 8 +++----- crates/nu-parser/src/parser.rs | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/crates/nu-parser/src/lex.rs b/crates/nu-parser/src/lex.rs index d7b317310b..b7c8ccc118 100644 --- a/crates/nu-parser/src/lex.rs +++ b/crates/nu-parser/src/lex.rs @@ -458,8 +458,7 @@ pub fn lex_signature( ) } -// temporary name because i cant decide on a better one -pub fn lex_but_ignore_specials_after_special( +pub fn lex_alternating_special_tokens( input: &[u8], span_offset: usize, additional_whitespace: &[u8], @@ -505,7 +504,7 @@ fn lex_internal( in_signature: bool, // after lexing a special item, disable special items when lexing the next item. // necessary because colons are special in records, but datetime literals may contain colons - ignore_specials_after_special: bool, + alternate_specials: bool, ) -> (Vec, Option) { let mut specials_disabled = false; @@ -638,8 +637,7 @@ fn lex_internal( } else if c == b' ' || c == b'\t' || additional_whitespace.contains(&c) { // If the next character is non-newline whitespace, skip it. curr_offset += 1; - } else if ignore_specials_after_special && !specials_disabled && special_tokens.contains(&c) - { + } else if alternate_specials && !specials_disabled && special_tokens.contains(&c) { // If disabling special items but if they're not currently disabled, handle a special item // character right here, bypassing lex_item output.push(Token::new( diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs index 18c6367390..ca6dc7dffd 100644 --- a/crates/nu-parser/src/parser.rs +++ b/crates/nu-parser/src/parser.rs @@ -1,5 +1,5 @@ use crate::{ - lex::{is_assignment_operator, lex, lex_but_ignore_specials_after_special, lex_signature}, + lex::{is_assignment_operator, lex, lex_alternating_special_tokens, lex_signature}, lite_parser::{lite_parse, LiteCommand, LitePipeline, LiteRedirection, LiteRedirectionTarget}, parse_keywords::*, parse_patterns::parse_pattern, @@ -5602,7 +5602,7 @@ pub fn parse_record(working_set: &mut StateWorkingSet, span: Span) -> Expression let source = working_set.get_span_contents(inner_span); let (tokens, err) = - lex_but_ignore_specials_after_special(source, start, &[b'\n', b'\r', b','], &[b':'], true); + lex_alternating_special_tokens(source, start, &[b'\n', b'\r', b','], &[b':'], true); if let Some(err) = err { working_set.error(err); }