Grammar: add support for type aliasing

The rule is: TYPE Identifier = Type Refs sealangdotorg/sea#16
casm-lang · Jul 17, 2017 · 5e51e1b · ppaulweber · Jul 17, 2017 · 5e51e1b
1 parent d798226
commit 5e51e1b
Show file tree

Hide file tree

Showing 19 changed files with 8,649 additions and 8,416 deletions.
diff --git a/src/GrammarParser.yy b/src/GrammarParser.yy
@@ -170,6 +170,7 @@ END       0 "end of file"
 %type <DerivedDefinition::Ptr> DerivedDefinition
 %type <RuleDefinition::Ptr> RuleDefinition
 %type <EnumerationDefinition::Ptr> EnumerationDefinition
+%type <TypeDefinition::Ptr> TypeDefinition
 
 // expressions
 %type <Expression::Ptr> Expression Term Atom
@@ -297,6 +298,10 @@ Definition
   {
       $$ = $1;
   }
+| TypeDefinition
+  {
+      $$ = $1;
+  }
 | error // error recovery
   {
       $$ = nullptr;
@@ -524,6 +529,14 @@ EnumerationDefinition
 ;
 
 
+TypeDefinition
+: TYPE Identifier EQUAL Type
+  {
+      $$ = Ast::make< TypeDefinition >( @$, $2, $4 );
+  }
+;
+
+
 Identifier
 : IDENTIFIER
   {

diff --git a/src/GrammarToken.hpp b/src/GrammarToken.hpp
@@ -30,6 +30,7 @@ INIT            "init"          { return Parser::make_INIT(loc); }
 DERIVED         "derived"       { return Parser::make_DERIVED(loc); }
 ENUM            "enum"          { return Parser::make_ENUM(loc); }
 RULE            "rule"          { return Parser::make_RULE(loc); }
+TYPE            "type"          { return Parser::make_TYPE(loc); }
 
 FUNCTION        "function"      { return Parser::make_FUNCTION(loc); }
 INITIALLY       "initially"     { return Parser::make_INITIALLY(loc); }

diff --git a/src/ast/Definition.cpp b/src/ast/Definition.cpp
@@ -306,3 +306,20 @@ void EnumerationDefinition::accept( Visitor& visitor )
 {
     visitor.visit( *this );
 }
+
+TypeDefinition::TypeDefinition(
+    const Identifier::Ptr& identifier, const Type::Ptr& type )
+: Definition( Node::ID::TYPE_DEFINITION, identifier )
+, m_type( type )
+{
+}
+
+const Type::Ptr& TypeDefinition::type( void ) const
+{
+    return m_type;
+}
+
+void TypeDefinition::accept( Visitor& visitor )
+{
+    visitor.visit( *this );
+}
diff --git a/src/ast/Definition.h b/src/ast/Definition.h
@@ -216,6 +216,22 @@ namespace libcasm_fe
           private:
             const Identifiers::Ptr m_enumerators;
         };
+
+        class TypeDefinition final : public Definition
+        {
+          public:
+            using Ptr = std::shared_ptr< TypeDefinition >;
+
+            TypeDefinition(
+                const Identifier::Ptr& identifier, const Type::Ptr& type );
+
+            const Type::Ptr& type( void ) const;
+
+            void accept( Visitor& visitor ) override final;
+
+          private:
+            const Type::Ptr m_type;
+        };
     }
 }
 

diff --git a/src/ast/EmptyVisitor.cpp b/src/ast/EmptyVisitor.cpp
@@ -54,6 +54,10 @@ void EmptyVisitor::visit( EnumerationDefinition& )
 {
 }
 
+void EmptyVisitor::visit( TypeDefinition& )
+{
+}
+
 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( TypeDefinition& 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::TYPE_DEFINITION:
+        {
+            return "type";
+        }
         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,
+                TYPE_DEFINITION,
 
                 // expressions
                 VALUE_ATOM,

diff --git a/src/ast/RecursiveVisitor.cpp b/src/ast/RecursiveVisitor.cpp
@@ -78,6 +78,13 @@ void RecursiveVisitor::visit( EnumerationDefinition& node )
     node.attributes()->accept( *this );
 }
 
