Structure Definition

* added new AST structure definition and its syntax - related to ref #35 * updated visitors etc.
casm-lang · Jul 29, 2017 · 6997e6d · emmanuel099 · Jul 30, 2017 · emmanuel099
1 parent 41c349d
commit 6997e6d
Show file tree

Hide file tree

Showing 19 changed files with 8,946 additions and 8,573 deletions.
diff --git a/src/GrammarParser.yy b/src/GrammarParser.yy
@@ -167,9 +167,11 @@ END       0 "end of file"
 %type <Definitions::Ptr> Definitions
 %type <VariableDefinition::Ptr> Variable AttributedVariable
 %type <FunctionDefinition::Ptr> FunctionDefinition
+%type <FunctionDefinitions::Ptr> FunctionDefinitions
 %type <DerivedDefinition::Ptr> DerivedDefinition
 %type <RuleDefinition::Ptr> RuleDefinition
 %type <EnumerationDefinition::Ptr> EnumerationDefinition
+%type <StructureDefinition::Ptr> StructureDefinition
 
 // expressions
 %type <Expression::Ptr> Expression Term Atom
@@ -210,7 +212,7 @@ END       0 "end of file"
 %type <RelationType::Ptr> RelationType
 %type <FixedSizedType::Ptr> FixedSizedType
 
-// types
+// attribute
 %type <Attribute::Ptr> Attribute
 %type <Attributes::Ptr> Attributes
 %type <BasicAttribute::Ptr> BasicAttribute
@@ -297,6 +299,10 @@ Definition
   {
       $$ = $1;
   }
+| StructureDefinition
+  {
+      $$ = $1;
+  }
 | error // error recovery
   {
       $$ = nullptr;
@@ -358,6 +364,22 @@ FunctionDefinition
 ;
 
 
+FunctionDefinitions
+: FunctionDefinitions COMMA FunctionDefinition
+  {
+      auto functions = $1;
+      functions->add( $3 );
+      $$ = functions;
+  }
+| FunctionDefinition
+  {
+      auto functions = Ast::make< FunctionDefinitions >( @$ );
+      functions->add( $1 );
+      $$ = functions;
+  }
+;
+
+
 MaybeInitially
 : INITIALLY LCURPAREN MaybeInitializers RCURPAREN
   {
@@ -524,6 +546,14 @@ EnumerationDefinition
 ;
 
 
+StructureDefinition
+: STRUCTURE Identifier EQUAL LCURPAREN FunctionDefinitions RCURPAREN
+  {
+      $$ = Ast::make< StructureDefinition >( @$, $2, $5 );
+  }
+;
+
+
 Identifier
 : IDENTIFIER
   {

diff --git a/src/GrammarToken.hpp b/src/GrammarToken.hpp
@@ -35,6 +35,8 @@ FUNCTION        "function"      { return Parser::make_FUNCTION(loc); }
 INITIALLY       "initially"     { return Parser::make_INITIALLY(loc); }
 DEFINED         "defined"       { return Parser::make_DEFINED(loc); }
 
+STRUCTURE       "structure"     { return Parser::make_STRUCTURE(loc); }
+
 SEQ             "seq"           { return Parser::make_SEQ(loc); }
 ENDSEQ          "endseq"        { return Parser::make_ENDSEQ(loc); }
 PAR             "par"           { return Parser::make_PAR(loc); }

diff --git a/src/Namespace.cpp b/src/Namespace.cpp
@@ -322,3 +322,13 @@ Namespace::Symbol Namespace::find( const IdentifierPath& node,
         return result->second.front();
     }
 }
+
+//
+//  Local variables:
+//  mode: c++
+//  indent-tabs-mode: nil
+//  c-basic-offset: 4
+//  tab-width: 4
+//  End:
+//  vim:noexpandtab:sw=4:ts=4:
+//
diff --git a/src/ast/Definition.cpp b/src/ast/Definition.cpp
@@ -306,3 +306,36 @@ void EnumerationDefinition::accept( Visitor& visitor )
 {
     visitor.visit( *this );
 }
+
+//
+//
+// StructureDefinition
+//
+
+StructureDefinition::StructureDefinition( const Identifier::Ptr& identifier,
+    const NodeList< FunctionDefinition >::Ptr& functions )
+: Definition( Node::ID::STRUCTURE_DEFINITION, identifier )
+, m_functions( functions )
+{
+}
+
+const NodeList< FunctionDefinition >::Ptr& StructureDefinition::functions(
+    void ) const
+{
+    return m_functions;
+}
+
+void StructureDefinition::accept( Visitor& visitor )
+{
+    visitor.visit( *this );
+}
+
+//
+//  Local variables:
+//  mode: c++
+//  indent-tabs-mode: nil
+//  c-basic-offset: 4
+//  tab-width: 4
+//  End:
+//  vim:noexpandtab:sw=4:ts=4:
+//
diff --git a/src/ast/Definition.h b/src/ast/Definition.h
@@ -137,6 +137,8 @@ namespace libcasm_fe
             UID m_uid;
         };
 
+        using FunctionDefinitions = NodeList< FunctionDefinition >;
+
         class DerivedDefinition final : public Definition
         {
           public:
@@ -216,6 +218,22 @@ namespace libcasm_fe
           private:
             const Identifiers::Ptr m_enumerators;
         };
+
+        class StructureDefinition final : public Definition
+        {
+          public:
+            using Ptr = std::shared_ptr< StructureDefinition >;
+
+            StructureDefinition( const Identifier::Ptr& identifier,
+                const NodeList< FunctionDefinition >::Ptr& functions );
+
+            const NodeList< FunctionDefinition >::Ptr& functions( void ) const;
+
+            void accept( Visitor& visitor ) override final;
+
+          private:
+            const NodeList< FunctionDefinition >::Ptr m_functions;
+        };
     }
 }
 

