Changeset f0ecf9b for src/Parser

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/Parser

Files:

• DeclarationNode.cc (modified) (1 diff)
• TypeData.cc (modified) (2 diffs)

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() );