Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-30 15:03:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup

Browse source
This commit is contained in:
JT 2021-07-09 09:31:08 +12:00
parent 1aa70c50aa
commit bc974a3e7d
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/parser.rs
View file

@ -339,11 +339,11 @@ impl ParserWorkingSet {
// and we also have the argument // and we also have the argument
let mut span = arg_span; let mut span = arg_span;
span.start += long_name.len() + 1; //offset by long flag and '=' span.start += long_name.len() + 1; //offset by long flag and '='
let (arg, err) = self.parse_arg(span, arg_shape.clone()); let (arg, err) = self.parse_value(span, arg_shape.clone());
(Some(long_name), Some(arg), err) (Some(long_name), Some(arg), err)
} else if let Some(arg) = spans.get(*spans_idx + 1) { } else if let Some(arg) = spans.get(*spans_idx + 1) {
let (arg, err) = self.parse_arg(*arg, arg_shape.clone()); let (arg, err) = self.parse_value(*arg, arg_shape.clone());
*spans_idx += 1; *spans_idx += 1;
(Some(long_name), Some(arg), err) (Some(long_name), Some(arg), err)
@ -485,7 +485,8 @@ impl ParserWorkingSet {
) )
} }
_ => { _ => {
let (arg, err) = self.parse_arg(arg_span, shape); // All other cases are single-span values
let (arg, err) = self.parse_value(arg_span, shape);
error = error.or(err); error = error.or(err);
(arg, error) (arg, error)
@ -535,7 +536,7 @@ impl ParserWorkingSet {
for flag in short_flags { for flag in short_flags {
if let Some(arg_shape) = flag.arg { if let Some(arg_shape) = flag.arg {
if let Some(arg) = spans.get(spans_idx + 1) { if let Some(arg) = spans.get(spans_idx + 1) {
let (arg, err) = self.parse_arg(*arg, arg_shape.clone()); let (arg, err) = self.parse_value(*arg, arg_shape.clone());
error = error.or(err); error = error.or(err);
call.named.push((flag.long.clone(), Some(arg))); call.named.push((flag.long.clone(), Some(arg)));
@ -828,7 +829,7 @@ impl ParserWorkingSet {
let mut args = vec![]; let mut args = vec![];
for arg in &output.block[0].commands { for arg in &output.block[0].commands {
for part in &arg.parts { for part in &arg.parts {
let (arg, err) = self.parse_arg(*part, element_shape.clone()); let (arg, err) = self.parse_value(*part, element_shape.clone());
error = error.or(err); error = error.or(err);
args.push(arg); args.push(arg);
@ -894,7 +895,7 @@ impl ParserWorkingSet {
let mut table_headers = vec![]; let mut table_headers = vec![];
let (headers, err) = let (headers, err) =
self.parse_arg(output.block[0].commands[0].parts[0], SyntaxShape::Table); self.parse_value(output.block[0].commands[0].parts[0], SyntaxShape::Table);
error = error.or(err); error = error.or(err);
if let Expression { if let Expression {
@ -907,7 +908,7 @@ impl ParserWorkingSet {
let mut rows = vec![]; let mut rows = vec![];
for part in &output.block[1].commands[0].parts { for part in &output.block[1].commands[0].parts {
let (values, err) = self.parse_arg(*part, SyntaxShape::Table); let (values, err) = self.parse_value(*part, SyntaxShape::Table);
error = error.or(err); error = error.or(err);
if let Expression { if let Expression {
expr: Expr::List(values), expr: Expr::List(values),
@ -982,7 +983,7 @@ impl ParserWorkingSet {
) )
} }
pub fn parse_arg( pub fn parse_value(
&mut self, &mut self,
span: Span, span: Span,
shape: SyntaxShape, shape: SyntaxShape,
@ -1079,7 +1080,7 @@ impl ParserWorkingSet {
SyntaxShape::String, SyntaxShape::String,
]; ];
for shape in shapes.iter() { for shape in shapes.iter() {
if let (s, None) = self.parse_arg(span, shape.clone()) { if let (s, None) = self.parse_value(span, shape.clone()) {
return (s, None); return (s, None);
} }
} }
@ -1151,7 +1152,7 @@ impl ParserWorkingSet {
let mut last_prec = 1000000; let mut last_prec = 1000000;
let mut error = None; let mut error = None;
let (lhs, err) = self.parse_arg(spans[0], SyntaxShape::Any); let (lhs, err) = self.parse_value(spans[0], SyntaxShape::Any);
error = error.or(err); error = error.or(err);
idx += 1; idx += 1;
@ -1171,7 +1172,7 @@ impl ParserWorkingSet {
break; break;
} }
let (rhs, err) = self.parse_arg(spans[idx], SyntaxShape::Any); let (rhs, err) = self.parse_value(spans[idx], SyntaxShape::Any);
error = error.or(err); error = error.or(err);
if op_prec <= last_prec { if op_prec <= last_prec {