Changeset af75a87 for src/Validate

Timestamp:

Jul 13, 2022, 2:51:18 PM (22 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

1932e8a

Parents:

d4b37ab

Message:

Adjusted typedef replacement, attributes should be filtered with better timing now.

File:

• src/Validate/ReplaceTypedef.cpp (modified) (7 diffs)

src/Validate/ReplaceTypedef.cpp

@@ -10 +10 @@
 // Created On       : Tue Jun 29 14:59:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 12 14:17:00 2022
-// Update Count     : 0
+// Last Modified On : Wed Jul 13 14:45:00 2022
+// Update Count     : 1
 //
 
@@ -63 +63 @@
         void previsit( ast::TraitDecl const * );
 
-        void previsit( ast::FunctionType const * );
-
         template<typename AggrDecl>
         void addImplicitTypedef( AggrDecl * aggDecl );
@@ -78 +76 @@
         CodeLocation const * nearestLocation = nullptr;
         int scopeLevel;
-        bool inFunctionType = false;
+        bool isAtFunctionTop = false;
 };
 
@@ -105 +103 @@
                 ast::Type * ret = ast::deepCopy( def->second.first->base );
                 ret->qualifiers |= type->qualifiers;
-                // GCC ignores certain attributes if they arrive by typedef,
-                // this mimics that.
-                // TODO: This might cover too much, it should just cover arguments
-                //   and return values of a function.
-                if ( visitor->isInFunction() ) {
+                // We ignore certain attributes on function parameters if they arrive
+                // by typedef. GCC appears to do the same thing.
+                if ( isAtFunctionTop ) {
                         erase_if( ret->attributes, isNonParameterAttribute );
                 }
@@ -207 +203 @@
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
+        GuardValue( isAtFunctionTop ) = true;
 }
 
@@ -262 +259 @@
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
+        GuardValue( isAtFunctionTop ) = false;
         scopeLevel += 1;
 }
@@ -292 +290 @@
         GuardScope( typedefNames );
         GuardScope( typedeclNames );
-}
-
-void ReplaceTypedefCore::previsit( ast::FunctionType const * ) {
-        GuardValue( inFunctionType ) = true;
 }