Changeset a16764a6 for src/Concurrency/Keywords.cc

Timestamp:

Feb 28, 2018, 4:48:22 PM (6 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:

446ffa3

Parents:

6a8df56

Message:

Changed warning system to prepare for toggling warnings

File:

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

src/Concurrency/Keywords.cc

@@ -280 +280 @@
                 if( ! decl->body ) return;
 
-                if( !type_decl ) throw SemanticError( decl, context_error );
+                if( !type_decl ) SemanticError( decl, context_error );
 
                 FunctionDecl * func = forwardDeclare( decl );
@@ -417 +417 @@
                 if( mutexArgs.empty() ) return;
 
-                if( CodeGen::isConstructor(decl->name) ) throw SemanticError( decl, "constructors cannot have mutex parameters" );
+                if( CodeGen::isConstructor(decl->name) ) SemanticError( decl, "constructors cannot have mutex parameters" );
 
                 bool isDtor = CodeGen::isDestructor( decl->name );
 
-                if( isDtor && mutexArgs.size() != 1 ) throw SemanticError( decl, "destructors can only have 1 mutex argument" );
+                if( isDtor && mutexArgs.size() != 1 ) SemanticError( decl, "destructors can only have 1 mutex argument" );
 
                 for(auto arg : mutexArgs) {
@@ -430 +430 @@
                 if( ! body ) return;
 
-                if( !monitor_decl ) throw SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor>" );
-                if( !guard_decl ) throw SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor>" );
-                if( !dtor_guard_decl ) throw SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor>" );
+                if( !monitor_decl || !guard_decl || !dtor_guard_decl )
+                        SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor>" );
 
                 if( isDtor ) {
@@ -478 +477 @@
                 //Makes sure it's not a copy
                 ReferenceType* rty = dynamic_cast< ReferenceType * >( ty );
-                if( ! rty ) throw SemanticError( arg, "Mutex argument must be of reference type " );
+                if( ! rty ) SemanticError( arg, "Mutex argument must be of reference type " );
 
                 //Make sure the we are pointing directly to a type
                 Type* base = rty->get_base();
-                if( dynamic_cast< ReferenceType * >( base ) ) throw SemanticError( arg, "Mutex argument have exactly one level of indirection " );
-                if( dynamic_cast< PointerType * >( base ) ) throw SemanticError( arg, "Mutex argument have exactly one level of indirection " );
+                if( dynamic_cast< ReferenceType * >( base ) ) SemanticError( arg, "Mutex argument have exactly one level of indirection " );
+                if( dynamic_cast< PointerType * >( base ) ) SemanticError( arg, "Mutex argument have exactly one level of indirection " );
 
                 //Make sure that typed isn't mutex
-                if( base->get_mutex() ) throw SemanticError( arg, "mutex keyword may only appear once per argument " );
+                if( base->get_mutex() ) SemanticError( arg, "mutex keyword may only appear once per argument " );
         }
 
@@ -624 +623 @@
                 if( type && type->get_baseStruct()->is_thread() ) {
                         if( !thread_decl || !thread_ctor_seen ) {
-                                throw SemanticError( type->get_baseStruct()->location, "thread keyword requires threads to be in scope, add #include <thread>");
+                                SemanticError( type->get_baseStruct()->location, "thread keyword requires threads to be in scope, add #include <thread>");
                         }