Changeset 7de22b28

Timestamp:

Jul 10, 2018, 3:53:38 PM (6 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

777ed2b

Parents:

d804830

git-author:

Rob Schluntz <rschlunt@…> (07/10/18 15:11:53)

git-committer:

Rob Schluntz <rschlunt@…> (07/10/18 15:53:38)

Message:

Call TypedefTable::makeTypedef with leaf type for nested aggregate definitions

Location:

src/Parser

Files:

• TypeData.cc (modified) (1 diff)
• TypeData.h (modified) (1 diff)
• parser.yy (modified) (1 diff)

src/Parser/TypeData.cc

@@ -423 +423 @@
         } // switch
 } // TypeData::print
+
+const std::string * TypeData::leafName() const {
+        switch ( kind ) {
+          case Unknown:
+          case Pointer:
+          case Reference:
+          case EnumConstant:
+          case GlobalScope:
+          case Array:
+          case Basic:
+          case Function:
+          case AggregateInst:
+          case Tuple:
+          case Typeof:
+          case Builtin:
+                assertf(false, "Tried to get leaf name from kind without a name: %d", kind);
+                break;
+          case Aggregate:
+                return aggregate.name;
+          case Enum:
+                return enumeration.name;
+          case Symbolic:
+          case SymbolicInst:
+                return symbolic.name;
+          case Qualified:
+                return qualified.child->leafName();
+        } // switch
+        assert(false);
+}
 
 

src/Parser/TypeData.h

@@ -109 +109 @@
         void print( std::ostream &, int indent = 0 ) const;
         TypeData * clone() const;
+
+        const std::string * leafName() const;
 };
 

src/Parser/parser.yy

@@ -1867 +1867 @@
         | aggregate_key attribute_list_opt type_name fred
                 {
-                        typedefTable.makeTypedef( *$3->type->symbolic.name, forall ? TYPEGENname : TYPEDEFname ); // create typedef
+                        // for type_name can be a qualified type name S.T, in which case only the last name in the chain needs a typedef (other names in the chain should already have one)
+                        typedefTable.makeTypedef( *$3->type->leafName(), forall ? TYPEGENname : TYPEDEFname ); // create typedef
                         forall = false;                                                         // reset
                 }