Changeset ae267366

Timestamp:

Feb 24, 2023, 3:31:50 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

2e77837

Parents:

f883ef1 (diff), f2a1cd2 (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:

fix merge conflict

Files:

• doc/theses/colby_parsons_MMAth/.gitignore (added)
• doc/theses/colby_parsons_MMAth/Makefile (added)
• doc/theses/colby_parsons_MMAth/local.bib (added)
• doc/theses/colby_parsons_MMAth/style/cfa-format.tex (added)
• doc/theses/colby_parsons_MMAth/style/style.tex (added)
• doc/theses/colby_parsons_MMAth/text/actors.tex (added)
• doc/theses/colby_parsons_MMAth/thesis.tex (added)
• libcfa/src/concurrency/kernel/cluster.hfa (modified) (1 diff)
• libcfa/src/interpose.cfa (modified) (2 diffs)
• libcfa/src/limits.cfa (modified) (1 diff)
• src/AST/Fwd.hpp (modified) (2 diffs)
• src/AST/Print.cpp (modified) (9 diffs)
• src/AST/Print.hpp (modified) (2 diffs)
• src/Parser/DeclarationNode.cc (modified) (8 diffs)
• src/Parser/ParseNode.h (modified) (3 diffs)
• src/Parser/TypeData.cc (modified) (2 diffs)
• src/Parser/TypeData.h (modified) (2 diffs)
• src/Parser/parser.yy (modified) (10 diffs)
• src/SynTree/Type.h (modified) (3 diffs)
• tests/.expect/attributes.x64.txt (modified) (1 diff)
• tests/.expect/declarationSpecifier.x64.txt (modified) (18 diffs)
• tests/attributes.cfa (modified) (2 diffs)
• tests/concurrent/signal/disjoint.cfa (modified) (1 diff)
• tests/declarationSpecifier.cfa (modified) (3 diffs)
• tests/forall.cfa (modified) (2 diffs)
• tests/include/includes.cfa (modified) (5 diffs)
• tests/io/comp_basic.cfa (modified) (1 diff)
• tests/io/comp_fair.cfa (modified) (1 diff)
• tests/quotedKeyword.cfa (modified) (1 diff)

libcfa/src/concurrency/kernel/cluster.hfa

@@ -146 +146 @@
 }
 
-static struct {
-        const unsigned readyq;
-        const unsigned io;
+const static struct {
+        unsigned readyq;
+        unsigned io;
 } __shard_factor = { 2, 1 };
 

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Feb 19 20:44:32 2023
-// Update Count     : 184
+// Last Modified On : Fri Feb 24 15:31:03 2023
+// Update Count     : 185
 //
 
@@ -101 +101 @@
                 preload_libgcc();
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
+                #pragma GCC diagnostic push
+                #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
                 INTERPOSE_LIBC( abort, version );
                 INTERPOSE_LIBC( exit , version );
-#pragma GCC diagnostic pop
+                #pragma GCC diagnostic pop
 
                 if(__cfathreadabi_interpose_startup) __cfathreadabi_interpose_startup( do_interpose_symbol );

libcfa/src/limits.cfa

@@ -10 +10 @@
 // Created On       : Wed Apr  6 18:06:52 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan  8 18:53:17 2023
-// Update Count     : 86
+// Last Modified On : Fri Feb 17 12:25:39 2023
+// Update Count     : 87
 //
 
-// need _GNU_SOURCE to access long double M_*l in math.h
 #include <limits.h>
 #include <float.h>

src/AST/Fwd.hpp

@@ -15 +15 @@
 
 #pragma once
+
+template<typename> struct bitfield;
 
 #include "AST/Node.hpp"
@@ -147 +149 @@
 class TranslationGlobal;
 
+// For the following types, only use the using type.
+namespace CV {
+        struct qualifier_flags;
+        using Qualifiers = bitfield<qualifier_flags>;
 }
+namespace Function {
+        struct spec_flags;
+        using Specs = bitfield<spec_flags>;
+}
+namespace Storage {
+        struct class_flags;
+        using Classes = bitfield<class_flags>;
+}
+namespace Linkage {
+        struct spec_flags;
+        using Spec = bitfield<spec_flags>;
+}
+
+}

src/AST/Print.cpp

@@ -29 +29 @@
 namespace ast {
 
-template <typename C, typename... T>
-constexpr array<C,sizeof...(T)> make_array(T&&... values)
-{
-        return array<C,sizeof...(T)>{
-                std::forward<T>(values)...
-        };
+namespace {
+
+template<typename C, typename... T>
+constexpr array<C, sizeof...(T)> make_array( T&&... values ) {
+        return array<C, sizeof...(T)>{ std::forward<T>( values )... };
+}
+
+namespace Names {
+        static constexpr auto FuncSpecifiers = make_array<const char*>(
+                "inline", "_Noreturn", "fortran"
+        );
+
+        static constexpr auto StorageClasses = make_array<const char*>(
+                "extern", "static", "auto", "register", "__thread", "_Thread_local"
+        );
+
+        static constexpr auto Qualifiers = make_array<const char*>(
+                "const", "restrict", "volatile", "mutex", "_Atomic"
+        );
+}
+
+template<typename bits_t, size_t N>
+void print( ostream & os, const bits_t & bits,
+                const array<const char *, N> & names ) {
+        if ( !bits.any() ) return;
+        for ( size_t i = 0 ; i < N ; i += 1 ) {
+                if ( bits[i] ) {
+                        os << names[i] << ' ';
+                }
+        }
 }
 
@@ -80 +104 @@
         static const char* Names[];
 
-        struct Names {
-                static constexpr auto FuncSpecifiers = make_array<const char*>(
-                        "inline", "_Noreturn", "fortran"
-                );
-
-                static constexpr auto StorageClasses = make_array<const char*>(
-                        "extern", "static", "auto", "register", "__thread", "_Thread_local"
-                );
-
-                static constexpr auto Qualifiers = make_array<const char*>(
-                        "const", "restrict", "volatile", "mutex", "_Atomic"
-                );
-        };
-
-        template<typename storage_t, size_t N>
-        void print(const storage_t & storage, const array<const char *, N> & Names ) {
-                if ( storage.any() ) {
-                        for ( size_t i = 0; i < Names.size(); i += 1 ) {
-                                if ( storage[i] ) {
-                                        os << Names[i] << ' ';
-                                }
-                        }
-                }
-        }
-
-        void print( const ast::Function::Specs & specs ) {
-                print(specs, Names::FuncSpecifiers);
-        }
-
-        void print( const ast::Storage::Classes & storage ) {
-                print(storage, Names::StorageClasses);
-        }
-
-        void print( const ast::CV::Qualifiers & qualifiers ) {
-                print(qualifiers, Names::Qualifiers);
-        }
-
         void print( const std::vector<ast::Label> & labels ) {
                 if ( labels.empty() ) return;
@@ -230 +217 @@
                 }
 
-                print( node->storage );
+                ast::print( os, node->storage );
                 os << node->typeString();
 
@@ -272 +259 @@
 
         void preprint( const ast::Type * node ) {
-                print( node->qualifiers );
+                ast::print( os, node->qualifiers );
         }
 
@@ -278 +265 @@
                 print( node->forall );
                 print( node->assertions );
-                print( node->qualifiers );
+                ast::print( os, node->qualifiers );
         }
 
         void preprint( const ast::BaseInstType * node ) {
                 print( node->attributes );
-                print( node->qualifiers );
+                ast::print( os, node->qualifiers );
         }
 
@@ -294 +281 @@
                 }
 
-                print( node->storage );
+                ast::print( os, node->storage );
 
                 if ( node->type ) {
@@ -338 +325 @@
                 if ( ! short_mode ) printAll( node->attributes );
 
-                print( node->storage );
-                print( node->funcSpec );
-
-
+                ast::print( os, node->storage );
+                ast::print( os, node->funcSpec );
 
                 if ( node->type && node->isTypeFixed ) {
@@ -1627 +1612 @@
 };
 
+} // namespace
+
 void print( ostream & os, const ast::Node * node, Indenter indent ) {
         Printer printer { os, indent, false };
@@ -1637 +1624 @@
 }
 
-// Annoyingly these needed to be defined out of line to avoid undefined references.
-// The size here needs to be explicit but at least the compiler will produce an error
-// if the wrong size is specified
-constexpr array<const char*, 3> Printer::Names::FuncSpecifiers;
-constexpr array<const char*, 6> Printer::Names::StorageClasses;
-constexpr array<const char*, 5> Printer::Names::Qualifiers;
+void print( ostream & os, Function::Specs specs ) {
+        print( os, specs, Names::FuncSpecifiers );
 }
+
+void print( ostream & os, Storage::Classes storage ) {
+        print( os, storage, Names::StorageClasses );
+}
+
+void print( ostream & os, CV::Qualifiers qualifiers ) {
+        print( os, qualifiers, Names::Qualifiers );
+}
+
+} // namespace ast

