From 1070de62a1f4f69b24c983f15496bae979027aa6 Mon Sep 17 00:00:00 2001 From: Yordan Madzhunkov Date: Mon, 31 Jul 2023 15:44:51 +0300 Subject: [PATCH] Emit parser errors for trait functionalities not yet impelemented --- crates/noirc_frontend/src/parser/parser.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/crates/noirc_frontend/src/parser/parser.rs b/crates/noirc_frontend/src/parser/parser.rs index ec68971ede9..1afcaf3d537 100644 --- a/crates/noirc_frontend/src/parser/parser.rs +++ b/crates/noirc_frontend/src/parser/parser.rs @@ -355,6 +355,9 @@ fn trait_definition() -> impl NoirParser { .then_ignore(just(Token::RightBrace)) .validate(|(((name, generics), where_clause), items), span, emit| { validate_where_clause(&generics, &where_clause, span, emit); + if generics.len() > 0 || where_clause.len() > 0 { + emit(ParserError::with_reason(ParserErrorReason::TraitsAreExperimental, span)); + } TopLevelStatement::Trait(NoirTrait { name, generics, where_clause, span, items }) }) } @@ -486,11 +489,15 @@ fn trait_implementation() -> impl NoirParser { .then_ignore(just(Token::LeftBrace)) .then(trait_implementation_body()) .then_ignore(just(Token::RightBrace)) - .validate(|args, _span, _emit| { + .validate(|args, span, emit| { let ((other_args, where_clause), items) = args; let (((impl_generics, trait_name), trait_generics), (object_type, object_type_span)) = other_args; + if where_clause.len() > 0 || impl_generics.len() > 0 { + emit(ParserError::with_reason(ParserErrorReason::TraitsAreExperimental, span)); + } + TopLevelStatement::TraitImpl(TraitImpl { impl_generics, trait_name, @@ -521,10 +528,9 @@ fn where_clause() -> impl NoirParser> { .then_ignore(just(Token::Colon)) .then(ident()) .then(generic_type_args(parse_type())) - .validate(|((typ, trait_name), trait_generics), _span, _emit| TraitConstraint { - typ, - trait_name, - trait_generics, + .validate(|((typ, trait_name), trait_generics), span, emit| { + emit(ParserError::with_reason(ParserErrorReason::TraitsAreExperimental, span)); + TraitConstraint { typ, trait_name, trait_generics} }); keyword(Keyword::Where)