Changes in src/Concurrency/Keywords.cc [b32ada31:615a096]

File:

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

src/Concurrency/Keywords.cc

@@ -12 +12 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 1
+// Update Count     : 3
 //
 
 #include "Concurrency/Keywords.h"
 
-#include "SymTab/AddVisit.h"
 #include "SynTree/Declaration.h"
 #include "SynTree/Expression.h"
@@ -30 +29 @@
         namespace {
                 const std::list<Label> noLabels;
-                const std::list< Attribute * > noAttributes;
                 Type::StorageClasses noStorage;
                 Type::Qualifiers noQualifiers;
@@ -65 +63 @@
         //                                           void main( MyCoroutine * this );
         //
-        class CoroutineKeyword final : public Visitor {
-            template< typename Visitor >
-            friend void SymTab::acceptAndAdd( std::list< Declaration * > &translationUnit, Visitor &visitor );
-          public:
-
-                using Visitor::visit;
-                virtual void visit( StructDecl * decl ) override final;
-
-                void handle( StructDecl * );
-                Declaration * addField( StructDecl * );
-                void addRoutines( StructDecl *, Declaration * );
-
-                static void implement( std::list< Declaration * > & translationUnit ) {
-                        CoroutineKeyword impl;
-                        SymTab::acceptAndAdd( translationUnit, impl );
-                }
-
-          private:
-                std::list< Declaration * > declsToAdd, declsToAddAfter;
-                StructDecl* coroutine_decl = nullptr;
+        class CoroutineKeyword final : public Mutator {
+          public:
+
+                static void implement( std::list< Declaration * > & translationUnit ) {}
         };
 
@@ -115 +97 @@
 
                 using Visitor::visit;
-                virtual void visit( FunctionDecl * decl ) override final;
-                virtual void visit(   StructDecl * decl ) override final;
+                virtual void visit( FunctionDecl *functionDecl ) override final;
+                virtual void visit(   StructDecl *functionDecl ) override final;
 
                 std::list<DeclarationWithType*> findMutexArgs( FunctionDecl* );
@@ -129 +111 @@
           private:
                 StructDecl* monitor_decl = nullptr;
-                StructDecl* guard_decl = nullptr;
         };
 
@@ -143 +124 @@
 
         //=============================================================================================
-        // Coroutine keyword implementation
-        //=============================================================================================
-        void CoroutineKeyword::visit(StructDecl * decl) {
-                if( decl->get_name() == "coroutine_desc" ) {
-                        assert( !coroutine_decl );
-                        coroutine_decl = decl;
-                }
-                else if ( false ) {
-                        handle( decl );
-                }
-
-        }
-
-        void CoroutineKeyword::handle( StructDecl * decl ) {
-                if( ! decl->has_body() ) return;
-
-                if( !coroutine_decl ) throw SemanticError( "coroutine keyword requires coroutines to be in scope, add #include <coroutine>", decl );
-
-                Declaration * field = addField( decl );
-                addRoutines( decl, field );
-        }
-
-        Declaration * CoroutineKeyword::addField( StructDecl * decl ) {
-                Declaration * cor = new ObjectDecl(
-                        "__cor",
-                        noStorage,
-                        LinkageSpec::Cforall,
-                        nullptr,
-                        new StructInstType(
-                                noQualifiers,
-                                coroutine_decl
-                        ),
-                        nullptr
-                );
-
-                decl->get_members().push_front( cor );
-
-                return cor;
-        }
-
-        void CoroutineKeyword::addRoutines( StructDecl * decl, Declaration * field ) {
-                FunctionType * type = new FunctionType( noQualifiers, false );
-                type->get_parameters().push_back(
-                        new ObjectDecl(
-                                "this",
-                                noStorage,
-                                LinkageSpec::Cforall,
-                                nullptr,
-                                new PointerType(
-                                        noQualifiers,
-                                        new StructInstType(
-                                                noQualifiers,
-                                                decl
-                                        )
-                                ),
-                                nullptr
-                        )
-                );
-
-                CompoundStmt * statement = new CompoundStmt( noLabels );
-                statement->push_back( 
-                        new ReturnStmt(
-                                noLabels,
-                                new UntypedMemberExpr(
-                                        new NameExpr( "__cor" ),
-                                        new NameExpr( "this" )
-                                )
-                        )
-                );
-
-                declsToAddAfter.push_back( 
-                        new FunctionDecl(
-                                "get_coroutine",
-                                Type::Static,
-                                LinkageSpec::Cforall,
-                                type,
-                                statement,
-                                noAttributes,
-                                Type::Inline
-                        )
-                );
-        }
-        
-
-        //=============================================================================================
         // Mutex keyword implementation
         //=============================================================================================
@@ -241 +137 @@
                 if( ! body ) return;
 
-                if( !monitor_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl );
-                if( !guard_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl );
-
+                assert(monitor_decl);
                 addStatments( body, mutexArgs );
         }
@@ -252 +146 @@
                         monitor_decl = decl;
                 }
-                else if( decl->get_name() == "monitor_guard_t" ) {
-                        assert( !guard_decl );
-                        guard_decl = decl;
-                }
         }
 
@@ -264 +154 @@
                         //Find mutex arguments
                         Type* ty = arg->get_type();
-                        if( ! ty->get_qualifiers().isMutex ) continue;
+                        if( ! ty->get_mutex() ) continue;
 
                         //Append it to the list
@@ -285 +175 @@
 
                 //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_mutex() ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
         }
 
         void MutexKeyword::addStatments( CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
+
                 ObjectDecl * monitors = new ObjectDecl(
                         "__monitors",
@@ -327 +218 @@
                                 new StructInstType(
                                         noQualifiers,
-                                        guard_decl
+                                        "monitor_guard_t"
                                 ),
                                 new ListInit(
@@ -333 +224 @@
                                                 new SingleInit( new VariableExpr( monitors ) ),
                                                 new SingleInit( new ConstantExpr( Constant::from_ulong( args.size() ) ) )
-                                        },
-                                        noDesignators,
-                                        true
+                                        }
                                 )
                         ))
                 );
 
-                //monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
+                //monitor_desc * __monitors[] = { a, b };
                 body->push_front( new DeclStmt( noLabels, monitors) );
         }