Changeset 38093ae for src/ControlStruct/ExceptTranslate.cpp

Timestamp:

Apr 18, 2024, 8:44:24 PM (7 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

19313be5, cf191ac

Parents:

748c751 (diff), 7a780ad (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:

Resolve conflict

File:

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

src/ControlStruct/ExceptTranslate.cpp

@@ -182 +182 @@
                 location,
                 "__handler_index",
-                new ast::BasicType( ast::BasicType::SignedInt )
+                new ast::BasicType( ast::BasicKind::SignedInt )
                 );
 }
@@ -201 +201 @@
                 location,
                 "__ret_bool",
-                new ast::BasicType( ast::BasicType::Bool ),
+                new ast::BasicType( ast::BasicKind::Bool ),
                 nullptr, //init
                 ast::Storage::Classes{},
@@ -231 +231 @@
                 location,
                 "__handler_index",
-                new ast::BasicType(ast::BasicType::SignedInt),
+                new ast::BasicType( ast::BasicKind::SignedInt ),
                 nullptr,
                 ast::Storage::Classes{},