Type

* renamed 'AbstractType' to ''AbstractionType' - related to ref sealangdotorg/sea#30 - related to ref sealangdotorg/sea#31 * added missing 'Type::is*()' helper methods
casm-lang · Jun 8, 2017 · 78c35fd · 78c35fd
1 parent f326674
commit 78c35fd
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 11 deletions.
diff --git a/src/Type.cpp b/src/Type.cpp
@@ -73,6 +73,11 @@ std::string Type::make_hash( void ) const
     return "t:" + std::to_string( id() ) + ":" + description();
 }
 
+u1 Type::isSynthetic( void ) const
+{
+    return isVoid() or isLabel() or isLocation() or isRelation();
+}
+
 u1 Type::isVoid( void ) const
 {
     return id() == Type::VOID;
@@ -93,6 +98,12 @@ u1 Type::isRelation( void ) const
     return id() == Type::RELATION;
 }
 
+u1 Type::isPrimitive( void ) const
+{
+    return isBoolean() or isInteger() or isBit() or isString() or isFloating()
+           or isRational();
+}
+
 u1 Type::isBoolean( void ) const
 {
     return id() == Type::BOOLEAN;
@@ -123,6 +134,11 @@ u1 Type::isRational( void ) const
     return id() == Type::RATIONAL;
 }
 
+u1 Type::isComposed( void ) const
+{
+    return isEnumeration() or isRange() or isTuple() or isList();
+}
+
 u1 Type::isEnumeration( void ) const
 {
     return id() == Type::ENUMERATION;
@@ -158,6 +174,11 @@ u1 Type::isFunctionReference( void ) const
     return id() == Type::FUNCTION_REFERENCE;
 }
 
+u1 Type::isAbstraction( void ) const
+{
+    return isFile() or isPort();
+}
+
 u1 Type::isFile( void ) const
 {
     return id() == Type::FILE;
@@ -244,7 +265,7 @@ std::string Type::token( const Type::ID id )
         {
             return "FuncRef";
         }
-        // abstract
+        // abstraction
         case FILE:
         {
             return "File";
@@ -1074,10 +1095,10 @@ FunctionReferenceType::FunctionReferenceType(
 
 //
 //
-// Abstract Type
+// Abstraction Type
 //
 
-AbstractType::AbstractType( Type::ID id )
+AbstractionType::AbstractionType( Type::ID id )
 : Type( id )
 {
 }
@@ -1088,7 +1109,7 @@ AbstractType::AbstractType( Type::ID id )
 //
 
 FileType::FileType( void )
-: AbstractType( Type::FILE )
+: AbstractionType( Type::FILE )
 {
     // TODO: PPA: add file properties?
 }
@@ -1120,7 +1141,7 @@ Constant FileType::choose( void ) const
 //
 
 PortType::PortType( void )
-: AbstractType( Type::PORT )
+: AbstractionType( Type::PORT )
 {
     // TODO: PPA: add port properties?
 }

diff --git a/src/Type.h b/src/Type.h
@@ -84,7 +84,7 @@ namespace libcasm_ir
             RULE_REFERENCE,
             FUNCTION_REFERENCE,
 
-            // abstract
+            // abstraction
             FILE,
             PORT,
 
@@ -133,23 +133,31 @@ namespace libcasm_ir
             return !operator==( rhs );
         }
 
+        u1 isSynthetic( void ) const;
         u1 isVoid( void ) const;
         u1 isLabel( void ) const;
         u1 isLocation( void ) const;
         u1 isRelation( void ) const;
+
+        u1 isPrimitive( void ) const;
         u1 isBoolean( void ) const;
         u1 isInteger( void ) const;
         u1 isBit( void ) const;
         u1 isString( void ) const;
         u1 isFloating( void ) const;
         u1 isRational( void ) const;
+
+        u1 isComposed( void ) const;
         u1 isEnumeration( void ) const;
         u1 isRange( void ) const;
         u1 isTuple( void ) const;
         u1 isList( void ) const;
+
         u1 isReference( void ) const;
         u1 isRuleReference( void ) const;
         u1 isFunctionReference( void ) const;
+
+        u1 isAbstraction( void ) const;
         u1 isFile( void ) const;
         u1 isPort( void ) const;
 
@@ -544,13 +552,13 @@ namespace libcasm_ir
             const Type::Ptr& result, const Types& arguments );
     };
 
-    class AbstractType : public Type
+    class AbstractionType : public Type
     {
       public:
-        AbstractType( Type::ID id );
+        AbstractionType( Type::ID id );
     };
 
-    class FileType final : public AbstractType
+    class FileType final : public AbstractionType
     {
       public:
         using Ptr = std::shared_ptr< FileType >;
@@ -568,7 +576,7 @@ namespace libcasm_ir
         Constant choose( void ) const override;
     };
 
-    class PortType final : public AbstractType
+    class PortType final : public AbstractionType
     {
       public:
         using Ptr = std::shared_ptr< PortType >;

diff --git a/uts/Type.cpp b/uts/Type.cpp
@@ -122,7 +122,7 @@ TEST( libcasm_ir__Type, id_to_token_string )
                 EXPECT_STREQ( Type::token( id ).c_str(), "FuncRef" );
                 break;
             }
-            // abstract
+            // abstraction
             case Type::FILE:
             {
                 EXPECT_STREQ( Type::token( id ).c_str(), "File" );