+void RecursiveVisitor::visit( TypeDefinition& node )
+{
+    node.identifier()->accept( *this );
+    node.type()->accept( *this );
+    node.attributes()->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( TypeDefinition& 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 TypeDefinition;
 
         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( TypeDefinition& node ) = 0;
 
             virtual void visit( ValueAtom& node ) = 0;
             virtual void visit( ReferenceAtom& node ) = 0;

diff --git a/src/transform/AstDumpDotPass.cpp b/src/transform/AstDumpDotPass.cpp
@@ -85,6 +85,7 @@ class AstDumpDotVisitor final : public RecursiveVisitor
     void visit( DerivedDefinition& node ) override;
     void visit( RuleDefinition& node ) override;
     void visit( EnumerationDefinition& node ) override;
+    void visit( TypeDefinition& node ) override;
 
     void visit( ValueAtom& node ) override;
     void visit( ReferenceAtom& node ) override;
@@ -201,6 +202,13 @@ void AstDumpDotVisitor::visit( EnumerationDefinition& node )
     RecursiveVisitor::visit( node );
 }
 
+void AstDumpDotVisitor::visit( TypeDefinition& node )
+{
+    DotLink link( this, &node );
+    dumpNode( node, "TypeDefinition" );
+    RecursiveVisitor::visit( node );
+}
+
 void AstDumpDotVisitor::visit( ValueAtom& node )
 {
     DotLink link( this, &node );

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( TypeDefinition& node ) override;
 
     void visit( ValueAtom& node ) override;
     void visit( ReferenceAtom& node ) override;
@@ -323,6 +324,14 @@ void AstDumpSourceVisitor::visit( EnumerationDefinition& node )
     m_stream << "}";
 }
 
+void AstDumpSourceVisitor::visit( TypeDefinition& node )
+{
+    m_stream << "type ";
+    node.identifier()->accept( *this );
+    m_stream << " = ";
+    node.type()->accept( *this );
+}
+
 void AstDumpSourceVisitor::visit( ValueAtom& node )
 {
     m_stream << node.value()->name();

diff --git a/src/transform/AstToCasmIRPass.cpp b/src/transform/AstToCasmIRPass.cpp
@@ -56,6 +56,7 @@ class AstToCasmIRVisitor final : public RecursiveVisitor
     void visit( DerivedDefinition& node ) override;
     void visit( RuleDefinition& node ) override;
     void visit( EnumerationDefinition& node ) override;
+    void visit( TypeDefinition& node ) override;
 
     void visit( ValueAtom& node ) override;
     void visit( ReferenceAtom& node ) override;
@@ -262,6 +263,12 @@ void AstToCasmIRVisitor::visit( EnumerationDefinition& node )
         "%s:%i: TODO %s", __FILE__, __LINE__, node.description().c_str() );
 }
 
+void AstToCasmIRVisitor::visit( TypeDefinition& node )
+{
+    m_log.info(
+        "%s:%i: TODO %s", __FILE__, __LINE__, node.description().c_str() );
+}
+
 void AstToCasmIRVisitor::visit( ValueAtom& node )
 {
     assert( node.type() );

diff --git a/src/various/Grammar.org b/src/various/Grammar.org
@@ -7,6 +7,7 @@ Definition
 | DerivedDefinition
 | RuleDefinition
 | EnumerationDefinition
+| TypeDefinition
 | error // error recovery
 
 AttributedDefinition
@@ -60,6 +61,9 @@ DerivedDefinition
 EnumerationDefinition
 : ENUM Identifier EQUAL LCURPAREN Identifiers RCURPAREN
 
+TypeDefinition
+: TYPE Identifier EQUAL Type
+
 Identifier
 : IDENTIFIER
 | IN // allow in keyword as identifier