Changes in src/ResolvExpr/Resolver.cc [5cf1228:12df6fe]

File:

• src/ResolvExpr/Resolver.cc (modified) (4 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);
@@ -1542 +1542 @@
         }
 
+
         const ast::StaticAssertDecl * Resolver_new::previsit(
                 const ast::StaticAssertDecl * assertDecl
@@ -1553 +1554 @@
         const PtrType * handlePtrType( const PtrType * type, const ResolveContext & context ) {
                 if ( type->dimension ) {
-                        const ast::Type * sizeType = context.global.sizeType.get();
+                        ast::ptr< ast::Type > sizeType = context.global.sizeType;
                         ast::ptr< ast::Expr > dimension = findSingleExpression( type->dimension, sizeType, context );
                         assertf(dimension->env->empty(), "array dimension expr has nonempty env");
                         dimension.get_and_mutate()->env = nullptr;
-                        ast::mutate_field( type, &PtrType::dimension, dimension );
+                        ast::mutate_field(
+                                type, &PtrType::dimension,
+                                dimension);
                 }
                 return type;