Changeset 21ad568 for src

Timestamp:

Dec 14, 2023, 1:55:49 PM (13 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

ca9d65e

Parents:

610354a (diff), 142930b (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ControlStruct/ExceptTranslate.cpp (modified) (1 diff)

src/ControlStruct/ExceptTranslate.cpp

@@ -482 +482 @@
                 ast::FunctionDecl * terminate_catch,
                 ast::FunctionDecl * terminate_match ) {
-        // {
-        //     int __handler_index = __cfaehm_try_terminate(`try`, `match`);
-        //     if ( __handler_index ) {
-        //         `catch`( __handler_index, __cfaehm_get_current_exception() );
-        //     }
-        // }
-
-        ast::ObjectDecl * index = new ast::ObjectDecl( loc, "__handler_index",
-                new ast::BasicType( ast::BasicType::SignedInt ),
-                new ast::SingleInit( loc,
-                        new ast::UntypedExpr( loc,
-                                new ast::NameExpr( loc, "__cfaehm_try_terminate" ),
-                                {
-                                        new ast::VariableExpr( loc, try_wrapper ),
-                                        new ast::VariableExpr( loc, terminate_catch ),
-                                        new ast::VariableExpr( loc, terminate_match ),
-                                }
-                        )
-                )
-        );
-
-        return new ast::CompoundStmt( loc, {
-                new ast::DeclStmt( loc, index ),
-                new ast::IfStmt( loc,
-                        new ast::VariableExpr( loc, index ),
-                        new ast::ExprStmt( loc,
-                                new ast::UntypedExpr( loc,
-                                        new ast::VariableExpr( loc, terminate_catch ),
-                                        {
-                                                new ast::VariableExpr( loc, index ),
-                                                new ast::UntypedExpr( loc,
-                                                        new ast::NameExpr( loc, "__cfaehm_get_current_exception" )
-                                                ),
-                                        }
-                                )
-                        )
-                ),
-        } );
+        // { __cfaehm_try_terminate(`try`, `catch`, `match`); }
+
+        ast::UntypedExpr * caller = new ast::UntypedExpr(loc, new ast::NameExpr(loc,
+                "__cfaehm_try_terminate" ) );
+        caller->args.push_back( new ast::VariableExpr(loc, try_wrapper ) );
+        caller->args.push_back( new ast::VariableExpr(loc, terminate_catch ) );
+        caller->args.push_back( new ast::VariableExpr(loc, terminate_match ) );
+
+        ast::CompoundStmt * callStmt = new ast::CompoundStmt(loc);
+        callStmt->push_back( new ast::ExprStmt( loc, caller ) );
+        return callStmt;
 }