src/AST/Print.hpp

@@ -16 +16 @@
 #pragma once
 
-#include <iostream>
-#include <utility>   // for forward
+#include <iosfwd>
 
-#include "AST/Node.hpp"
+#include "AST/Fwd.hpp"
 #include "Common/Indenter.h"
 
 namespace ast {
-
-class Decl;
 
 /// Print a node with the given indenter
@@ -44 +41 @@
 }
 
+/// Print each cv-qualifier used in the set, followed by a space.
+void print( std::ostream & os, CV::Qualifiers );
+/// Print each function specifier used in the set, followed by a space.
+void print( std::ostream & os, Function::Specs );
+/// Print each storage class used in the set, followed by a space.
+void print( std::ostream & os, Storage::Classes );
+
 }

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 14:12:03 2023
-// Update Count     : 1388
+// Last Modified On : Fri Feb 24 11:10:03 2023
+// Update Count     : 1400
 //
 
@@ -61 +61 @@
         variable.initializer = nullptr;
 
-//      attr.name = nullptr;
-        attr.expr = nullptr;
-        attr.type = nullptr;
-
         assert.condition = nullptr;
         assert.message = nullptr;
@@ -70 +66 @@
 
 DeclarationNode::~DeclarationNode() {
-//      delete attr.name;
-        delete attr.expr;
-        delete attr.type;
-
 //      delete variable.name;
         delete variable.assertions;
@@ -115 +107 @@
         newnode->variable.initializer = maybeClone( variable.initializer );
 
-//      newnode->attr.name = attr.name ? new string( *attr.name ) : nullptr;
-        newnode->attr.expr = maybeClone( attr.expr );
-        newnode->attr.type = maybeClone( attr.type );
-
         newnode->assert.condition = maybeClone( assert.condition );
         newnode->assert.message = maybeClone( assert.message );
@@ -266 +254 @@
         newnode->type->enumeration.typed = typed;
         newnode->type->enumeration.hiding = hiding;
-        if ( base && base->type)  {
+        if ( base && base->type )  {
                 newnode->type->base = base->type;
         } // if
@@ -579 +567 @@
 
         checkQualifiers( type, q->type );
-        if ( (builtin == Zero || builtin == One) && q->type->qualifiers.val != 0 && error.length() == 0 ) {
+        if ( (builtin == Zero || builtin == One) && q->type->qualifiers.any() && error.length() == 0 ) {
                 SemanticWarning( yylloc, Warning::BadQualifiersZeroOne, Type::QualifiersNames[ilog2( q->type->qualifiers.val )], builtinTypeNames[builtin] );
         } // if
@@ -996 +984 @@
 
                         if ( DeclarationNode * extr = cur->extractAggregate() ) {
-                                // handle the case where a structure declaration is contained within an object or type declaration
+                                // Handle the case where a SUE declaration is contained within an object or type declaration.
+
+                                assert( cur->type );
+                                // Replace anonymous SUE name with typedef name to prevent anonymous naming problems across translation units.
+                                if ( cur->type->kind == TypeData::Symbolic && cur->type->symbolic.isTypedef ) {
+                                        assert( extr->type );
+                                        // Handle anonymous aggregates: typedef struct { int i; } foo
+                                        extr->type->qualifiers.reset();         // clear any CVs associated with the aggregate
+                                        if ( extr->type->kind == TypeData::Aggregate && extr->type->aggregate.anon ) {
+                                                delete extr->type->aggregate.name;
+                                                extr->type->aggregate.name = new string( "__anonymous_" + *cur->name );
+                                                extr->type->aggregate.anon = false;
+                                                assert( cur->type->base );
+                                                if ( cur->type->base ) {
+                                                        delete cur->type->base->aggInst.aggregate->aggregate.name;
+                                                        cur->type->base->aggInst.aggregate->aggregate.name = new string( "__anonymous_" + *cur->name );
+                                                        cur->type->base->aggInst.aggregate->aggregate.anon = false;
+                                                        cur->type->base->aggInst.aggregate->qualifiers.reset();
+                                                } // if
+                                        } // if
+                                        // Handle anonymous enumeration: typedef enum { A, B, C } foo
+                                        if ( extr->type->kind == TypeData::Enum && extr->type->enumeration.anon ) {
+                                                delete extr->type->enumeration.name;
+                                                extr->type->enumeration.name = new string( "__anonymous_" + *cur->name );
+                                                extr->type->enumeration.anon = false;
+                                                assert( cur->type->base );
+                                                if ( cur->type->base ) {
+                                                        delete cur->type->base->aggInst.aggregate->enumeration.name;
+                                                        cur->type->base->aggInst.aggregate->enumeration.name = new string( "__anonymous_" + *cur->name );
+                                                        cur->type->base->aggInst.aggregate->enumeration.anon = false;
+                                                } // if
+                                        } // if
+                                } // if
 
                                 Declaration * decl = extr->build();
@@ -1213 +1233 @@
         assert( type );
 
-        if ( attr.expr ) {
-                return new AttrType( buildQualifiers( type ), *name, attr.expr->build(), attributes );
-        } else if ( attr.type ) {
-                return new AttrType( buildQualifiers( type ), *name, attr.type->buildType(), attributes );
-        } // if
-
         switch ( type->kind ) {
           case TypeData::Enum:

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Nov  2 21:27:07 2022
-// Update Count     : 939
+// Last Modified On : Sun Feb 19 09:02:37 2023
+// Update Count     : 940
 //
 
@@ -325 +325 @@
         Variable_t variable;
 
-        struct Attr_t {
-//              const std::string * name;
-                ExpressionNode * expr;
-                DeclarationNode * type;
-        };
-        Attr_t attr;
-
         struct StaticAssert_t {
                 ExpressionNode * condition;
@@ -343 +336 @@
 
         bool inLine = false;
-        bool enumInLine = false; 
+        bool enumInLine = false;
         Type::FuncSpecifiers funcSpecs;
         Type::StorageClasses storageClasses;

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 10 22:36:52 2022
-// Update Count     : 677
+// Last Modified On : Sun Feb 19 11:00:46 2023
+// Update Count     : 679
 //
 
@@ -375 +375 @@
                 break;
           case Enum:
-                os << "enumeration ";
+                os << "enumeration " << *enumeration.name << endl;;
                 if ( enumeration.constants ) {
                         os << "with constants" << endl;

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 10 22:18:49 2022
-// Update Count     : 203
+// Last Modified On : Fri Feb 24 14:25:02 2023
+// Update Count     : 205
 //
 
@@ -37 +37 @@
                 bool body;
                 bool anon;
-
                 bool tagged;
                 const std::string * parent = nullptr;
         };
 
-        struct AggInst_t {
+        struct AggInst_t {                                                                      // handles SUE
                 TypeData * aggregate = nullptr;
                 ExpressionNode * params = nullptr;

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb 14 21:11:39 2023
-// Update Count     : 5893
+// Last Modified On : Fri Feb 24 14:46:55 2023
+// Update Count     : 5983
 //
 
@@ -1941 +1941 @@
                         // if type_specifier is an anon aggregate => name 
                         typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "4" );
-                        $$ = $3->addType( $2 )->addTypedef();
+                        $$ = $3->addType( $2 )->addTypedef();           // watchout frees $2 and $3
                 }
         | typedef_declaration pop ',' push declarator
@@ -1983 +1983 @@
         | typedef_expression                                                            // deprecated GCC, naming expression type
         | sue_declaration_specifier
+                {
+                        assert( $1->type );
+                        if ( $1->type->qualifiers.any() ) {                     // CV qualifiers ?
+                                SemanticError( yylloc, "Useless type qualifier(s) in empty declaration." ); $$ = nullptr;
+                        }
+                        // enums are never empty declarations because there must have at least one enumeration.
+                        if ( $1->type->kind == TypeData::AggregateInst && $1->storageClasses.any() ) { // storage class ?
+                                SemanticError( yylloc, "Useless storage qualifier(s) in empty aggregate declaration." ); $$ = nullptr;
+                        }
+                }
         ;
 
@@ -2000 +2010 @@
         | sue_declaration_specifier invalid_types
                 {
-                        SemanticError( yylloc,
-                                                  ::toString( "Missing ';' after end of ",
-                                                                          $1->type->enumeration.name ? "enum" : AggregateDecl::aggrString( $1->type->aggregate.kind ),
-                                                                          " declaration" ) );
+                        SemanticError( yylloc, ::toString( "Missing ';' after end of ",
+                                $1->type->enumeration.name ? "enum" : AggregateDecl::aggrString( $1->type->aggregate.kind ),
+                                " declaration" ) );
                         $$ = nullptr;
                 }
@@ -2582 +2591 @@
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt '{' enumerator_list comma_opt '}'
                 {
-                        if ( $3->storageClasses.val != 0 || $3->type->qualifiers.val != 0 )
+                        if ( $3->storageClasses.val != 0 || $3->type->qualifiers.any() )
                         { SemanticError( yylloc, "storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); }
 
@@ -2593 +2602 @@
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt identifier attribute_list_opt
                 {
-                        if ( $3->storageClasses.val != 0 || $3->type->qualifiers.val != 0 ) { SemanticError( yylloc, "storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); }
+                        if ( $3->storageClasses.any() || $3->type->qualifiers.val != 0 ) { SemanticError( yylloc, "storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); }
                         typedefTable.makeTypedef( *$6 );
                 }
@@ -3052 +3061 @@
                 { $$ = DeclarationNode::newDirectiveStmt( new StatementNode( build_directive( $1 ) ) ); }
         | declaration
+                {
+                        // Variable declarations of anonymous types requires creating a unique type-name across multiple translation
+                        // unit, which is a dubious task, especially because C uses name rather than structural typing; hence it is
+                        // disallowed at the moment.
+                        if ( $1->linkage == LinkageSpec::Cforall && ! $1->storageClasses.is_static && $1->type && $1->type->kind == TypeData::AggregateInst ) {
+                                if ( $1->type->aggInst.aggregate->kind == TypeData::Enum && $1->type->aggInst.aggregate->enumeration.anon ) {
+                                        SemanticError( yylloc, "extern anonymous enumeration is currently unimplemented." ); $$ = nullptr;
+                                } else if ( $1->type->aggInst.aggregate->aggregate.anon ) { // handles struct or union
+                                        SemanticError( yylloc, "extern anonymous struct/union is currently unimplemented." ); $$ = nullptr;
+                                }
+                        }
+                }
         | IDENTIFIER IDENTIFIER
                 { IdentifierBeforeIdentifier( *$1.str, *$2.str, " declaration" ); $$ = nullptr; }
@@ -3097 +3118 @@
         | type_qualifier_list
                 {
-                        if ( $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
+                        if ( $1->type->qualifiers.any() ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
                         if ( $1->type->forall ) forall = true;          // remember generic type
                 }
@@ -3108 +3129 @@
         | declaration_qualifier_list
                 {
-                        if ( $1->type && $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
+                        if ( $1->type && $1->type->qualifiers.any() ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
                         if ( $1->type && $1->type->forall ) forall = true; // remember generic type
                 }
@@ -3119 +3140 @@
         | declaration_qualifier_list type_qualifier_list
                 {
-                        if ( ($1->type && $1->type->qualifiers.val) || ($2->type && $2->type->qualifiers.val) ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
+                        if ( ($1->type && $1->type->qualifiers.any()) || ($2->type && $2->type->qualifiers.any()) ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
                         if ( ($1->type && $1->type->forall) || ($2->type && $2->type->forall) ) forall = true; // remember generic type
                 }

src/SynTree/Type.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb 13 17:13:52 2023
-// Update Count     : 173
+// Last Modified On : Sun Feb 19 22:37:10 2023
+// Update Count     : 176
 //
 
@@ -125 +125 @@
                 bool operator!=( Qualifiers other ) const { return (val & Mask) != (other.val & Mask); }
                 bool operator<=( Qualifiers other ) const {
-                        return is_const    <= other.is_const        //Any non-const converts to const without cost
-                                        && is_volatile <= other.is_volatile     //Any non-volatile converts to volatile without cost
-                                        && is_mutex    >= other.is_mutex        //Any mutex converts to non-mutex without cost
-                                        && is_atomic   == other.is_atomic;      //No conversion from atomic to non atomic is free
+                        return is_const    <= other.is_const        // Any non-const converts to const without cost
+                                && is_volatile <= other.is_volatile             // Any non-volatile converts to volatile without cost
+                                && is_mutex    >= other.is_mutex                // Any mutex converts to non-mutex without cost
+                                && is_atomic   == other.is_atomic;              // No conversion from atomic to non atomic is free
                 }
                 bool operator<( Qualifiers other ) const { return *this != other && *this <= other; }
@@ -632 +632 @@
 class TypeofType : public Type {
   public:
-        Expression * expr;    ///< expression to take the type of
-        bool is_basetypeof;  ///< true iff is basetypeof type
+        Expression * expr;              ///< expression to take the type of
+        bool is_basetypeof;             ///< true iff is basetypeof type
 
         TypeofType( const Type::Qualifiers & tq, Expression * expr, const std::list< Attribute * > & attributes = std::list< Attribute * >() );

tests/.expect/attributes.x64.txt

@@ -26 +26 @@
     return _X4_retS12__anonymous0_1;
 }
-__attribute__ ((unused)) struct __anonymous0 _X5DummyS12__anonymous0_1;
+__attribute__ ((unused)) static struct __anonymous0 _X5DummyS12__anonymous0_1;
 struct __attribute__ ((unused)) Agn1;
 struct __attribute__ ((unused)) Agn2 {

tests/.expect/declarationSpecifier.x64.txt

@@ -51 +51 @@
 
 }
-volatile const struct __anonymous0 _X3x10KVS12__anonymous0_1;
+static volatile const struct __anonymous0 _X3x10KVS12__anonymous0_1;
 struct __anonymous1 {
     signed int _X1ii_1;
@@ -96 +96 @@
 
 }
-volatile const struct __anonymous1 _X3x11KVS12__anonymous1_1;
+static volatile const struct __anonymous1 _X3x11KVS12__anonymous1_1;
 struct __anonymous2 {
     signed int _X1ii_1;
@@ -141 +141 @@
 
 }
-volatile const struct __anonymous2 _X3x12KVS12__anonymous2_1;
+static volatile const struct __anonymous2 _X3x12KVS12__anonymous2_1;
 struct __anonymous3 {
     signed int _X1ii_1;
@@ -322 +322 @@
 }
 static volatile const struct __anonymous6 _X3x16KVS12__anonymous6_1;
-struct __anonymous7 {
-    signed int _X1ii_1;
-};
-static inline void _X12_constructorFv_S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1);
-static inline void _X12_constructorFv_S12__anonymous7S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, struct __anonymous7 _X4_srcS12__anonymous7_1);
-static inline void _X11_destructorFv_S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1);
-static inline struct __anonymous7 _X16_operator_assignFS12__anonymous7_S12__anonymous7S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, struct __anonymous7 _X4_srcS12__anonymous7_1);
-static inline void _X12_constructorFv_S12__anonymous7i_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, signed int _X1ii_1);
-static inline void _X12_constructorFv_S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1){
-    {
-        ((void)((*_X4_dstS12__anonymous7_1)._X1ii_1) /* ?{} */);
-    }
-
-}
-static inline void _X12_constructorFv_S12__anonymous7S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, struct __anonymous7 _X4_srcS12__anonymous7_1){
-    {
-        ((void)((*_X4_dstS12__anonymous7_1)._X1ii_1=_X4_srcS12__anonymous7_1._X1ii_1) /* ?{} */);
-    }
-
-}
-static inline void _X11_destructorFv_S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1){
-    {
-        ((void)((*_X4_dstS12__anonymous7_1)._X1ii_1) /* ^?{} */);
-    }
-
-}
-static inline struct __anonymous7 _X16_operator_assignFS12__anonymous7_S12__anonymous7S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, struct __anonymous7 _X4_srcS12__anonymous7_1){
-    struct __anonymous7 _X4_retS12__anonymous7_1;
-    {
-        ((void)((*_X4_dstS12__anonymous7_1)._X1ii_1=_X4_srcS12__anonymous7_1._X1ii_1));
-    }
-
-    {
-        ((void)_X12_constructorFv_S12__anonymous7S12__anonymous7_autogen___1((&_X4_retS12__anonymous7_1), (*_X4_dstS12__anonymous7_1)));
-    }
-
-    return _X4_retS12__anonymous7_1;
-}
-static inline void _X12_constructorFv_S12__anonymous7i_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, signed int _X1ii_1){
-    {
-        ((void)((*_X4_dstS12__anonymous7_1)._X1ii_1=_X1ii_1) /* ?{} */);
-    }
-
-}
-static volatile const struct __anonymous7 _X3x17KVS12__anonymous7_1;
 volatile const signed short int _X3x20KVs_1;
 static volatile const signed short int _X3x21KVs_1;
@@ -375 +330 @@
 static volatile const signed short int _X3x26KVs_1;
 static volatile const signed short int _X3x27KVs_1;
+struct __anonymous7 {
+    signed short int _X1is_1;
+};
+static inline void _X12_constructorFv_S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1);
+static inline void _X12_constructorFv_S12__anonymous7S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, struct __anonymous7 _X4_srcS12__anonymous7_1);
+static inline void _X11_destructorFv_S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1);
+static inline struct __anonymous7 _X16_operator_assignFS12__anonymous7_S12__anonymous7S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, struct __anonymous7 _X4_srcS12__anonymous7_1);
+static inline void _X12_constructorFv_S12__anonymous7s_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, signed short int _X1is_1);
+static inline void _X12_constructorFv_S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1){
+    {
+        ((void)((*_X4_dstS12__anonymous7_1)._X1is_1) /* ?{} */);
+    }
+
+}
+static inline void _X12_constructorFv_S12__anonymous7S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, struct __anonymous7 _X4_srcS12__anonymous7_1){
+    {
+        ((void)((*_X4_dstS12__anonymous7_1)._X1is_1=_X4_srcS12__anonymous7_1._X1is_1) /* ?{} */);
+    }
+
+}
+static inline void _X11_destructorFv_S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1){
+    {
+        ((void)((*_X4_dstS12__anonymous7_1)._X1is_1) /* ^?{} */);
+    }
+
+}
+static inline struct __anonymous7 _X16_operator_assignFS12__anonymous7_S12__anonymous7S12__anonymous7_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, struct __anonymous7 _X4_srcS12__anonymous7_1){
+    struct __anonymous7 _X4_retS12__anonymous7_1;
+    {
+        ((void)((*_X4_dstS12__anonymous7_1)._X1is_1=_X4_srcS12__anonymous7_1._X1is_1));
+    }
+
+    {
+        ((void)_X12_constructorFv_S12__anonymous7S12__anonymous7_autogen___1((&_X4_retS12__anonymous7_1), (*_X4_dstS12__anonymous7_1)));
+    }
+
+    return _X4_retS12__anonymous7_1;
+}
+static inline void _X12_constructorFv_S12__anonymous7s_autogen___1(struct __anonymous7 *_X4_dstS12__anonymous7_1, signed short int _X1is_1){
+    {
+        ((void)((*_X4_dstS12__anonymous7_1)._X1is_1=_X1is_1) /* ?{} */);
+    }
+
+}
+static volatile const struct __anonymous7 _X3x29KVS12__anonymous7_1;
 struct __anonymous8 {
     signed short int _X1is_1;
@@ -419 +419 @@
 
 }
