Changes in src/ControlStruct/ExceptTranslate.cc [42a02ce:7f9968ad]

File:

• src/ControlStruct/ExceptTranslate.cc (modified) (3 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Wed Jun 14 16:49:00 2017
-// Last Modified By : Henry Xue
-// Last Modified On : Tue Aug 03 10:05:51 2021
-// Update Count     : 18
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 24 11:18:00 2020
+// Update Count     : 17
 //
 
@@ -320 +320 @@
                                 static_cast<ObjectDecl *>( handler->get_decl() );
                         ObjectDecl * local_except = handler_decl->clone();
-                        VirtualCastExpr * vcex = new VirtualCastExpr(
-                                nameOf( except_obj ),
-                                local_except->get_type()
+                        local_except->set_init(
+                                new ListInit({ new SingleInit(
+                                        new VirtualCastExpr( nameOf( except_obj ),
+                                                local_except->get_type()
+                                                )
+                                        ) })
                                 );
-                        vcex->location = handler->location;
-                        local_except->set_init( new ListInit({ new SingleInit( vcex ) }) );
                         block->push_back( new DeclStmt( local_except ) );
 
@@ -391 +392 @@
 
                 // Check for type match.
-                VirtualCastExpr * vcex = new VirtualCastExpr(
-                        nameOf( except_obj ),
-                        local_except->get_type()->clone()
-                        );
-                vcex->location = modded_handler->location;
-                Expression * cond = UntypedExpr::createAssign(
-                        nameOf( local_except ), vcex );
+                Expression * cond = UntypedExpr::createAssign( nameOf( local_except ),
+                        new VirtualCastExpr( nameOf( except_obj ),
+                                local_except->get_type()->clone() ) );
 
                 // Add the check on the conditional if it is provided.