Changeset d0c91a6 for src/ResolvExpr/Cost.h

Timestamp:

Jan 15, 2019, 4:16:15 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

c802eb88

Parents:

5e49e47 (diff), c9aba81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into jenkins-sandbox

File:

• src/ResolvExpr/Cost.h (modified) (13 diffs)

src/ResolvExpr/Cost.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 09:39:50 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:35:55 2017
-// Update Count     : 5
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Fri Oct 05 14:32:00 2018
+// Update Count     : 7
 //
 
@@ -21 +21 @@
         class Cost {
           private:
-                Cost( int unsafeCost, int polyCost, int safeCost, int referenceCost );
+                Cost( int unsafeCost, int polyCost, int safeCost, int varCost, int specCost,
+                        int referenceCost );
 
           public:
@@ -27 +28 @@
                 Cost & incPoly( int inc = 1 );
                 Cost & incSafe( int inc = 1 );
+                Cost & incVar( int inc = 1 );
+                Cost & decSpec( int inc = 1 );
                 Cost & incReference( int inc = 1 );
 
@@ -32 +35 @@
                 int get_polyCost() const { return polyCost; }
                 int get_safeCost() const { return safeCost; }
+                int get_varCost() const { return varCost; }
+                int get_specCost() const { return specCost; }
                 int get_referenceCost() const { return referenceCost; }
 
@@ -41 +46 @@
                 bool operator!=( const Cost &other ) const;
                 friend std::ostream &operator<<( std::ostream &os, const Cost &cost );
+                // returns negative for *this < other, 0 for *this == other, positive for *this > other
+                int compare( const Cost &other ) const;
 
                 static const Cost zero;
@@ -48 +55 @@
                 static const Cost poly;
                 static const Cost safe;
+                static const Cost var;
+                static const Cost spec;
                 static const Cost reference;
+
           private:
-                int compare( const Cost &other ) const;
-
-                int unsafeCost;
-                int polyCost;
-                int safeCost;
-                int referenceCost;
+                int unsafeCost;     ///< Unsafe (narrowing) conversions
+                int polyCost;       ///< Count of parameters and return values bound to some poly type
+                int safeCost;       ///< Safe (widening) conversions
+                int varCost;        ///< Count of polymorphic type variables
+                int specCost;       ///< Polymorphic type specializations (type assertions), negative cost
+                int referenceCost;  ///< reference conversions
         };
 
-        inline Cost::Cost( int unsafeCost, int polyCost, int safeCost, int referenceCost ) : unsafeCost( unsafeCost ), polyCost( polyCost ), safeCost( safeCost ), referenceCost( referenceCost ) {}
+        inline Cost::Cost( int unsafeCost, int polyCost, int safeCost, int varCost, int specCost, 
+                        int referenceCost ) 
+                : unsafeCost( unsafeCost ), polyCost( polyCost ), safeCost( safeCost ), varCost( varCost ), 
+                  specCost( specCost ), referenceCost( referenceCost ) {}
 
         inline Cost & Cost::incUnsafe( int inc ) {
@@ -75 +88 @@
                 if ( *this == infinity ) return *this;
                 safeCost += inc;
+                return *this;
+        }
+
+        inline Cost & Cost::incVar( int inc ) {
+                if ( *this == infinity ) return *this;
+                varCost += inc;
+                return *this;
+        }
+
+        inline Cost& Cost::decSpec( int dec ) {
+                if ( *this == infinity ) return *this;
+                specCost -= dec;
                 return *this;
         }
@@ -86 +111 @@
         inline Cost Cost::operator+( const Cost &other ) const {
                 if ( *this == infinity || other == infinity ) return infinity;
-                return Cost( unsafeCost + other.unsafeCost, polyCost + other.polyCost, safeCost + other.safeCost, referenceCost + other.referenceCost );
+                return Cost{ 
+                        unsafeCost + other.unsafeCost, polyCost + other.polyCost, safeCost + other.safeCost, 
+                        varCost + other.varCost, specCost + other.specCost, 
+                        referenceCost + other.referenceCost };
         }
 
         inline Cost Cost::operator-( const Cost &other ) const {
                 if ( *this == infinity || other == infinity ) return infinity;
-                return Cost( unsafeCost - other.unsafeCost, polyCost - other.polyCost, safeCost - other.safeCost, referenceCost - other.referenceCost );
+                return Cost{ 
+                        unsafeCost - other.unsafeCost, polyCost - other.polyCost, safeCost - other.safeCost, 
+                        varCost - other.varCost, specCost - other.specCost, 
+                        referenceCost - other.referenceCost };
         }
 
@@ -103 +134 @@
                 polyCost += other.polyCost;
                 safeCost += other.safeCost;
+                varCost += other.varCost;
+                specCost += other.specCost;
                 referenceCost += other.referenceCost;
                 return *this;
@@ -123 +156 @@
                 } else if ( safeCost < other.safeCost ) {
                         return true;
+                } else if ( varCost > other.varCost ) {
+                        return false;
+                } else if ( varCost < other.varCost ) {
+                        return true;
+                } else if ( specCost > other.specCost ) {
+                        return false;
+                } else if ( specCost > other.specCost ) {
+                        return true;
                 } else if ( referenceCost > other.referenceCost ) {
                         return false;
@@ -130 +171 @@
                         return false;
                 } // if
+        }
+
+        inline int Cost::compare( const Cost &other ) const {
+                if ( *this == infinity ) return +1;
+                if ( other == infinity ) return -1;
+
+                int c = unsafeCost - other.unsafeCost; if ( c ) return c;
+                c = polyCost - other.polyCost; if ( c ) return c;
+                c = safeCost - other.safeCost; if ( c ) return c;
+                c = varCost - other.varCost; if ( c ) return c;
+                c = specCost - other.specCost; if ( c ) return c;
+                return referenceCost - other.referenceCost;
         }
 
@@ -136 +189 @@
                         && polyCost == other.polyCost
                         && safeCost == other.safeCost
+                        && varCost == other.varCost
+                        && specCost == other.specCost
                         && referenceCost == other.referenceCost;
         }
@@ -144 +199 @@
 
         inline std::ostream &operator<<( std::ostream &os, const Cost &cost ) {
-                os << "( " << cost.unsafeCost << ", " << cost.polyCost << ", " << cost.safeCost << ", " << cost.referenceCost << " )";
-                return os;
+                return os << "( " << cost.unsafeCost << ", " << cost.polyCost << ", " 
+                          << cost.safeCost << ", " << cost.varCost << ", " << cost.specCost << ", "
+                          << cost.referenceCost << " )";
         }
 } // namespace ResolvExpr