Changes in / [b0be3713:b62d1d6]

Location:

src

Files:

• AST/Pass.impl.hpp (modified) (1 diff)
• ResolvExpr/CurrentObject.cc (modified) (1 diff)
• SymTab/ValidateType.cc (modified) (1 diff)
• SynTree/Type.h (modified) (2 diffs)

src/AST/Pass.impl.hpp

@@ -648 +648 @@
         if ( __visit_children() ) {
                 // unlike structs, traits, and unions, enums inject their members into the global scope
+                maybe_accept( node, &EnumDecl::base );
                 maybe_accept( node, &EnumDecl::params     );
                 maybe_accept( node, &EnumDecl::members    );

src/ResolvExpr/CurrentObject.cc

@@ -73 +73 @@
                 virtual void setPosition( std::list< Expression * > & designators ) = 0;
 
-                /// retrieve the list of possible Type/Designaton pairs for the current position in the currect object
+                /// retrieve the list of possible Type/Designation pairs for the current position in the currect object
                 virtual std::list<InitAlternative> operator*() const = 0;
 

src/SymTab/ValidateType.cc

@@ -222 +222 @@
         // visit enum members first so that the types of self-referencing members are updated properly
         // Replace the enum base; right now it works only for StructEnum
-        if ( enumDecl->base && dynamic_cast<TypeInstType*>(enumDecl->base) ) {
-                std::string baseName = static_cast<TypeInstType*>(enumDecl->base)->name;
-                const StructDecl * st = local_indexer->lookupStruct( baseName );
-                if ( st ) {
-                        enumDecl->base = new StructInstType(Type::Qualifiers(),const_cast<StructDecl *>(st)); // Just linking in the node
+        if ( enumDecl->base ) {
+                if ( const TypeInstType * base = dynamic_cast< TypeInstType * >(enumDecl->base) ) {
+                        if ( const StructDecl * decl = local_indexer->lookupStruct( base->name ) ) {
+                                enumDecl->base = new StructInstType( Type::Qualifiers(), const_cast< StructDecl * >( decl ) ); // Just linking in the node
+                        }
+                } else if ( const PointerType * ptr = dynamic_cast< PointerType * >(enumDecl->base) ) {
+                        if ( const TypeInstType * ptrBase = dynamic_cast< TypeInstType * >( ptr->base ) ) {
+                                if ( const StructDecl * decl = local_indexer->lookupStruct( ptrBase->name ) ) {
+                                        enumDecl->base = new PointerType( Type::Qualifiers(),
+                                                new StructInstType( Type::Qualifiers(), const_cast< StructDecl * >( decl ) ) );
+                                }
+                        }
                 }
         }
+        
         if ( enumDecl->body ) {
                 ForwardEnumsType::iterator fwds = forwardEnums.find( enumDecl->name );

src/SynTree/Type.h

@@ -274 +274 @@
 class PointerType : public Type {
   public:
-        Type *base;
+        Type * base;
 
         // In C99, pointer types can be qualified in many ways e.g., int f( int a[ static 3 ] )
@@ -516 +516 @@
         typedef ReferenceToType Parent;
   public:
-        // this decl is not "owned" by the union inst; it is merely a pointer to elsewhere in the tree,
-        // where the union used in this type is actually defined
+        // this decl is not "owned" by the enum inst; it is merely a pointer to elsewhere in the tree,
+        // where the enum used in this type is actually defined
         EnumDecl *baseEnum = nullptr;