Changeset 56f519b

Timestamp:

Dec 1, 2021, 11:48:34 AM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

1894e03

Parents:

f27331c

Message:

Clean-up of the last pass. Added a test for the constructor mutex argument test.

Files:

• src/Concurrency/KeywordsNew.cpp (modified) (5 diffs)
• src/Validate/CompoundLiteral.cpp (modified) (2 diffs)
• tests/concurrent/.expect/ctor-check.txt (added)
• tests/concurrent/ctor-check.cfa (added)

src/Concurrency/KeywordsNew.cpp

@@ -10 +10 @@
 // Created On       : Tue Nov 16  9:53:00 2021
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Nov 30 11:04:00 2021
-// Update Count     : 0
+// Last Modified On : Wed Dec  1 11:24:00 2021
+// Update Count     : 1
 //
 
@@ -42 +42 @@
         const ast::Stmt * postvisit( const ast::MutexStmt * stmt );
 
-        std::vector<const ast::DeclWithType *> findMutexArgs(
+        static std::vector<const ast::DeclWithType *> findMutexArgs(
                         const ast::FunctionDecl * decl, bool & first );
-        void validate( const ast::DeclWithType * decl );
+        static void validate( const ast::DeclWithType * decl );
+
         ast::CompoundStmt * addDtorStatements( const ast::FunctionDecl* func, const ast::CompoundStmt *, const std::vector<const ast::DeclWithType *> &);
         ast::CompoundStmt * addStatements( const ast::FunctionDecl* func, const ast::CompoundStmt *, const std::vector<const ast::DeclWithType *> &);
@@ -50 +51 @@
         ast::CompoundStmt * addThreadDtorStatements( const ast::FunctionDecl* func, const ast::CompoundStmt * body, const std::vector<const ast::DeclWithType *> & args );
 
-public:
+private:
         const ast::StructDecl * monitor_decl = nullptr;
         const ast::StructDecl * guard_decl = nullptr;
@@ -98 +99 @@
 
         // Monitors can't be constructed with mutual exclusion.
-        if ( CodeGen::isConstructor( decl->name ) && !is_first_argument_mutex ) {
-                SemanticError( decl, "constructors cannot have mutex parameters" );
+        if ( CodeGen::isConstructor( decl->name ) && is_first_argument_mutex ) {
+                SemanticError( decl, "constructors cannot have mutex parameters\n" );
         }
 
         // It makes no sense to have multiple mutex parameters for the destructor.
         if ( isDtor && mutexArgs.size() != 1 ) {
-                SemanticError( decl, "destructors can only have 1 mutex argument" );
+                SemanticError( decl, "destructors can only have 1 mutex argument\n" );
         }
 
@@ -172 +173 @@
         for ( auto arg : decl->params ) {
                 const ast::Type * type = arg->get_type();
-                if ( !type->is_mutex() ) continue;
-
-                if ( once ) {
-                        first = true;
-                        once = false;
+                if ( type->is_mutex() ) {
+                        if ( once ) first = true;
+                        mutexArgs.push_back( arg.get() );
                 }
-
-                mutexArgs.push_back( arg.get() );
+                once = false;
         }
         return mutexArgs;

src/Validate/CompoundLiteral.cpp

@@ -27 +27 @@
 
 struct CompoundLiteral final :
-                public ast::WithDeclsToAdd<>,
-                public ast::WithVisitorRef<CompoundLiteral> {
+                public ast::WithDeclsToAdd<> {
         ast::Storage::Classes storageClasses;
 
@@ -44 +43 @@
 
         // Transform: [storageClasses] ... (struct S){...} ...
-        // Into:      [storageClasses] struct S _compLit = {...}; / ... temp ...
+        // Into:      [storageClasses] struct S _compLit = {...};
+        //                             ... _compLit ...
         ast::ObjectDecl * temp = new ast::ObjectDecl(
                 expr->location,