Changes in src/ResolvExpr/ConversionCost.cpp [90e683b:2a5345b]

File:

• src/ResolvExpr/ConversionCost.cpp (modified) (8 diffs)

src/ResolvExpr/ConversionCost.cpp

@@ -246 +246 @@
                 }
                 if (const ast::EnumInstType * srcAsInst = dynamic_cast< const ast::EnumInstType * >( src )) {
-                        if ( srcAsInst->base && srcAsInst->base->is_c_enum() ) {
+                        if (srcAsInst->base && !srcAsInst->base->isCfa) {
                                 static const ast::BasicType* integer = new ast::BasicType( ast::BasicKind::UnsignedInt );
                                 return ast::Pass<ConversionCost>::read( integer, dst, srcIsLvalue, symtab, env, conversionCost );
@@ -324 +324 @@
                 conversionCostFromBasicToBasic( basicType, dstAsBasic );
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && dstAsEnumInst->base->is_c_enum() ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isCfa ) {
                         cost = Cost::safe;
                 }
@@ -405 +405 @@
         if ( auto dstInst = dynamic_cast<const ast::EnumInstType *>( dst ) ) {
                 cost = enumCastCost(inst, dstInst, symtab, env);
-        } else if ( inst->base->is_c_enum() ) {
+        } else if ( !inst->base->isCfa ) {
                 static ast::ptr<ast::BasicType> integer = { new ast::BasicType( ast::BasicKind::SignedInt ) };
                 cost = costCalc( integer, dst, srcIsLvalue, symtab, env );
@@ -455 +455 @@
 }
 
-void ConversionCost::postvisit( const ast::VarArgsType * ) {
+void ConversionCost::postvisit( const ast::VarArgsType * varArgsType ) {
+        (void)varArgsType;
         if ( dynamic_cast< const ast::VarArgsType * >( dst ) ) {
                 cost = Cost::zero;
@@ -461 +462 @@
 }
 
-void ConversionCost::postvisit( const ast::ZeroType * ) {
+void ConversionCost::postvisit( const ast::ZeroType * zeroType ) {
+        (void)zeroType;
         if ( dynamic_cast< const ast::ZeroType * >( dst ) ) {
                 cost = Cost::zero;
@@ -485 +487 @@
                 // assuming 0p is supposed to be used for pointers?
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && dstAsEnumInst->base->is_c_enum() ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isCfa ) {
                         cost = Cost::safe;
                 }
@@ -491 +493 @@
 }
 
-void ConversionCost::postvisit( const ast::OneType * ) {
+void ConversionCost::postvisit( const ast::OneType * oneType ) {
+        (void)oneType;
         if ( dynamic_cast< const ast::OneType * >( dst ) ) {
                 cost = Cost::zero;
@@ -505 +508 @@
                 }
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && dstAsEnumInst->base->is_c_enum() ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isCfa ) {
                         cost = Cost::safe;
                 }