Changeset 136ccd7 for src/SynTree

Timestamp:

Nov 3, 2017, 3:01:31 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4ee36bf0

Parents:

4ee1efb (diff), 760ba67 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

Location:

src/SynTree

Files:

• Declaration.h (modified) (3 diffs)
• TypeDecl.cc (modified) (2 diffs)

src/SynTree/Declaration.h

@@ -200 +200 @@
         typedef NamedTypeDecl Parent;
   public:
-        enum Kind { Any, Dtype, Ftype, Ttype };
+        enum Kind { Dtype, Ftype, Ttype };
 
         Type * init;
@@ -216 +216 @@
         };
 
-        TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, Type * init = nullptr );
+        TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, bool sized, Type * init = nullptr );
         TypeDecl( const TypeDecl &other );
         virtual ~TypeDecl();
@@ -225 +225 @@
         TypeDecl * set_init( Type * newValue ) { init = newValue; return this; }
 
-        bool isComplete() const { return kind == Any || sized; }
+        bool isComplete() const { return sized; }
         bool get_sized() const { return sized; }
         TypeDecl * set_sized( bool newValue ) { sized = newValue; return this; }

src/SynTree/TypeDecl.cc

@@ -21 +21 @@
 #include "Type.h"            // for Type, Type::StorageClasses
 
-TypeDecl::TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, Type * init ) : Parent( name, scs, type ), init( init ), sized( kind == Any || kind == Ttype ), kind( kind ) {
+TypeDecl::TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, bool sized, Type * init ) : Parent( name, scs, type ), init( init ), sized( kind == Ttype || sized ), kind( kind ) {
 }
 
@@ -32 +32 @@
 
 std::string TypeDecl::typeString() const {
-        static const std::string kindNames[] = { "type", "incomplete type", "function type", "tuple type" };
-        return (kind != Any && isComplete() ? "sized " : "") + kindNames[ kind ];
+        static const std::string kindNames[] = { "object type", "function type", "tuple type" };
+        assertf( sizeof(kindNames)/sizeof(kindNames[0]) == DeclarationNode::NoTypeClass-1, "typeString: kindNames is out of sync." );
+        assertf( kind < sizeof(kindNames)/sizeof(kindNames[0]), "TypeDecl's kind is out of bounds." );
+        return (isComplete() ? "sized " : "") + kindNames[ kind ];
 }
 
 std::string TypeDecl::genTypeString() const {
-        static const std::string kindNames[] = { "otype", "dtype", "ftype", "ttype" };
+        static const std::string kindNames[] = { "dtype", "ftype", "ttype" };
+        assertf( sizeof(kindNames)/sizeof(kindNames[0]) == DeclarationNode::NoTypeClass-1, "genTypeString: kindNames is out of sync." );
+        assertf( kind < sizeof(kindNames)/sizeof(kindNames[0]), "TypeDecl's kind is out of bounds." );
         return kindNames[ kind ];
 }