-volatile const struct __anonymous8 _X3x29KVS12__anonymous8_1;
+static volatile const struct __anonymous8 _X3x30KVS12__anonymous8_1;
 struct __anonymous9 {
     signed short int _X1is_1;
@@ -464 +464 @@
 
 }
-volatile const struct __anonymous9 _X3x30KVS12__anonymous9_1;
+static volatile const struct __anonymous9 _X3x31KVS12__anonymous9_1;
 struct __anonymous10 {
     signed short int _X1is_1;
@@ -509 +509 @@
 
 }
-volatile const struct __anonymous10 _X3x31KVS13__anonymous10_1;
+static volatile const struct __anonymous10 _X3x32KVS13__anonymous10_1;
 struct __anonymous11 {
     signed short int _X1is_1;
@@ -554 +554 @@
 
 }
-static volatile const struct __anonymous11 _X3x32KVS13__anonymous11_1;
+static volatile const struct __anonymous11 _X3x33KVS13__anonymous11_1;
 struct __anonymous12 {
     signed short int _X1is_1;
@@ -599 +599 @@
 
 }
-static volatile const struct __anonymous12 _X3x33KVS13__anonymous12_1;
+static volatile const struct __anonymous12 _X3x34KVS13__anonymous12_1;
 struct __anonymous13 {
     signed short int _X1is_1;
@@ -644 +644 @@
 
 }
