Changes in src/ResolvExpr/CastCost.cc [0bd3faf:eb7586e]

File:

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

src/ResolvExpr/CastCost.cc

@@ -53 +53 @@
                         } else {
                                 cost = conversionCost( basicType, dst, srcIsLvalue, symtab, env );
+                                if ( Cost::unsafe < cost ) {
+                                        if (auto enumInst =  dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                                assert(enumInst->base->base);
+                                                cost = Cost::unsafe;
+                                        }
+                                }
                         }
+                }
+
+                void postvisit( const ast::ZeroType * zero ) {
+                        // auto ptr = dynamic_cast< const ast::PointerType * >( dst );
+                        // if ( ptr && basicType->isInteger() ) {
+                        //      // needed for, e.g. unsigned long => void *
+                        //      cost = Cost::unsafe;
+                        // } else {
+                        cost = conversionCost( zero, dst, srcIsLvalue, symtab, env );
+                        if ( Cost::unsafe < cost ) {
+                                if (auto enumInst =  dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                        assert(enumInst->base->base);
+                                        cost = Cost::unsafe;
+                                }
+                        }
+                        // }
+                }
+
+                void postvisit( const ast::OneType * one ) {
+                        // auto ptr = dynamic_cast< const ast::PointerType * >( dst );
+                        // if ( ptr && basicType->isInteger() ) {
+                        //      // needed for, e.g. unsigned long => void *
+                        //      cost = Cost::unsafe;
+                        // } else {
+                        cost = conversionCost( one, dst, srcIsLvalue, symtab, env );
+                        if ( Cost::unsafe < cost ) {
+                                if (auto enumInst =  dynamic_cast<const ast::EnumInstType *>(dst)) {
+                                        assert(enumInst->base->base);
+                                        cost = Cost::unsafe;
+                                }
+                        }
+                        // }
                 }
 
@@ -80 +118 @@
                                         cost = Cost::unsafe;
                                 }
+                        }
+                }
+
+                void postvist( const ast::EnumInstType * ) {
+                        if ( auto basic = dynamic_cast< const ast::BasicType * >(dst) ) {
+                                if ( basic->isInteger() ) cost = Cost::unsafe;
                         }
                 }