Changeset ef42b143 for src/Concurrency

Timestamp:

Mar 16, 2017, 5:20:16 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

3743983

Parents:

1fbab5a

Message:

Implemented monitor keyword, and it works

File:

• src/Concurrency/Keywords.cc (modified) (6 diffs)

src/Concurrency/Keywords.cc

@@ -111 +111 @@
           private:
                 StructDecl* monitor_decl = nullptr;
+                StructDecl* guard_decl = nullptr;
         };
 
@@ -137 +138 @@
                 if( ! body ) return;
 
-                assert(monitor_decl);
                 addStatments( body, mutexArgs );
         }
@@ -146 +146 @@
                         monitor_decl = decl;
                 }
+                else if( decl->get_name() == "monitor_guard_t" ) {
+                        assert( !guard_decl );
+                        guard_decl = decl;
+                }
         }
 
@@ -175 +179 @@
 
                 //Make sure that typed isn't mutex
-                if( ! base->get_qualifiers().isMutex ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
+                if( base->get_qualifiers().isMutex ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
         }
 
         void MutexKeyword::addStatments( CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
+                assert(monitor_decl);
+                assert(guard_decl);
 
                 ObjectDecl * monitors = new ObjectDecl(
@@ -218 +224 @@
                                 new StructInstType(
                                         noQualifiers,
-                                        "monitor_guard_t"
+                                        guard_decl
                                 ),
                                 new ListInit(
@@ -224 +230 @@
                                                 new SingleInit( new VariableExpr( monitors ) ),
                                                 new SingleInit( new ConstantExpr( Constant::from_ulong( args.size() ) ) )
-                                        }
+                                        },
+                                        noDesignators,
+                                        true
                                 )
                         ))
                 );
 
-                //monitor_desc * __monitors[] = { a, b };
+                //monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
                 body->push_front( new DeclStmt( noLabels, monitors) );
         }