-static volatile const struct __anonymous13 _X3x34KVS13__anonymous13_1;
-struct __anonymous14 {
-    signed short int _X1is_1;
-};
-static inline void _X12_constructorFv_S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1);
-static inline void _X12_constructorFv_S13__anonymous14S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, struct __anonymous14 _X4_srcS13__anonymous14_1);
-static inline void _X11_destructorFv_S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1);
-static inline struct __anonymous14 _X16_operator_assignFS13__anonymous14_S13__anonymous14S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, struct __anonymous14 _X4_srcS13__anonymous14_1);
-static inline void _X12_constructorFv_S13__anonymous14s_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, signed short int _X1is_1);
-static inline void _X12_constructorFv_S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1){
-    {
-        ((void)((*_X4_dstS13__anonymous14_1)._X1is_1) /* ?{} */);
-    }
-
-}
-static inline void _X12_constructorFv_S13__anonymous14S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, struct __anonymous14 _X4_srcS13__anonymous14_1){
-    {
-        ((void)((*_X4_dstS13__anonymous14_1)._X1is_1=_X4_srcS13__anonymous14_1._X1is_1) /* ?{} */);
-    }
-
-}
-static inline void _X11_destructorFv_S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1){
-    {
-        ((void)((*_X4_dstS13__anonymous14_1)._X1is_1) /* ^?{} */);
-    }
-
-}
-static inline struct __anonymous14 _X16_operator_assignFS13__anonymous14_S13__anonymous14S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, struct __anonymous14 _X4_srcS13__anonymous14_1){
-    struct __anonymous14 _X4_retS13__anonymous14_1;
-    {
-        ((void)((*_X4_dstS13__anonymous14_1)._X1is_1=_X4_srcS13__anonymous14_1._X1is_1));
-    }
-
-    {
-        ((void)_X12_constructorFv_S13__anonymous14S13__anonymous14_autogen___1((&_X4_retS13__anonymous14_1), (*_X4_dstS13__anonymous14_1)));
-    }
-
-    return _X4_retS13__anonymous14_1;
-}
-static inline void _X12_constructorFv_S13__anonymous14s_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, signed short int _X1is_1){
-    {
-        ((void)((*_X4_dstS13__anonymous14_1)._X1is_1=_X1is_1) /* ?{} */);
-    }
-
-}
-static volatile const struct __anonymous14 _X3x35KVS13__anonymous14_1;
-struct __anonymous15 {
-    signed short int _X1is_1;
-};
-static inline void _X12_constructorFv_S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1);
-static inline void _X12_constructorFv_S13__anonymous15S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, struct __anonymous15 _X4_srcS13__anonymous15_1);
-static inline void _X11_destructorFv_S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1);
-static inline struct __anonymous15 _X16_operator_assignFS13__anonymous15_S13__anonymous15S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, struct __anonymous15 _X4_srcS13__anonymous15_1);
-static inline void _X12_constructorFv_S13__anonymous15s_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, signed short int _X1is_1);
-static inline void _X12_constructorFv_S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1){
-    {
-        ((void)((*_X4_dstS13__anonymous15_1)._X1is_1) /* ?{} */);
-    }
-
-}
-static inline void _X12_constructorFv_S13__anonymous15S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, struct __anonymous15 _X4_srcS13__anonymous15_1){
-    {
-        ((void)((*_X4_dstS13__anonymous15_1)._X1is_1=_X4_srcS13__anonymous15_1._X1is_1) /* ?{} */);
-    }
-
-}
-static inline void _X11_destructorFv_S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1){
-    {
-        ((void)((*_X4_dstS13__anonymous15_1)._X1is_1) /* ^?{} */);
-    }
-
-}
-static inline struct __anonymous15 _X16_operator_assignFS13__anonymous15_S13__anonymous15S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, struct __anonymous15 _X4_srcS13__anonymous15_1){
-    struct __anonymous15 _X4_retS13__anonymous15_1;
-    {
-        ((void)((*_X4_dstS13__anonymous15_1)._X1is_1=_X4_srcS13__anonymous15_1._X1is_1));
-    }
-
-    {
-        ((void)_X12_constructorFv_S13__anonymous15S13__anonymous15_autogen___1((&_X4_retS13__anonymous15_1), (*_X4_dstS13__anonymous15_1)));
-    }
-
-    return _X4_retS13__anonymous15_1;
-}
-static inline void _X12_constructorFv_S13__anonymous15s_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, signed short int _X1is_1){
-    {
-        ((void)((*_X4_dstS13__anonymous15_1)._X1is_1=_X1is_1) /* ?{} */);
-    }
-
-}
-static volatile const struct __anonymous15 _X3x36KVS13__anonymous15_1;
+static volatile const struct __anonymous13 _X3x35KVS13__anonymous13_1;
 _Thread_local signed int _X3x37i_1;
 __thread signed int _X3x38i_1;