diff --git a/src/ast/EmptyVisitor.cpp b/src/ast/EmptyVisitor.cpp
@@ -54,6 +54,10 @@ void EmptyVisitor::visit( EnumerationDefinition& )
 {
 }
 
+void EmptyVisitor::visit( StructureDefinition& )
+{
+}
+
 void EmptyVisitor::visit( ValueAtom& )
 {
 }

diff --git a/src/ast/EmptyVisitor.h b/src/ast/EmptyVisitor.h
@@ -42,6 +42,7 @@ namespace libcasm_fe
             void visit( DerivedDefinition& node ) override;
             void visit( RuleDefinition& node ) override;
             void visit( EnumerationDefinition& node ) override;
+            void visit( StructureDefinition& node ) override;
 
             void visit( ValueAtom& node ) override;
             void visit( ReferenceAtom& node ) override;

diff --git a/src/ast/Node.cpp b/src/ast/Node.cpp
@@ -77,6 +77,10 @@ std::string Node::description( void ) const
         {
             return "enumeration";
         }
+        case ID::STRUCTURE_DEFINITION:
+        {
+            return "structure";
+        }
         case ID::VALUE_ATOM:
         {
             return "value";

diff --git a/src/ast/Node.h b/src/ast/Node.h
@@ -55,6 +55,7 @@ namespace libcasm_fe
                 DERIVED_DEFINITION,
                 RULE_DEFINITION,
                 ENUMERATION_DEFINITION,
+                STRUCTURE_DEFINITION,
 
                 // expressions
                 VALUE_ATOM,

diff --git a/src/ast/RecursiveVisitor.cpp b/src/ast/RecursiveVisitor.cpp
@@ -78,6 +78,12 @@ void RecursiveVisitor::visit( EnumerationDefinition& node )
     node.attributes()->accept( *this );
 }
 
+void RecursiveVisitor::visit( StructureDefinition& node )
+{
+    node.identifier()->accept( *this );
+    node.functions()->accept( *this );
+}
+
 void RecursiveVisitor::visit( ValueAtom& node )
 {
 }

diff --git a/src/ast/RecursiveVisitor.h b/src/ast/RecursiveVisitor.h
@@ -42,6 +42,7 @@ namespace libcasm_fe
             void visit( DerivedDefinition& node ) override;
             void visit( RuleDefinition& node ) override;
             void visit( EnumerationDefinition& node ) override;
