forked from AbleScript/ablescript
Implemented Len in parser
This commit is contained in:
parent
1b84093eab
commit
8e55872f10
|
@ -190,6 +190,7 @@ pub enum ExprKind {
|
||||||
expr: Box<Expr>,
|
expr: Box<Expr>,
|
||||||
index: Box<Expr>,
|
index: Box<Expr>,
|
||||||
},
|
},
|
||||||
|
Len(Box<Expr>),
|
||||||
Variable(String),
|
Variable(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -175,6 +175,7 @@ impl ExecEnv {
|
||||||
.map(|x| x.borrow().clone())
|
.map(|x| x.borrow().clone())
|
||||||
.unwrap_or(Value::Nul)
|
.unwrap_or(Value::Nul)
|
||||||
}
|
}
|
||||||
|
Len(_) => todo!("length"),
|
||||||
|
|
||||||
// TODO: not too happy with constructing an artificial
|
// TODO: not too happy with constructing an artificial
|
||||||
// Ident here.
|
// Ident here.
|
||||||
|
|
|
@ -195,10 +195,7 @@ impl<'source> Parser<'source> {
|
||||||
|
|
||||||
Token::LeftBracket => match buf.take() {
|
Token::LeftBracket => match buf.take() {
|
||||||
Some(buf) => Ok(Expr::new(
|
Some(buf) => Ok(Expr::new(
|
||||||
ExprKind::Index {
|
self.index_flow(buf)?,
|
||||||
expr: Box::new(buf),
|
|
||||||
index: Box::new(self.expr_flow(Token::RightBracket)?),
|
|
||||||
},
|
|
||||||
start..self.lexer.span().end,
|
start..self.lexer.span().end,
|
||||||
)),
|
)),
|
||||||
None => Ok(Expr::new(self.cart_flow()?, start..self.lexer.span().end)),
|
None => Ok(Expr::new(self.cart_flow()?, start..self.lexer.span().end)),
|
||||||
|
@ -279,6 +276,27 @@ impl<'source> Parser<'source> {
|
||||||
Ok(ExprKind::Cart(cart))
|
Ok(ExprKind::Cart(cart))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Flow for indexing operations
|
||||||
|
///
|
||||||
|
/// Indexing with empty index resolves to length of expression, else it indexes
|
||||||
|
fn index_flow(&mut self, expr: Expr) -> Result<ExprKind, Error> {
|
||||||
|
let mut buf = None;
|
||||||
|
Ok(loop {
|
||||||
|
match self.checked_next()? {
|
||||||
|
Token::RightBracket => match buf {
|
||||||
|
Some(index) => {
|
||||||
|
break ExprKind::Index {
|
||||||
|
expr: Box::new(expr),
|
||||||
|
index: Box::new(index),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => break ExprKind::Len(Box::new(expr)),
|
||||||
|
},
|
||||||
|
token => buf = Some(self.parse_expr(token, &mut buf)?),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// Flow for operators
|
/// Flow for operators
|
||||||
///
|
///
|
||||||
/// Generates operation from LHS buffer and next expression as RHS
|
/// Generates operation from LHS buffer and next expression as RHS
|
||||||
|
|
Loading…
Reference in a new issue