@@ -753 +663 @@
 static inline volatile const signed short int _X3f27Fs___1();
 static inline volatile const signed short int _X3f28Fs___1();
+struct __anonymous14 {
+    signed int _X1ii_1;
+};
+static inline void _X12_constructorFv_S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1);
+static inline void _X12_constructorFv_S13__anonymous14S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, struct __anonymous14 _X4_srcS13__anonymous14_1);
+static inline void _X11_destructorFv_S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1);
+static inline struct __anonymous14 _X16_operator_assignFS13__anonymous14_S13__anonymous14S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, struct __anonymous14 _X4_srcS13__anonymous14_1);
+static inline void _X12_constructorFv_S13__anonymous14i_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, signed int _X1ii_1);
+static inline void _X12_constructorFv_S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1){
+    {
+        ((void)((*_X4_dstS13__anonymous14_1)._X1ii_1) /* ?{} */);
+    }
+
+}
+static inline void _X12_constructorFv_S13__anonymous14S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, struct __anonymous14 _X4_srcS13__anonymous14_1){
+    {
+        ((void)((*_X4_dstS13__anonymous14_1)._X1ii_1=_X4_srcS13__anonymous14_1._X1ii_1) /* ?{} */);
+    }
+
+}
+static inline void _X11_destructorFv_S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1){
+    {
+        ((void)((*_X4_dstS13__anonymous14_1)._X1ii_1) /* ^?{} */);
+    }
+
+}
+static inline struct __anonymous14 _X16_operator_assignFS13__anonymous14_S13__anonymous14S13__anonymous14_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, struct __anonymous14 _X4_srcS13__anonymous14_1){
+    struct __anonymous14 _X4_retS13__anonymous14_1;
+    {
+        ((void)((*_X4_dstS13__anonymous14_1)._X1ii_1=_X4_srcS13__anonymous14_1._X1ii_1));
+    }
+
+    {
+        ((void)_X12_constructorFv_S13__anonymous14S13__anonymous14_autogen___1((&_X4_retS13__anonymous14_1), (*_X4_dstS13__anonymous14_1)));
+    }
+
+    return _X4_retS13__anonymous14_1;
+}
+static inline void _X12_constructorFv_S13__anonymous14i_autogen___1(struct __anonymous14 *_X4_dstS13__anonymous14_1, signed int _X1ii_1){
+    {
+        ((void)((*_X4_dstS13__anonymous14_1)._X1ii_1=_X1ii_1) /* ?{} */);
+    }
+
+}
+static inline volatile const struct __anonymous14 _X3f31FS13__anonymous14___1();
+struct __anonymous15 {
+    signed int _X1ii_1;
+};
+static inline void _X12_constructorFv_S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1);
+static inline void _X12_constructorFv_S13__anonymous15S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, struct __anonymous15 _X4_srcS13__anonymous15_1);
+static inline void _X11_destructorFv_S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1);
+static inline struct __anonymous15 _X16_operator_assignFS13__anonymous15_S13__anonymous15S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, struct __anonymous15 _X4_srcS13__anonymous15_1);
+static inline void _X12_constructorFv_S13__anonymous15i_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, signed int _X1ii_1);
+static inline void _X12_constructorFv_S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1){
+    {
+        ((void)((*_X4_dstS13__anonymous15_1)._X1ii_1) /* ?{} */);
+    }
+
+}
+static inline void _X12_constructorFv_S13__anonymous15S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, struct __anonymous15 _X4_srcS13__anonymous15_1){
+    {
+        ((void)((*_X4_dstS13__anonymous15_1)._X1ii_1=_X4_srcS13__anonymous15_1._X1ii_1) /* ?{} */);
+    }
+
+}
+static inline void _X11_destructorFv_S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1){
+    {
+        ((void)((*_X4_dstS13__anonymous15_1)._X1ii_1) /* ^?{} */);
+    }
+
+}
+static inline struct __anonymous15 _X16_operator_assignFS13__anonymous15_S13__anonymous15S13__anonymous15_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, struct __anonymous15 _X4_srcS13__anonymous15_1){
+    struct __anonymous15 _X4_retS13__anonymous15_1;
+    {
+        ((void)((*_X4_dstS13__anonymous15_1)._X1ii_1=_X4_srcS13__anonymous15_1._X1ii_1));
+    }
+
+    {
+        ((void)_X12_constructorFv_S13__anonymous15S13__anonymous15_autogen___1((&_X4_retS13__anonymous15_1), (*_X4_dstS13__anonymous15_1)));
+    }
+
+    return _X4_retS13__anonymous15_1;
+}
+static inline void _X12_constructorFv_S13__anonymous15i_autogen___1(struct __anonymous15 *_X4_dstS13__anonymous15_1, signed int _X1ii_1){
+    {
+        ((void)((*_X4_dstS13__anonymous15_1)._X1ii_1=_X1ii_1) /* ?{} */);
+    }
+
+}
+static inline volatile const struct __anonymous15 _X3f32FS13__anonymous15___1();
 struct __anonymous16 {
     signed int _X1ii_1;
@@ -797 +797 @@
 
 }
