Changeset 7f6a7c9 for src/ResolvExpr/Resolver.cc

Timestamp:

Sep 21, 2022, 11:02:15 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

95dab9e

Parents:

428adbc (diff), 0bd46fd (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' into pthread-emulation

File:

• src/ResolvExpr/Resolver.cc (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -1478 +1478 @@
                         // enum type is still incomplete at this point. Use `int` instead.
 
-                        if (dynamic_cast< const ast::EnumInstType * >( objectDecl->get_type() )->base->base) {
+                        if ( auto enumBase = dynamic_cast< const ast::EnumInstType * >
+                                ( objectDecl->get_type() )->base->base ) {
                                 objectDecl = fixObjectType( objectDecl, context );
-                                const ast::Type * enumBase =  (dynamic_cast< const ast::EnumInstType * >( objectDecl->get_type() )->base->base.get());
                                 currentObject = ast::CurrentObject{ 
                                         objectDecl->location, 
@@ -1493 +1493 @@
                 }
                 else {
-                        if (!objectDecl->isTypeFixed) {
+                        if ( !objectDecl->isTypeFixed ) {
                                 auto newDecl = fixObjectType(objectDecl, context);
                                 auto mutDecl = mutate(newDecl);