From 87b5e14c75dbc02b5bc610dfa33d5789570df5db Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 31 Jul 2018 13:41:30 +0300 Subject: Fix indexing errors --- src/parser/grammar/expressions.rs | 2 +- src/yellow/syntax.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/parser/grammar/expressions.rs b/src/parser/grammar/expressions.rs index 4861536f8..a6456c8d5 100644 --- a/src/parser/grammar/expressions.rs +++ b/src/parser/grammar/expressions.rs @@ -69,7 +69,7 @@ fn atom_expr(p: &mut Parser) -> Option { match p.current() { L_PAREN => Some(tuple_expr(p)), _ => { - p.error("expected expression"); + p.err_and_bump("expected expression"); None } } diff --git a/src/yellow/syntax.rs b/src/yellow/syntax.rs index 65ce647c7..58e8ab9b6 100644 --- a/src/yellow/syntax.rs +++ b/src/yellow/syntax.rs @@ -109,7 +109,7 @@ impl SyntaxNode { let red = self.red(); let parent = self.parent()?; let next_sibling_idx = red.index_in_parent()? + 1; - if next_sibling_idx == red.n_children() { + if next_sibling_idx == parent.red().n_children() { return None; } Some(SyntaxNode { -- cgit v1.2.3