-static inline volatile const struct __anonymous16 _X3f31FS13__anonymous16___1();
+static inline volatile const struct __anonymous16 _X3f33FS13__anonymous16___1();
 struct __anonymous17 {
     signed int _X1ii_1;
@@ -842 +842 @@
 
 }
-static inline volatile const struct __anonymous17 _X3f32FS13__anonymous17___1();
+static inline volatile const struct __anonymous17 _X3f34FS13__anonymous17___1();
 struct __anonymous18 {
     signed int _X1ii_1;
@@ -887 +887 @@
 
 }
-static inline volatile const struct __anonymous18 _X3f33FS13__anonymous18___1();
+static inline volatile const struct __anonymous18 _X3f35FS13__anonymous18___1();
 struct __anonymous19 {
     signed int _X1ii_1;
@@ -932 +932 @@
 
 }
-static inline volatile const struct __anonymous19 _X3f34FS13__anonymous19___1();
+static inline volatile const struct __anonymous19 _X3f36FS13__anonymous19___1();
 struct __anonymous20 {
     signed int _X1ii_1;
@@ -977 +977 @@
 
 }
-static inline volatile const struct __anonymous20 _X3f35FS13__anonymous20___1();
+static inline volatile const struct __anonymous20 _X3f37FS13__anonymous20___1();
 struct __anonymous21 {
     signed int _X1ii_1;
@@ -1022 +1022 @@
 
 }
