Changeset 1cdfa82 for src/SymTab

Timestamp:

Apr 25, 2018, 4:55:53 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

Location:

src/SymTab

Files:

• Indexer.cc (modified) (1 diff)
• Validate.cc (modified) (10 diffs)

src/SymTab/Indexer.cc

@@ -501 +501 @@
 
         bool addedDeclConflicts( AggregateDecl *existing, AggregateDecl *added ) {
-                if ( existing->get_members().empty() ) {
+                if ( ! existing->body ) {
                         return false;
-                } else if ( ! added->get_members().empty() ) {
+                } else if ( added->body ) {
                         SemanticError( added, "redeclaration of " );
                 } // if

src/SymTab/Validate.cc

@@ -90 +90 @@
                 void previsit( StructDecl * aggregateDecl );
                 void previsit( UnionDecl * aggregateDecl );
+                void previsit( StaticAssertDecl * assertDecl );
 
           private:
@@ -148 +149 @@
                 void previsit( ObjectDecl * object );
                 void previsit( FunctionDecl * func );
+                void previsit( FunctionType * ftype );
                 void previsit( StructDecl * aggrDecl );
                 void previsit( UnionDecl * aggrDecl );
@@ -296 +298 @@
         }
 
-        bool isStructOrUnion( Declaration *decl ) {
-                return dynamic_cast< StructDecl * >( decl ) || dynamic_cast< UnionDecl * >( decl );
+        bool shouldHoist( Declaration *decl ) {
+                return dynamic_cast< StructDecl * >( decl ) || dynamic_cast< UnionDecl * >( decl ) || dynamic_cast< StaticAssertDecl * >( decl );
         }
 
@@ -310 +312 @@
                 } // if
                 // Always remove the hoisted aggregate from the inner structure.
-                GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, isStructOrUnion ); } );
+                GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, shouldHoist, false ); } );
         }
 
         void HoistStruct::previsit( EnumInstType * inst ) {
-                if ( inst->baseEnum ) {
+                if ( inst->baseEnum && inst->baseEnum->body ) {
                         declsToAddBefore.push_front( inst->baseEnum );
                 }
@@ -320 +322 @@
 
         void HoistStruct::previsit( StructInstType * inst ) {
-                if ( inst->baseStruct ) {
+                if ( inst->baseStruct && inst->baseStruct->body ) {
                         declsToAddBefore.push_front( inst->baseStruct );
                 }
@@ -326 +328 @@
 
         void HoistStruct::previsit( UnionInstType * inst ) {
-                if ( inst->baseUnion ) {
+                if ( inst->baseUnion && inst->baseUnion->body ) {
                         declsToAddBefore.push_front( inst->baseUnion );
+                }
+        }
+
+        void HoistStruct::previsit( StaticAssertDecl * assertDecl ) {
+                if ( parentAggr ) {
+                        declsToAddBefore.push_back( assertDecl );
                 }
         }
@@ -623 +631 @@
 
         void ForallPointerDecay::previsit( ObjectDecl *object ) {
-                forallFixer( object->type->forall, object );
-                if ( PointerType *pointer = dynamic_cast< PointerType * >( object->type ) ) {
-                        forallFixer( pointer->base->forall, object );
-                } // if
+                // ensure that operator names only apply to functions or function pointers
+                if ( CodeGen::isOperator( object->name ) && ! dynamic_cast< FunctionType * >( object->type->stripDeclarator() ) ) {
+                        SemanticError( object->location, toCString( "operator ", object->name.c_str(), " is not a function or function pointer." )  );
+                }
                 object->fixUniqueId();
         }
 
         void ForallPointerDecay::previsit( FunctionDecl *func ) {
-                forallFixer( func->type->forall, func );
                 func->fixUniqueId();
+        }
+
+        void ForallPointerDecay::previsit( FunctionType * ftype ) {
+                forallFixer( ftype->forall, ftype );
         }
 
@@ -681 +692 @@
                                 new_static_root<BasicType>( Type::Qualifiers(), BasicType::LongUnsignedInt );
                 }
-                filter( translationUnit, isTypedef );
+                filter( translationUnit, isTypedef, true );
         }
 
@@ -818 +829 @@
                         } // if
                         return false;
-                } );
+                }, true);
                 return compoundStmt;
         }
@@ -826 +837 @@
         template<typename AggDecl>
         AggDecl *EliminateTypedef::handleAggregate( AggDecl * aggDecl ) {
-                filter( aggDecl->members, isTypedef );
+                filter( aggDecl->members, isTypedef, true );
                 return aggDecl;
         }