Changeset b2de2e0

Timestamp:

May 26, 2020, 11:24:55 AM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

c19bc90

Parents:

c1dfa4e

Message:

Improved the check of the catch[Resume] exception declaration.

Files:

• src/ControlStruct/ExceptTranslate.cc (modified) (2 diffs)
• tests/exceptions/.expect/type-check.txt (added)
• tests/exceptions/type-check.cfa (added)

src/ControlStruct/ExceptTranslate.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr May 21 13:18:00 2020
-// Update Count     : 15
+// Last Modified On : Tue May 26 10:56:00 2020
+// Update Count     : 16
 //
 
@@ -134 +134 @@
                 ObjectDecl * decl = dynamic_cast<ObjectDecl *>( catchStmt->get_decl() );
                 // Also checking the type would be nice.
-                if ( decl ) {
-                        // Pass.
-                } else if ( CatchStmt::Terminate == catchStmt->get_kind() ) {
-                        SemanticError(catchStmt->location, "catch must have exception type");
-                } else {
-                        SemanticError(catchStmt->location, "catchResume must have exception type");
+                if ( !decl || !dynamic_cast<PointerType *>( decl->type ) ) {
+                        std::string kind = (CatchStmt::Terminate == catchStmt->kind) ? "catch" : "catchResume";
+                        SemanticError( catchStmt->location, kind + " must have pointer to an exception type" );
                 }