Changeset f0ecf9b

Timestamp:

Nov 1, 2017, 5:40:05 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

fde89cf6

Parents:

b0837e4

Message:

Remove TypeDecl::Any, as it is subsumed by Dtype+sized

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• GenPoly/InstantiateGeneric.cc (modified) (1 diff)
• GenPoly/ScrubTyVars.cc (modified) (1 diff)
• Parser/DeclarationNode.cc (modified) (1 diff)
• Parser/TypeData.cc (modified) (2 diffs)
• ResolvExpr/Unify.cc (modified) (1 diff)
• SymTab/Autogen.cc (modified) (1 diff)
• SymTab/Mangler.cc (modified) (2 diffs)
• SynTree/Declaration.h (modified) (3 diffs)
• SynTree/TypeDecl.cc (modified) (2 diffs)
• Tuples/TupleExpansion.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -288 +288 @@
                 assertf( ! genC, "TypeDecls should not reach code generation." );
                 output << typeDecl->genTypeString() << " " << typeDecl->name;
-                if ( typeDecl->get_kind() != TypeDecl::Any && typeDecl->sized ) {
+                if ( typeDecl->sized ) {
                         output << " | sized(" << typeDecl->name << ")";
                 }

src/GenPoly/InstantiateGeneric.cc

@@ -238 +238 @@
                                         assertf( false, "Ttype parameters are not currently allowed as parameters to generic types." );
                                         break;
-                                case TypeDecl::Any:
-                                        assertf( false, "otype parameters handled by baseParam->isComplete()." );
+                                default:
+                                        assertf( false, "Unhandled type parameter kind" );
                                         break;
                         }

src/GenPoly/ScrubTyVars.cc

@@ -40 +40 @@
                 if ( tyVar != tyVars->end() ) {
                         switch ( tyVar->second.kind ) {
-                          case TypeDecl::Any:
                           case TypeDecl::Dtype:
                           case TypeDecl::Ttype:

src/Parser/DeclarationNode.cc

@@ -1031 +1031 @@
 
         if ( variable.tyClass != NoTypeClass ) {
-                static const TypeDecl::Kind kindMap[] = { TypeDecl::Any, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype };
-                assertf( sizeof(kindMap)/sizeof(kindMap[0] == NoTypeClass-1), "DeclarationNode::build: kindMap is out of sync." );
+                // otype is internally converted to dtype + otype parameters
+                static const TypeDecl::Kind kindMap[] = { TypeDecl::Dtype, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype };
+                assertf( sizeof(kindMap)/sizeof(kindMap[0]) == NoTypeClass, "DeclarationNode::build: kindMap is out of sync." );
                 assertf( variable.tyClass < sizeof(kindMap)/sizeof(kindMap[0]), "Variable's tyClass is out of bounds." );
-                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.initializer ? variable.initializer->buildType() : nullptr );
+                TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == Otype, variable.initializer ? variable.initializer->buildType() : nullptr );
                 buildList( variable.assertions, ret->get_assertions() );
                 return ret;

src/Parser/TypeData.cc

@@ -406 +406 @@
 void buildForall( const DeclarationNode * firstNode, ForallList &outputList ) {
         buildList( firstNode, outputList );
-        for ( typename ForallList::iterator i = outputList.begin(); i != outputList.end(); ++i ) {
+        auto n = firstNode;
+        for ( typename ForallList::iterator i = outputList.begin(); i != outputList.end(); ++i, n = (DeclarationNode*)n->get_next() ) {
                 TypeDecl * td = static_cast<TypeDecl *>(*i);
-                if ( td->get_kind() == TypeDecl::Any ) {
+                if ( n->variable.tyClass == DeclarationNode::Otype ) {
                         // add assertion parameters to `type' tyvars in reverse order
                         // add dtor:  void ^?{}(T *)
@@ -798 +799 @@
                 ret = new TypedefDecl( name, scs, typebuild( td->base ), linkage );
         } else {
-                ret = new TypeDecl( name, scs, typebuild( td->base ), TypeDecl::Any );
+                ret = new TypeDecl( name, scs, typebuild( td->base ), TypeDecl::Dtype, true );
         } // if
         buildList( td->symbolic.params, ret->get_parameters() );

src/ResolvExpr/Unify.cc

@@ -138 +138 @@
         bool tyVarCompatible( const TypeDecl::Data & data, Type *type ) {
                 switch ( data.kind ) {
-                  case TypeDecl::Any:
                   case TypeDecl::Dtype:
                         // to bind to an object type variable, the type must not be a function type.

src/SymTab/Autogen.cc

@@ -696 +696 @@
                         if ( TypeInstType * ty = dynamic_cast< TypeInstType * >( t ) ) {
                                 if ( ! done.count( ty->get_baseType() ) ) {
-                                        TypeDecl * newDecl = new TypeDecl( ty->get_baseType()->get_name(), Type::StorageClasses(), nullptr, TypeDecl::Any );
+                                        TypeDecl * newDecl = new TypeDecl( ty->get_baseType()->get_name(), Type::StorageClasses(), nullptr, TypeDecl::Dtype, true );
                                         TypeInstType * inst = new TypeInstType( Type::Qualifiers(), newDecl->get_name(), newDecl );
                                         newDecl->get_assertions().push_back( new FunctionDecl( "?=?", Type::StorageClasses(), LinkageSpec::Cforall, genAssignType( inst ), nullptr,

src/SymTab/Mangler.cc

@@ -214 +214 @@
                         numStream << varNum->second.first;
                         switch ( (TypeDecl::Kind )varNum->second.second ) {
-                          case TypeDecl::Any:
-                                mangleName << "t";
-                                break;
                           case TypeDecl::Dtype:
                                 mangleName << "d";
@@ -274 +271 @@
                         for ( Type::ForallList::iterator i = type->forall.begin(); i != type->forall.end(); ++i ) {
                                 switch ( (*i)->get_kind() ) {
-                                  case TypeDecl::Any:
-                                        tcount++;
-                                        break;
                                   case TypeDecl::Dtype:
                                         dcount++;

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 ];
 }

src/Tuples/TupleExpansion.cc

@@ -204 +204 @@
                         decl->set_body( true );
                         for ( size_t i = 0; i < tupleSize; ++i ) {
-                                TypeDecl * tyParam = new TypeDecl( toString( "tuple_param_", tupleSize, "_", i ), Type::StorageClasses(), nullptr, TypeDecl::Any );
+                                TypeDecl * tyParam = new TypeDecl( toString( "tuple_param_", tupleSize, "_", i ), Type::StorageClasses(), nullptr, TypeDecl::Dtype, true );
                                 decl->get_members().push_back( new ObjectDecl( toString("field_", i ), Type::StorageClasses(), LinkageSpec::C, nullptr, new TypeInstType( Type::Qualifiers(), tyParam->get_name(), tyParam ), nullptr ) );
                                 decl->get_parameters().push_back( tyParam );