-static inline volatile const struct __anonymous21 _X3f36FS13__anonymous21___1();
-struct __anonymous22 {
-    signed int _X1ii_1;
-};
-static inline void _X12_constructorFv_S13__anonymous22_autogen___1(struct __anonymous22 *_X4_dstS13__anonymous22_1);
-static inline void _X12_constructorFv_S13__anonymous22S13__anonymous22_autogen___1(struct __anonymous22 *_X4_dstS13__anonymous22_1, struct __anonymous22 _X4_srcS13__anonymous22_1);
-static inline void _X11_destructorFv_S13__anonymous22_autogen___1(struct __anonymous22 *_X4_dstS13__anonymous22_1);
-static inline struct __anonymous22 _X16_operator_assignFS13__anonymous22_S13__anonymous22S13__anonymous22_autogen___1(struct __anonymous22 *_X4_dstS13__anonymous22_1, struct __anonymous22 _X4_srcS13__anonymous22_1);
-static inline void _X12_constructorFv_S13__anonymous22i_autogen___1(struct __anonymous22 *_X4_dstS13__anonymous22_1, signed int _X1ii_1);
-static inline void _X12_constructorFv_S13__anonymous22_autogen___1(struct __anonymous22 *_X4_dstS13__anonymous22_1){
-    {
-        ((void)((*_X4_dstS13__anonymous22_1)._X1ii_1) /* ?{} */);
-    }
-
-}
-static inline void _X12_constructorFv_S13__anonymous22S13__anonymous22_autogen___1(struct __anonymous22 *_X4_dstS13__anonymous22_1, struct __anonymous22 _X4_srcS13__anonymous22_1){
-    {
-        ((void)((*_X4_dstS13__anonymous22_1)._X1ii_1=_X4_srcS13__anonymous22_1._X1ii_1) /* ?{} */);
-    }
-
-}
-static inline void _X11_destructorFv_S13__anonymous22_autogen___1(struct __anonymous22 *_X4_dstS13__anonymous22_1){
-    {
-        ((void)((*_X4_dstS13__anonymous22_1)._X1ii_1) /* ^?{} */);
-    }
-
-}
-static inline struct __anonymous22 _X16_operator_assignFS13__anonymous22_S13__anonymous22S13__anonymous22_autogen___1(struct __anonymous22 *_X4_dstS13__anonymous22_1, struct __anonymous22 _X4_srcS13__anonymous22_1){
-    struct __anonymous22 _X4_retS13__anonymous22_1;
-    {
-        ((void)((*_X4_dstS13__anonymous22_1)._X1ii_1=_X4_srcS13__anonymous22_1._X1ii_1));
-    }
-
-    {
-        ((void)_X12_constructorFv_S13__anonymous22S13__anonymous22_autogen___1((&_X4_retS13__anonymous22_1), (*_X4_dstS13__anonymous22_1)));
-    }
-
-    return _X4_retS13__anonymous22_1;
-}
-static inline void _X12_constructorFv_S13__anonymous22i_autogen___1(struct __anonymous22 *_X4_dstS13__anonymous22_1, signed int _X1ii_1){
-    {
-        ((void)((*_X4_dstS13__anonymous22_1)._X1ii_1=_X1ii_1) /* ?{} */);
-    }
-
-}
-static inline volatile const struct __anonymous22 _X3f37FS13__anonymous22___1();
-struct __anonymous23 {
-    signed int _X1ii_1;
-};
-static inline void _X12_constructorFv_S13__anonymous23_autogen___1(struct __anonymous23 *_X4_dstS13__anonymous23_1);
-static inline void _X12_constructorFv_S13__anonymous23S13__anonymous23_autogen___1(struct __anonymous23 *_X4_dstS13__anonymous23_1, struct __anonymous23 _X4_srcS13__anonymous23_1);
-static inline void _X11_destructorFv_S13__anonymous23_autogen___1(struct __anonymous23 *_X4_dstS13__anonymous23_1);
-static inline struct __anonymous23 _X16_operator_assignFS13__anonymous23_S13__anonymous23S13__anonymous23_autogen___1(struct __anonymous23 *_X4_dstS13__anonymous23_1, struct __anonymous23 _X4_srcS13__anonymous23_1);
-static inline void _X12_constructorFv_S13__anonymous23i_autogen___1(struct __anonymous23 *_X4_dstS13__anonymous23_1, signed int _X1ii_1);
-static inline void _X12_constructorFv_S13__anonymous23_autogen___1(struct __anonymous23 *_X4_dstS13__anonymous23_1){
-    {
-        ((void)((*_X4_dstS13__anonymous23_1)._X1ii_1) /* ?{} */);
-    }
-
-}
-static inline void _X12_constructorFv_S13__anonymous23S13__anonymous23_autogen___1(struct __anonymous23 *_X4_dstS13__anonymous23_1, struct __anonymous23 _X4_srcS13__anonymous23_1){
-    {
-        ((void)((*_X4_dstS13__anonymous23_1)._X1ii_1=_X4_srcS13__anonymous23_1._X1ii_1) /* ?{} */);
-    }
-
-}
-static inline void _X11_destructorFv_S13__anonymous23_autogen___1(struct __anonymous23 *_X4_dstS13__anonymous23_1){
-    {
-        ((void)((*_X4_dstS13__anonymous23_1)._X1ii_1) /* ^?{} */);
-    }
-
-}
-static inline struct __anonymous23 _X16_operator_assignFS13__anonymous23_S13__anonymous23S13__anonymous23_autogen___1(struct __anonymous23 *_X4_dstS13__anonymous23_1, struct __anonymous23 _X4_srcS13__anonymous23_1){
-    struct __anonymous23 _X4_retS13__anonymous23_1;
-    {
-        ((void)((*_X4_dstS13__anonymous23_1)._X1ii_1=_X4_srcS13__anonymous23_1._X1ii_1));
-    }
-
-    {
-        ((void)_X12_constructorFv_S13__anonymous23S13__anonymous23_autogen___1((&_X4_retS13__anonymous23_1), (*_X4_dstS13__anonymous23_1)));
-    }
-
-    return _X4_retS13__anonymous23_1;
-}
-static inline void _X12_constructorFv_S13__anonymous23i_autogen___1(struct __anonymous23 *_X4_dstS13__anonymous23_1, signed int _X1ii_1){
-    {
-        ((void)((*_X4_dstS13__anonymous23_1)._X1ii_1=_X1ii_1) /* ?{} */);
-    }
-
-}
-static inline volatile const struct __anonymous23 _X3f38FS13__anonymous23___1();
+static inline volatile const struct __anonymous21 _X3f38FS13__anonymous21___1();
 static inline volatile const signed short int _X3f41Fs___1();
 static inline volatile const signed short int _X3f42Fs___1();

