holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix access to columns with quoted names (#1662)

Browse Source
This commit is contained in:
Jonathan Turner
2020-04-26 18:01:55 +12:00
committed by GitHub
parent ad7a3fd908
commit df90d9e4b6
2 changed files with 16 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
crates/nu-parser/src/lite_parse.rs
View File

@ -104,45 +104,6 @@ fn bare(src: &mut Input, span_offset: usize) -> Result<Spanned<String>, ParseErr
Ok(bare.spanned(span))
}
fn quoted(
src: &mut Input,
delimiter: char,
span_offset: usize,
) -> Result<Spanned<String>, ParseError> {
skip_whitespace(src);
let mut quoted_string = String::new();
let start_offset = if let Some((pos, _)) = src.peek() {
*pos
} else {
0
};
let _ = src.next();
let mut found_end = false;
for (_, c) in src {
if c != delimiter {
quoted_string.push(c);
} else {
found_end = true;
break;
}
}
quoted_string.insert(0, delimiter);
if found_end {
quoted_string.push(delimiter);
}
let span = Span::new(
start_offset + span_offset,
start_offset + span_offset + quoted_string.len(),
);
Ok(quoted_string.spanned(span))
}
fn command(src: &mut Input, span_offset: usize) -> Result<LiteCommand, ParseError> {
let command = bare(src, span_offset)?;
if command.item.is_empty() {
@ -193,12 +154,12 @@ fn pipeline(src: &mut Input, span_offset: usize) -> Result<LiteBlock, ParseError
break;
}
}
'"' | '\'' => {
let c = *c;
// quoted string
let arg = quoted(src, c, span_offset)?;
cmd.args.push(arg);
}
// '"' | '\'' => {
// let c = *c;
// // quoted string
// let arg = quoted(src, c, span_offset)?;
// cmd.args.push(arg);
// }
_ => {
// basic argument
let arg = bare(src, span_offset)?;