Changes in src/ResolvExpr/ConversionCost.cc [c333ed2:b2ea0cd]

File:

• src/ResolvExpr/ConversionCost.cc (modified) (6 diffs)

src/ResolvExpr/ConversionCost.cc

@@ -35 +35 @@
 
         // GENERATED START, DO NOT EDIT
-        // GENERATED BY BasicTypes-gen.cc
+        // GENERATED BY BasicTypes-gen.cpp
         /* EXTENDED INTEGRAL RANK HIERARCHY (root to leaves)
                                  _Bool
@@ -60 +60 @@
 
         // GENERATED START, DO NOT EDIT
-        // GENERATED BY BasicTypes-gen.cc
+        // GENERATED BY BasicTypes-gen.cpp
         static const int costMatrix[ast::BasicKind::NUMBER_OF_BASIC_TYPES][ast::BasicKind::NUMBER_OF_BASIC_TYPES] = { // path length from root to node
                 /*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
@@ -108 +108 @@
 
         // GENERATED START, DO NOT EDIT
-        // GENERATED BY BasicTypes-gen.cc
+        // GENERATED BY BasicTypes-gen.cpp
         static const int signMatrix[ast::BasicKind::NUMBER_OF_BASIC_TYPES][ast::BasicKind::NUMBER_OF_BASIC_TYPES] = { // number of sign changes in safe conversion
                 /*               B    C   SC   UC   SI  SUI    I   UI   LI  LUI  LLI LLUI   IB  UIB  _FH  _FH   _F  _FC    F   FC  _FX _FXC   FD _FDC    D   DC F80X_FDXC  F80  _FB_FLDC   FB   LD  LDC _FBX_FLDXC */
@@ -283 +283 @@
                 cost = costCalc( basicType, integer, srcIsLvalue, symtab, env );
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isTyped ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->base ) {
                         cost = Cost::unsafe;
                 }
@@ -480 +480 @@
                 // assuming 0p is supposed to be used for pointers?
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isTyped ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->base ) {
                         cost = Cost::unsafe;
                 }
@@ -501 +501 @@
                 }
         } else if ( auto dstAsEnumInst = dynamic_cast< const ast::EnumInstType * >( dst ) ) {
-                if ( dstAsEnumInst->base && !dstAsEnumInst->base->isTyped ) {
+                if ( dstAsEnumInst->base && !dstAsEnumInst->base->base ) {
                         cost = Cost::unsafe;
                 }