Declaration Definition

* fixed ctor to directly initialize the kind type * renamed in grammar to 'Declaration' for readability reasons * related to sealangdotorg/sea#35
casm-lang · Jun 10, 2021 · 355d79c · 355d79c
1 parent 81f702f
commit 355d79c
Show file tree

Hide file tree

Showing 9 changed files with 526 additions and 534 deletions.
diff --git a/src/GrammarParser.y b/src/GrammarParser.y
@@ -153,7 +153,7 @@ END       0 "end of file"
 %type <ImplementationDefinition::Ptr> ImplementationDefinition
 %type <Definition::Ptr> ImplementationDefinitionDefinition
 %type <Definitions::Ptr> ImplementationDefinitionDefinitions
-%type <DeclarationDefinition::Ptr> DeclarationDefinition
+%type <DeclarationDefinition::Ptr> Declaration
 
 // literals
 %type <Literal::Ptr> Literal
@@ -623,13 +623,13 @@ FeatureDefinition
 
 
 FeatureDefinitionElement
-: LSQPAREN Attributes RSQPAREN DeclarationDefinition
+: LSQPAREN Attributes RSQPAREN Declaration
   {
       auto definition = $4;
       definition->setAttributes( $2 );
       $$ = definition;
   }
-| DeclarationDefinition
+| Declaration
   {
       $$ = $1;
   }
@@ -722,20 +722,18 @@ ImplementationDefinitionDefinitions
 // DeclarationDefinition
 //
 
-DeclarationDefinition
+Declaration
 : DERIVED Identifier COLON MaybeFunctionParameters MAPS Type
   {
       // TODO: FIXME: @ppaulweber: handle AST keyword tokens $1, $3, and $5
-      auto declaration = Ast::make< DeclarationDefinition >( @$, $2, $4, $6 );
-      declaration->setKind( DeclarationDefinition::Kind::DERIVED );
-      $$ = declaration;
+      $$ = Ast::make< DeclarationDefinition >
+          ( @$, $2, $4, $6, DeclarationDefinition::Kind::DERIVED );
   }
 | RULE Identifier COLON MaybeFunctionParameters MAPS Type
   {
       // TODO: FIXME: @ppaulweber: handle AST keyword tokens $1, $3, and $5
-      auto declaration = Ast::make< DeclarationDefinition >( @$, $2, $4, $6 );
-      declaration->setKind( DeclarationDefinition::Kind::RULE );
-      $$ = declaration;
+      $$ = Ast::make< DeclarationDefinition >
+          ( @$, $2, $4, $6, DeclarationDefinition::Kind::RULE );
   }
 ;
 

diff --git a/src/ast/Definition.cpp b/src/ast/Definition.cpp
@@ -772,10 +772,12 @@ void ImplementationDefinition::accept( Visitor& visitor )
 DeclarationDefinition::DeclarationDefinition(
     const Identifier::Ptr& identifier,
     const Types::Ptr& argumentTypes,
-    const Type::Ptr& returnType )
+    const Type::Ptr& returnType,
+    const DeclarationDefinition::Kind kind )
 : Definition( Node::ID::DECLARATION_DEFINITION, identifier )
 , m_argumentTypes( argumentTypes )
 , m_returnType( returnType )
+, m_kind( kind )
 {
 }
 
@@ -789,11 +791,6 @@ const Type::Ptr& DeclarationDefinition::returnType( void ) const
     return m_returnType;
 }
 
-void DeclarationDefinition::setKind( const Kind kind )
-{
-    m_kind = kind;
-}
-
 DeclarationDefinition::Kind DeclarationDefinition::kind( void ) const
 {
     return m_kind;

diff --git a/src/ast/Definition.h b/src/ast/Definition.h
@@ -491,21 +491,20 @@ namespace libcasm_fe
 
             enum class Kind
             {
-                DERIVED = 1,
+                DERIVED,
                 RULE
             };
 
             DeclarationDefinition(
                 const Identifier::Ptr& identifier,
                 const Types::Ptr& argumentTypes,
-                const Type::Ptr& returnType );
+                const Type::Ptr& returnType,
+                const Kind kind );
 
             const Types::Ptr& argumentTypes( void ) const;
 
             const Type::Ptr& returnType( void ) const;
 
-            void setKind( const Kind kind );
-
             Kind kind( void ) const;
 
             std::string kindName( void ) const;
@@ -515,7 +514,7 @@ namespace libcasm_fe
           private:
             const Types::Ptr m_argumentTypes;
             const Type::Ptr m_returnType;
-            Kind m_kind;
+            const Kind m_kind;
         };
 
         using DeclarationDefinitions = NodeList< DeclarationDefinition >;

diff --git a/src/various/Grammar.org b/src/various/Grammar.org
@@ -213,8 +213,8 @@ FeatureDefinition ::= "feature" Identifier "=" "{" FeatureDefinitionList "}"
 ** FeatureDefinitionElement
 
 #+begin_src
-FeatureDefinitionElement ::= "[" Attributes "]" DeclarationDefinition
-                           | DeclarationDefinition
+FeatureDefinitionElement ::= "[" Attributes "]" Declaration
+                           | Declaration
                            | "[" Attributes "]" DerivedDefinition
                            | DerivedDefinition
                            | "[" Attributes "]" RuleDefinition
@@ -264,14 +264,14 @@ ImplementationDefinitionDefinitions ::= ImplementationDefinitionDefinition Imple
 #+html: {{page>.:grammar:ImplementationDefinitionDefinitions&noheader&nofooter}}
 
 
-** DeclarationDefinition
+** Declaration
 
 #+begin_src
-DeclarationDefinition ::= "derived" Identifier ":" MaybeFunctionParameters "->" Type
-                        | "rule" Identifier ":" MaybeFunctionParameters "->" Type
+Declaration ::= "derived" Identifier ":" MaybeFunctionParameters "->" Type
+              | "rule" Identifier ":" MaybeFunctionParameters "->" Type
 #+end_src
 
-#+html: {{page>.:grammar:DeclarationDefinition&noheader&nofooter}}
+#+html: {{page>.:grammar:Declaration&noheader&nofooter}}
 
 
 ** Rules