tests/attributes.cfa

@@ -10 +10 @@
 // Created On       : Mon Feb  6 16:07:02 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 15 13:53:31 2021
-// Update Count     : 38
+// Last Modified On : Thu Feb 23 20:33:07 2023
+// Update Count     : 39
 // 
 
@@ -22 +22 @@
 
 // aggregate_name
-struct __attribute__(( unused )) {} Dummy;
+static struct __attribute__(( unused )) {} Dummy;
 struct __attribute__(( unused )) Agn1;
 struct __attribute__(( unused )) Agn2 {};

tests/concurrent/signal/disjoint.cfa

@@ -38 +38 @@
 
 // Use a global struct because the order needs to match with Signaller thread
-struct {
+static struct {
         global_t mut;
         global_data_t data;

tests/declarationSpecifier.cfa

@@ -10 +10 @@
 // Created On       : Wed Aug 17 08:21:04 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 30 18:20:36 2019
-// Update Count     : 4
+// Last Modified On : Thu Feb 23 20:53:31 2023
+// Update Count     : 8
 //
 
@@ -25 +25 @@
 short int volatile static const x8;
 
-const volatile struct { int i; } x10;
-const struct { int i; } volatile x11;
-struct { int i; } const volatile x12;
-static const volatile struct { int i; } x13;
-const static struct { int i; } volatile x14;
-struct { int i; } static const volatile x15;
-struct { int i; } const static volatile x16;
-struct { int i; } const volatile static x17;
+static const volatile struct { int i; } x10;
+static const struct { int i; } volatile x11;
+static struct { int i; } const volatile x12;
+const static struct { int i; } volatile x13;
+struct { int i; } static const volatile x14;
+struct { int i; } const static volatile x15;
+struct { int i; } const volatile static x16;
 
 const Int volatile x20;
@@ -43 +42 @@
 Int volatile static const x27;
 
-const volatile struct { Int i; } x29;
-const struct { Int i; } volatile x30;
-struct { Int i; } const volatile x31;
-static const volatile struct { Int i; } x32;
-const static struct { Int i; } volatile x33;
-struct { Int i; } static const volatile x34;
-struct { Int i; } const static volatile x35;
-struct { Int i; } const volatile static x36;
+static const volatile struct { Int i; } x29;
+static const struct { Int i; } volatile x30;
+static struct { Int i; } const volatile x31;
+const static struct { Int i; } volatile x32;
+struct { Int i; } static const volatile x33;
+struct { Int i; } const static volatile x34;
+struct { Int i; } const volatile static x35;
 
 _Thread_local int x37;

tests/forall.cfa

@@ -10 +10 @@
 // Created On       : Wed May  9 08:48:15 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Feb  5 07:54:43 2023
-// Update Count     : 90
+// Last Modified On : Thu Feb 23 20:29:59 2023
+// Update Count     : 91
 //
 
@@ -195 +195 @@
 
 forall( T ) struct S { T t; } (int) x, y, z;
-forall( T ) struct { T t; } (int) a, b, c;
+static forall( T ) struct { T t; } (int) a, b, c;
 
 forall( T ) static forall( S ) {

tests/include/includes.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 22 08:27:20 2022
-// Update Count     : 779
+// Last Modified On : Wed Feb 22 10:16:58 2023
+// Update Count     : 811
 //
 
@@ -72 +72 @@
 #include <gshadow.h>
 #include <iconv.h>
-#include <ifaddrs.h>
+//#include <ifaddrs.h>                                                                  // causes warning messages that break the build
 #include <inttypes.h>
 #include <langinfo.h>
@@ -97 +97 @@
 #include <ncurses_dll.h>                                                                // may not be installed, comes with ncurses
 #endif
-#include <netdb.h>
+//#include <netdb.h>
 #include <nl_types.h>
 #include <nss.h>
@@ -111 +111 @@
 #include <pwd.h>
 #include <regex.h>
-#include <resolv.h>
+//#include <resolv.h>
 #include <re_comp.h>
 #include <sched.h>
@@ -170 +170 @@
 #endif // __CFA__
 
-int main( int argc, char const * argv[] ) {
+int main() {
     #pragma GCC warning "Compiled"                                                      // force non-empty .expect file, NO TABS!!!
 }

tests/io/comp_basic.cfa

@@ -26 +26 @@
 #include <unistd.h>
 
-struct {
+static struct {
         barrier & bar;
         int pipe[2];
-
 } globals;
 

tests/io/comp_fair.cfa

@@ -26 +26 @@
 #include <unistd.h>
 
-struct {
+static struct {
         barrier & bar;
         int pipe[2];

tests/quotedKeyword.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  7 19:07:07 2020
-// Update Count     : 25
+// Last Modified On : Thu Feb 23 20:31:05 2023
+// Update Count     : 26
 //
 
 #include <fstream.hfa>
 
-struct {
+static struct {
         int ``otype;
         int ``struct;