chore: move attributes to a new file

noir-lang · Feb 24, 2024 · 7774b50 · 7774b50
1 parent 2b5df09
commit 7774b50
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 44 deletions.
diff --git a/compiler/noirc_frontend/src/parser/parser.rs b/compiler/noirc_frontend/src/parser/parser.rs
@@ -37,7 +37,7 @@ use crate::ast::{
 };
 use crate::lexer::Lexer;
 use crate::parser::{force, ignore_then_commit, statement_recovery};
-use crate::token::{Attribute, Attributes, Keyword, Token, TokenKind};
+use crate::token::{Keyword, Token, TokenKind};
 use crate::{
     BinaryOp, BinaryOpKind, BlockExpression, Distinctness, ForLoopStatement, ForRange,
     FunctionReturnType, Ident, IfExpression, InfixExpression, LValue, Lambda, Literal,
@@ -50,6 +50,7 @@ use iter_extended::vecmap;
 use noirc_errors::{Span, Spanned};
 
 mod assertion;
+mod attributes;
 mod function;
 mod literals;
 mod path;
@@ -225,17 +226,6 @@ fn function_return_type() -> impl NoirParser<((Distinctness, Visibility), Functi
         })
 }
 
-fn attribute() -> impl NoirParser<Attribute> {
-    token_kind(TokenKind::Attribute).map(|token| match token {
-        Token::Attribute(attribute) => attribute,
-        _ => unreachable!("Parser should have already errored due to token not being an attribute"),
-    })
-}
-
-fn attributes() -> impl NoirParser<Vec<Attribute>> {
-    attribute().repeated()
-}
-
 fn lambda_parameters() -> impl NoirParser<Vec<(Pattern, UnresolvedType)>> {
     let typ = parse_type().recover_via(parameter_recovery());
     let typ = just(Token::Colon).ignore_then(typ);
@@ -283,32 +273,6 @@ fn self_parameter() -> impl NoirParser<Param> {
         })
 }
 
-fn validate_attributes(
-    attributes: Vec<Attribute>,
-    span: Span,
-    emit: &mut dyn FnMut(ParserError),
-) -> Attributes {
-    let mut primary = None;
-    let mut secondary = Vec::new();
-
-    for attribute in attributes {
-        match attribute {
-            Attribute::Function(attr) => {
-                if primary.is_some() {
-                    emit(ParserError::with_reason(
-                        ParserErrorReason::MultipleFunctionAttributesFound,
-                        span,
-                    ));
-                }
-                primary = Some(attr);
-            }
-            Attribute::Secondary(attr) => secondary.push(attr),
-        }
-    }
-
-    Attributes { function: primary, secondary }
-}
-
 /// Function declaration parameters differ from other parameters in that parameter
 /// patterns are not allowed in declarations. All parameters must be identifiers.
 fn function_declaration_parameters() -> impl NoirParser<Vec<(Ident, UnresolvedType)>> {

diff --git a/compiler/noirc_frontend/src/parser/parser/attributes.rs b/compiler/noirc_frontend/src/parser/parser/attributes.rs
@@ -0,0 +1,46 @@
+use chumsky::Parser;
+use noirc_errors::Span;
+
+use crate::{
+    parser::{NoirParser, ParserError, ParserErrorReason},
+    token::{Attribute, Attributes, Token, TokenKind},
+};
+
+use super::primitives::token_kind;
+
+fn attribute() -> impl NoirParser<Attribute> {
+    token_kind(TokenKind::Attribute).map(|token| match token {
+        Token::Attribute(attribute) => attribute,
+        _ => unreachable!("Parser should have already errored due to token not being an attribute"),
+    })
+}
+
+pub(super) fn attributes() -> impl NoirParser<Vec<Attribute>> {
+    attribute().repeated()
+}
+
+pub(super) fn validate_attributes(
+    attributes: Vec<Attribute>,
+    span: Span,
+    emit: &mut dyn FnMut(ParserError),
+) -> Attributes {
+    let mut primary = None;
+    let mut secondary = Vec::new();
+
+    for attribute in attributes {
+        match attribute {
+            Attribute::Function(attr) => {
+                if primary.is_some() {
+                    emit(ParserError::with_reason(
+                        ParserErrorReason::MultipleFunctionAttributesFound,
+                        span,
+                    ));
+                }
+                primary = Some(attr);
+            }
+            Attribute::Secondary(attr) => secondary.push(attr),
+        }
+    }
+
+    Attributes { function: primary, secondary }
+}
diff --git a/compiler/noirc_frontend/src/parser/parser/function.rs b/compiler/noirc_frontend/src/parser/parser/function.rs
@@ -1,7 +1,8 @@
 use super::{
-    attributes, block, fresh_statement, ident, keyword, nothing, optional_distinctness,
-    optional_visibility, parameter_name_recovery, parameter_recovery, parenthesized, parse_type,
-    pattern, self_parameter, validate_attributes, where_clause, NoirParser,
+    attributes::{attributes, validate_attributes},
+    block, fresh_statement, ident, keyword, nothing, optional_distinctness, optional_visibility,
+    parameter_name_recovery, parameter_recovery, parenthesized, parse_type, pattern,
+    self_parameter, where_clause, NoirParser,
 };
 use crate::parser::labels::ParsingRuleLabel;
 use crate::parser::spanned;

diff --git a/compiler/noirc_frontend/src/parser/parser/structs.rs b/compiler/noirc_frontend/src/parser/parser/structs.rs
@@ -5,7 +5,8 @@ use crate::{
     macros_api::SecondaryAttribute,
     parser::{
         parser::{
-            attributes, function,
+            attributes::attributes,
+            function, parse_type,
             primitives::{ident, keyword},
         },
         NoirParser, ParserError, ParserErrorReason, TopLevelStatement,
@@ -14,8 +15,6 @@ use crate::{
     Ident, NoirStruct, UnresolvedType,
 };
 
-use super::parse_type;
-
 pub(super) fn struct_definition() -> impl NoirParser<TopLevelStatement> {
     use self::Keyword::Struct;
     use Token::*;