Changeset ac2b598 for src

Timestamp:

Feb 24, 2020, 2:21:03 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

959f6ad

Parents:

0f2c555

Message:

Changed descriptors for concurrency to use $ prefix instead of trailing _desc

Location:

src

Files:

• Concurrency/Keywords.cc (modified) (13 diffs)
• Concurrency/Waitfor.cc (modified) (1 diff)
• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)

src/Concurrency/Keywords.cc ¶

@@ -88 +88 @@
         //      int data;                                  int data;
         //      a_struct_t more_data;                      a_struct_t more_data;
-        //                                =>             thread_desc __thrd_d;
+        //                                =>             $thread __thrd_d;
         // };                                        };
-        //                                           static inline thread_desc * get_thread( MyThread * this ) { return &this->__thrd_d; }
+        //                                           static inline $thread * get_thread( MyThread * this ) { return &this->__thrd_d; }
         //
         class ThreadKeyword final : public ConcurrentSueKeyword {
@@ -96 +96 @@
 
                 ThreadKeyword() : ConcurrentSueKeyword(
-                        "thread_desc",
+                        "$thread",
                         "__thrd",
                         "get_thread",
@@ -120 +120 @@
         //      int data;                                  int data;
         //      a_struct_t more_data;                      a_struct_t more_data;
-        //                                =>             coroutine_desc __cor_d;
+        //                                =>             $coroutine __cor_d;
         // };                                        };
-        //                                           static inline coroutine_desc * get_coroutine( MyCoroutine * this ) { return &this->__cor_d; }
+        //                                           static inline $coroutine * get_coroutine( MyCoroutine * this ) { return &this->__cor_d; }
         //
         class CoroutineKeyword final : public ConcurrentSueKeyword {
@@ -128 +128 @@
 
                 CoroutineKeyword() : ConcurrentSueKeyword(
-                        "coroutine_desc",
+                        "$coroutine",
                         "__cor",
                         "get_coroutine",
@@ -152 +152 @@
         //      int data;                                  int data;
         //      a_struct_t more_data;                      a_struct_t more_data;
-        //                                =>             monitor_desc __mon_d;
+        //                                =>             $monitor __mon_d;
         // };                                        };
-        //                                           static inline monitor_desc * get_coroutine( MyMonitor * this ) { return &this->__cor_d; }
+        //                                           static inline $monitor * get_coroutine( MyMonitor * this ) { return &this->__cor_d; }
         //
         class MonitorKeyword final : public ConcurrentSueKeyword {
@@ -160 +160 @@
 
                 MonitorKeyword() : ConcurrentSueKeyword(
-                        "monitor_desc",
+                        "$monitor",
                         "__mon",
                         "get_monitor",
@@ -182 +182 @@
         //Handles mutex routines definitions :
         // void foo( A * mutex a, B * mutex b,  int i ) {                  void foo( A * a, B * b,  int i ) {
-        //                                                                       monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
+        //                                                                       $monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
         //                                                                       monitor_guard_t __guard = { __monitors, 2 };
         //    /*Some code*/                                       =>           /*Some code*/
@@ -221 +221 @@
         //Handles mutex routines definitions :
         // void foo( A * mutex a, B * mutex b,  int i ) {                  void foo( A * a, B * b,  int i ) {
-        //                                                                       monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
+        //                                                                       $monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
         //                                                                       monitor_guard_t __guard = { __monitors, 2 };
         //    /*Some code*/                                       =>           /*Some code*/
@@ -306 +306 @@
         Expression * ConcurrentSueKeyword::postmutate( KeywordCastExpr * cast ) {
                 if ( cast_target == cast->target ) {
-                        // convert (thread &)t to (thread_desc &)*get_thread(t), etc.
+                        // convert (thread &)t to ($thread &)*get_thread(t), etc.
                         if( !type_decl ) SemanticError( cast, context_error );
                         if( !dtor_decl ) SemanticError( cast, context_error );
@@ -516 +516 @@
         void MutexKeyword::postvisit(StructDecl* decl) {
 
-                if( decl->name == "monitor_desc" && decl->body ) {
+                if( decl->name == "$monitor" && decl->body ) {
                         assert( !monitor_decl );
                         monitor_decl = decl;
@@ -612 +612 @@
                 );
 
-                //monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
+                //$monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
                 body->push_front( new DeclStmt( monitors) );
         }
@@ -673 +673 @@
                 );
 
-                //monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
+                //$monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
                 body->push_front( new DeclStmt( monitors) );
         }
@@ -681 +681 @@
         //=============================================================================================
         void ThreadStarter::previsit( StructDecl * decl ) {
-                if( decl->name == "thread_desc" && decl->body ) {
+                if( decl->name == "$thread" && decl->body ) {
                         assert( !thread_decl );
                         thread_decl = decl;

src/Concurrency/Waitfor.cc ¶

@@ -244 +244 @@
                         decl_mask = decl;
                 }
-                else if( decl->name == "monitor_desc" ) {
+                else if( decl->name == "$monitor" ) {
                         assert( !decl_monitor );
                         decl_monitor = decl;

src/ResolvExpr/AlternativeFinder.cc ¶

@@ -1292 +1292 @@
 
                 try {
-                        // Attempt 1 : turn (thread&)X into (thread_desc&)X.__thrd
+                        // Attempt 1 : turn (thread&)X into ($thread&)X.__thrd
                         // Clone is purely for memory management
                         std::unique_ptr<Expression> tech1 { new UntypedMemberExpr(new NameExpr(castExpr->concrete_target.field), castExpr->arg->clone()) };
@@ -1303 +1303 @@
                 } catch(SemanticErrorException & ) {}
 
-                // Fallback : turn (thread&)X into (thread_desc&)get_thread(X)
+                // Fallback : turn (thread&)X into ($thread&)get_thread(X)
                 std::unique_ptr<Expression> fallback { UntypedExpr::createDeref( new UntypedExpr(new NameExpr(castExpr->concrete_target.getter), { castExpr->arg->clone() })) };
                 // don't prune here, since it's guaranteed all alternatives will have the same type