Changeset afce1cf for src/Concurrency/Keywords.cc

Timestamp:

Aug 28, 2017, 3:44:55 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

39c7fd0

Parents:

193bba0 (diff), 26238c1 (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:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

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

src/Concurrency/Keywords.cc

@@ -19 +19 @@
 #include <string>                  // for string, operator==
 
+#include "Common/PassVisitor.h"    // for PassVisitor
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for deleteAll, map_range
@@ -46 +47 @@
 
         //=============================================================================================
-        // Visitors declaration
+        // Pass declarations
         //=============================================================================================
 
@@ -58 +59 @@
         //                                           static inline NewField_t * getter_name( MyType * this ) { return &this->newField; }
         //
-        class ConcurrentSueKeyword : public Visitor {
-          protected:
-            template< typename Visitor >
-            friend void SymTab::acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor );
+        class ConcurrentSueKeyword : public WithDeclsToAdd {
           public:
 
@@ -69 +67 @@
                 virtual ~ConcurrentSueKeyword() {}
 
-                using Visitor::visit;
-                virtual void visit( StructDecl * decl ) override final;
+                void postvisit( StructDecl * decl );
 
                 void handle( StructDecl * );
@@ -86 +83 @@
                 bool needs_main;
 
-                std::list< Declaration * > declsToAdd, declsToAddAfter;
                 StructDecl* type_decl = nullptr;
         };
@@ -117 +113 @@
 
                 static void implement( std::list< Declaration * > & translationUnit ) {
-                        ThreadKeyword impl;
-                        SymTab::acceptAndAdd( translationUnit, impl );
+                        PassVisitor< ThreadKeyword > impl;
+                        acceptAll( translationUnit, impl );
                 }
         };
@@ -148 +144 @@
 
                 static void implement( std::list< Declaration * > & translationUnit ) {
-                        CoroutineKeyword impl;
-                        SymTab::acceptAndAdd( translationUnit, impl );
+                        PassVisitor< CoroutineKeyword > impl;
+                        acceptAll( translationUnit, impl );
                 }
         };
@@ -179 +175 @@
 
                 static void implement( std::list< Declaration * > & translationUnit ) {
-                        MonitorKeyword impl;
-                        SymTab::acceptAndAdd( translationUnit, impl );
+                        PassVisitor< MonitorKeyword > impl;
+                        acceptAll( translationUnit, impl );
                 }
         };
@@ -192 +188 @@
         // }                                                               }
         //
-        class MutexKeyword final : public Visitor {
+        class MutexKeyword final {
           public:
 
-                using Visitor::visit;
-                virtual void visit( FunctionDecl * decl ) override final;
-                virtual void visit(   StructDecl * decl ) override final;
+                void postvisit( FunctionDecl * decl );
+                void postvisit(   StructDecl * decl );
 
                 std::list<DeclarationWithType*> findMutexArgs( FunctionDecl* );
@@ -204 +199 @@
 
                 static void implement( std::list< Declaration * > & translationUnit ) {
-                        MutexKeyword impl;
+                        PassVisitor< MutexKeyword > impl;
                         acceptAll( translationUnit, impl );
                 }
@@ -230 +225 @@
         // }                                                               }
         //
-        class ThreadStarter final : public Visitor {
+        class ThreadStarter final {
           public:
 
-                using Visitor::visit;
-                virtual void visit( FunctionDecl * decl ) override final;
+                void postvisit( FunctionDecl * decl );
 
                 void addStartStatement( FunctionDecl * decl, DeclarationWithType * param );
 
                 static void implement( std::list< Declaration * > & translationUnit ) {
-                        ThreadStarter impl;
+                        PassVisitor< ThreadStarter > impl;
                         acceptAll( translationUnit, impl );
                 }
@@ -264 +258 @@
         // Generic keyword implementation
         //=============================================================================================
-        void ConcurrentSueKeyword::visit(StructDecl * decl) {
-                Visitor::visit(decl);
+        void ConcurrentSueKeyword::postvisit(StructDecl * decl) {
                 if( decl->get_name() == type_name && decl->has_body() ) {
                         assert( !type_decl );
@@ -353 +346 @@
                 }
 
-                declsToAdd.push_back( forward );
-                if( needs_main ) declsToAdd.push_back( main_decl );
-                declsToAdd.push_back( get_decl );
+                declsToAddBefore.push_back( forward );
+                if( needs_main ) declsToAddBefore.push_back( main_decl );
+                declsToAddBefore.push_back( get_decl );
 
                 return get_decl;
@@ -405 +398 @@
         //=============================================================================================
 
-        void MutexKeyword::visit(FunctionDecl* decl) {
-                Visitor::visit(decl);
+        void MutexKeyword::postvisit(FunctionDecl* decl) {
 
                 std::list<DeclarationWithType*> mutexArgs = findMutexArgs( decl );
@@ -424 +416 @@
         }
 
-        void MutexKeyword::visit(StructDecl* decl) {
-                Visitor::visit(decl);
+        void MutexKeyword::postvisit(StructDecl* decl) {
 
                 if( decl->get_name() == "monitor_desc" ) {
@@ -532 +523 @@
         // General entry routine
         //=============================================================================================
-        void ThreadStarter::visit(FunctionDecl * decl) {
-                Visitor::visit(decl);
-
+        void ThreadStarter::postvisit(FunctionDecl * decl) {
                 if( ! CodeGen::isConstructor(decl->get_name()) ) return;