+            void visit( StructureDefinition& node ) override;
 
             void visit( ValueAtom& node ) override;
             void visit( ReferenceAtom& node ) override;

diff --git a/src/ast/Visitor.h b/src/ast/Visitor.h
@@ -37,6 +37,7 @@ namespace libcasm_fe
         class DerivedDefinition;
         class RuleDefinition;
         class EnumerationDefinition;
+        class StructureDefinition;
 
         class ValueAtom;
         class ReferenceAtom;
@@ -94,6 +95,7 @@ namespace libcasm_fe
             virtual void visit( DerivedDefinition& node ) = 0;
             virtual void visit( RuleDefinition& node ) = 0;
             virtual void visit( EnumerationDefinition& node ) = 0;
+            virtual void visit( StructureDefinition& node ) = 0;
 
             virtual void visit( ValueAtom& node ) = 0;
             virtual void visit( ReferenceAtom& node ) = 0;

diff --git a/src/execute/NumericExecutionPass.cpp b/src/execute/NumericExecutionPass.cpp
@@ -255,6 +255,7 @@ class ExecutionVisitor final : public EmptyVisitor
     void visit( DerivedDefinition& node ) override;
     void visit( RuleDefinition& node ) override;
     void visit( EnumerationDefinition& node ) override;
+    void visit( StructureDefinition& node ) override;
 
     void visit( ValueAtom& node ) override;
     void visit( ReferenceAtom& node ) override;
@@ -481,6 +482,11 @@ void ExecutionVisitor::visit( EnumerationDefinition& node )
     m_evaluationStack.push( ir::EnumerationConstant( enumType ) );
 }
 
+void ExecutionVisitor::visit( StructureDefinition& node )
+{
+    // TODO: PPA: CONT'D #35
+}
+
 void ExecutionVisitor::visit( ValueAtom& node )
 {
     m_evaluationStack.push( *node.value() );

diff --git a/src/transform/AstDumpSourcePass.cpp b/src/transform/AstDumpSourcePass.cpp
@@ -130,6 +130,7 @@ class AstDumpSourceVisitor final : public Visitor
     void visit( DerivedDefinition& node ) override;
     void visit( RuleDefinition& node ) override;
     void visit( EnumerationDefinition& node ) override;
+    void visit( StructureDefinition& node ) override;
 
     void visit( ValueAtom& node ) override;
     void visit( ReferenceAtom& node ) override;
@@ -323,6 +324,19 @@ void AstDumpSourceVisitor::visit( EnumerationDefinition& node )
     m_stream << "}";
 }
 
+void AstDumpSourceVisitor::visit( StructureDefinition& node )
+{
+    m_stream << "structure ";
+    node.identifier()->accept( *this );
+    m_stream << " =\n{";
+    for( auto& e : *node.functions() )
+    {
+        m_stream << "\n    ";
+        e->accept( *this );
+    }
+    m_stream << "}";
+}
+
 void AstDumpSourceVisitor::visit( ValueAtom& node )
 {
     m_stream << node.value()->name();

diff --git a/src/various/Grammar.org b/src/various/Grammar.org
@@ -7,6 +7,7 @@ Definition
 | DerivedDefinition
 | RuleDefinition
 | EnumerationDefinition
+| StructureDefinition
 | error // error recovery
 
 AttributedDefinition
@@ -21,6 +22,10 @@ FunctionDefinition
 : FUNCTION Identifier COLON MaybeFunctionParameters MAPS Type MaybeDefined MaybeInitially
 | ProgramFunctionDefinition
 
+FunctionDefinitions
+: FunctionDefinitions COMMA FunctionDefinition
+| FunctionDefinition
+
 MaybeInitially
 : INITIALLY LCURPAREN MaybeInitializers RCURPAREN
 | %empty
@@ -60,6 +65,9 @@ DerivedDefinition
 EnumerationDefinition
 : ENUM Identifier EQUAL LCURPAREN Identifiers RCURPAREN
 
+StructureDefinition
+: STRUCTURE Identifier EQUAL LCURPAREN FunctionDefinitions RCURPAREN
+
 Identifier
 : IDENTIFIER
 | IN // allow in keyword as identifier