intercal/not-python-old.2020-08-27
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add indexing expression parsing and tests

Browse Source 
Signed-off-by: Alek Ratzloff <alekratz@gmail.com>
This commit is contained in:
Alek Ratzloff
2020-05-06 17:55:25 -04:00
parent 44970dbf97
commit 5d3021ced7
2 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/syn/parser.rs
View File

@@ -283,11 +283,12 @@ impl<'t> Parser<'t> {
/// index access.
fn next_suffix_expr(&mut self, expr: Expr) -> Result<Expr> {
if self.match_token_kind(TokenKind::LParen)?.is_some() {
// function call
let prev_skip = self.set_skip_newlines(true)?;
let args = self.next_expr_list(TokenKind::RParen)?;
self.set_skip_newlines(prev_skip)?;
let end_token =
self.expect_token_kind(TokenKind::RParen, "end of function call (left paren)")?;
self.expect_token_kind(TokenKind::RParen, "end of function call (right paren)")?;
let span = expr.span().union(end_token.span());
let fun_call = Expr::FunCall(
FunCallExpr {
@@ -298,7 +299,21 @@ impl<'t> Parser<'t> {
);
self.next_suffix_expr(fun_call)
} else if self.match_token_kind(TokenKind::LBracket)?.is_some() {
todo!()
// indexing
let prev_skip = self.set_skip_newlines(true)?;
let index = self.next_expr()?;
self.set_skip_newlines(prev_skip)?;
let end_token =
self.expect_token_kind(TokenKind::RBracket, "end of index expression (right square bracket)")?;
let span = expr.span().union(end_token.span());
let index_expr = Expr::Index(
IndexExpr {
expr,
index,
span,
}.into()
);
self.next_suffix_expr(index_expr)
} else {
Ok(expr)
}
@@ -603,6 +618,14 @@ mod test {
}.into())
}
fn index_expr(expr: Expr, index: Expr) -> Expr {
Expr::Index(IndexExpr {
expr,
index,
span: Default::default(),
}.into())
}
#[test]
fn test_base_expr() {
test_parser!(
@@ -928,7 +951,7 @@ mod test {
}
#[test]
fn test_fun_call_expr() {
fn test_suffix_expr() {
test_parser!(
Parser::try_from(r"foo()").unwrap(),
next_expr,
@@ -978,6 +1001,32 @@ mod test {
]
)
);
test_parser!(
Parser::try_from(r"foo()[0]").unwrap(),
next_expr,
index_expr(
fun_call_expr(
base_expr(BaseExprKind::Ident),
vec![]
),
base_expr(BaseExprKind::Num),
)
);
test_parser!(
Parser::try_from(r"foo[0](bar)").unwrap(),
next_expr,
fun_call_expr(
index_expr(
base_expr(BaseExprKind::Ident),
base_expr(BaseExprKind::Num),
),
vec![
base_expr(BaseExprKind::Ident)
]
)
);
}
////////////////////////////////////////////////////////////////////////////////