Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: multiple item imports in use statement #1466

Merged
merged 6 commits into from Jun 5, 2023
Merged

feat: multiple item imports in use statement #1466

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
51b9ef8
feat: multiple item imports in use statement
May 31, 2023
7c994cd
fix: address edge cases identified by jfecher
Jun 2, 2023
40b3cf8
feat: support recursive { and } in imports
Jun 2, 2023
fd6e230
feat: allow trailing comma
Jun 2, 2023
43d2f81
fix: parsing of use statement with keywords
Jun 2, 2023
b39052b
chore: make clippy happy
Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions crates/noirc_frontend/src/parser/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,15 +417,8 @@ fn token_kind(token_kind: TokenKind) -> impl NoirParser<Token> {
})
}

fn path0(trailing_separator: bool) -> impl NoirParser<Path> {
let idents = || {
let idents = ident().separated_by(just(Token::DoubleColon)).at_least(1);
if trailing_separator {
idents.allow_trailing()
} else {
idents
}
};
fn path() -> impl NoirParser<Path> {
let idents = || ident().separated_by(just(Token::DoubleColon)).at_least(1);
let make_path = |kind| move |segments| Path { segments, kind };

let prefix = |key| keyword(key).ignore_then(just(Token::DoubleColon));
Expand All @@ -438,10 +431,6 @@ fn path0(trailing_separator: bool) -> impl NoirParser<Path> {
))
}

fn path() -> impl NoirParser<Path> {
path0(false)
}

fn rename() -> impl NoirParser<Option<Ident>> {
ignore_then_commit(keyword(Keyword::As), ident()).or_not()
}
Expand All @@ -451,7 +440,8 @@ fn path_simple() -> impl NoirParser<UseTree> {
}

fn path_list() -> impl NoirParser<UseTree> {
let path = path0(true);
let path = path().then_ignore(just(Token::DoubleColon));

jfecher marked this conversation as resolved.
Show resolved Hide resolved
let items = path_list_item()
.separated_by(just(Token::Comma))
.delimited_by(just(Token::LeftBrace), just(Token::RightBrace));
Expand Down Expand Up @@ -1551,7 +1541,13 @@ mod test {

parse_all_failing(
use_statement(),
vec!["use std as ;", "use foobar as as;", "use hello:: as foo;"],
vec![
"use std as ;",
"use foobar as as;",
"use hello:: as foo;",
"use foo bar::baz",
"use foo bar::{baz}",
],
);
}

Expand Down