Changeset 1c9568f0

Timestamp:

May 7, 2019, 2:36:10 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

3c1fa71, b1d3ee1

Parents:

9e6d652

Message:

choose integral zero over nullptr for any integral context

Location:

src

Files:

• BasicTypes-gen.cc (modified) (2 diffs)
• ResolvExpr/ConversionCost.cc (modified) (3 diffs)

src/BasicTypes-gen.cc

@@ +1 @@
+#include <algorithm>
 #include <queue>
 #include <iostream>
@@ -340 +341 @@
         } // for
         code << "\t}; // costMatrix" << endl;
+
+        // maximum conversion cost from int
+        code << "\tstatic const int maxIntCost = " << *max_element(costMatrix[SignedInt], costMatrix[SignedInt] + NUMBER_OF_BASIC_TYPES) << ";" << endl;
         code << "\t";                                                                           // indentation for end marker
-
+        
         if ( (start = str.find( ENDMK, start + 1 )) == string::npos ) Abort( "end", ConversionCost );
         if ( (end = str.find( STARTMK, start + 1 )) == string::npos ) Abort( "start", ConversionCost );

src/ResolvExpr/ConversionCost.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 07:06:19 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 26 16:33:04 2019
-// Update Count     : 24
+// Last Modified On : Mon May  6 14:18:22 2019
+// Update Count     : 25
 //
 
@@ -249 +249 @@
                 /*_FLDXC*/ {  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   0, },
         }; // costMatrix
+        static const int maxIntCost = 15;
         // GENERATED END
         static_assert(
@@ -461 +462 @@
                         } // if
                 } else if ( dynamic_cast< PointerType* >( dest ) ) {
-                        cost = Cost::safe;
+                        cost = Cost::zero;
+                        cost.incSafe( maxIntCost + 2 ); // +1 for zero_t -> int, +1 for disambiguation
                 } // if
         }