Changeset e84ab3d for src/Concurrency/Keywords.cc

Timestamp:

Jul 5, 2021, 4:44:20 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

7f62b708

Parents:

ee23a8d

Message:

Step 1 of changing $thread to thread$

File:

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

src/Concurrency/Keywords.cc

@@ -122 +122 @@
         //      int data;                                  int data;
         //      a_struct_t more_data;                      a_struct_t more_data;
-        //                                =>             $thread __thrd_d;
+        //                                =>             thread$ __thrd_d;
         // };                                        };
-        //                                           static inline $thread * get_thread( MyThread * this ) { return &this->__thrd_d; }
+        //                                           static inline thread$ * get_thread( MyThread * this ) { return &this->__thrd_d; }
         //
         class ThreadKeyword final : public ConcurrentSueKeyword {
@@ -130 +130 @@
 
                 ThreadKeyword() : ConcurrentSueKeyword(
-                        "$thread",
+                        "thread$",
                         "__thrd",
                         "get_thread",
@@ -155 +155 @@
         //      int data;                                  int data;
         //      a_struct_t more_data;                      a_struct_t more_data;
-        //                                =>             $coroutine __cor_d;
+        //                                =>             coroutine$ __cor_d;
         // };                                        };
-        //                                           static inline $coroutine * get_coroutine( MyCoroutine * this ) { return &this->__cor_d; }
+        //                                           static inline coroutine$ * get_coroutine( MyCoroutine * this ) { return &this->__cor_d; }
         //
         class CoroutineKeyword final : public ConcurrentSueKeyword {
@@ -163 +163 @@
 
                 CoroutineKeyword() : ConcurrentSueKeyword(
-                        "$coroutine",
+                        "coroutine$",
                         "__cor",
                         "get_coroutine",
@@ -190 +190 @@
         //      int data;                                  int data;
         //      a_struct_t more_data;                      a_struct_t more_data;
-        //                                =>             $monitor __mon_d;
+        //                                =>             monitor$ __mon_d;
         // };                                        };
-        //                                           static inline $monitor * get_coroutine( MyMonitor * this ) { return &this->__cor_d; }
+        //                                           static inline monitor$ * get_coroutine( MyMonitor * this ) { return &this->__cor_d; }
         //
         class MonitorKeyword final : public ConcurrentSueKeyword {
@@ -198 +198 @@
 
                 MonitorKeyword() : ConcurrentSueKeyword(
-                        "$monitor",
+                        "monitor$",
                         "__mon",
                         "get_monitor",
@@ -230 +230 @@
 
                 GeneratorKeyword() : ConcurrentSueKeyword(
-                        "$generator",
+                        "generator$",
                         "__generator_state",
                         "get_generator",
-                        "Unable to find builtin type $generator\n",
+                        "Unable to find builtin type generator$\n",
                         "",
                         true,
@@ -292 +292 @@
         //Handles mutex routines definitions :
         // void foo( A * mutex a, B * mutex b,  int i ) {                  void foo( A * a, B * b,  int i ) {
-        //                                                                       $monitor * __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*/
@@ -333 +333 @@
         //Handles mutex routines definitions :
         // void foo( A * mutex a, B * mutex b,  int i ) {                  void foo( A * a, B * b,  int i ) {
-        //                                                                       $monitor * __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*/
@@ -449 +449 @@
         Expression * ConcurrentSueKeyword::postmutate( KeywordCastExpr * cast ) {
                 if ( cast_target == cast->target ) {
-                        // convert (thread &)t to ($thread &)*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 );
@@ -919 +919 @@
         void MutexKeyword::postvisit(StructDecl* decl) {
 
-                if( decl->name == "$monitor" && decl->body ) {
+                if( decl->name == "monitor$" && decl->body ) {
                         assert( !monitor_decl );
                         monitor_decl = decl;
@@ -1020 +1020 @@
                 );
 
-                //$monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
+                //monitor$ * __monitors[] = { get_monitor(a), get_monitor(b) };
                 body->push_front( new DeclStmt( monitors ) );
         }
@@ -1117 +1117 @@
                 );
 
-                //$monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
+                //monitor$ * __monitors[] = { get_monitor(a), get_monitor(b) };
                 body->push_front( new DeclStmt( monitors) );
         }
@@ -1125 +1125 @@
         //=============================================================================================
         void ThreadStarter::previsit( StructDecl * decl ) {
-                if( decl->name == "$thread" && decl->body ) {
+                if( decl->name == "thread$" && decl->body ) {
                         assert( !thread_decl );
                         thread_decl = decl;