Changeset 17f22e78

Timestamp:

Jul 21, 2017, 9:47:10 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

cb43451

Parents:

9a34b5a

Message:

Update Cost operations to perform infinity checks internally

File:

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

src/ResolvExpr/Cost.h

@@ -57 +57 @@
 
         inline Cost & Cost::incUnsafe( int inc ) {
+                if ( *this == infinity ) return *this;
                 unsafeCost += inc;
                 return *this;
@@ -62 +63 @@
 
         inline Cost & Cost::incPoly( int inc ) {
+                if ( *this == infinity ) return *this;
                 polyCost += inc;
                 return *this;
@@ -67 +69 @@
 
         inline Cost & Cost::incSafe( int inc ) {
+                if ( *this == infinity ) return *this;
                 safeCost += inc;
                 return *this;
@@ -72 +75 @@
 
         inline Cost & Cost::incReference( int inc ) {
+                if ( *this == infinity ) return *this;
                 referenceCost += inc;
                 return *this;
@@ -77 +81 @@
 
         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 );
         }
 
         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 );
         }
 
         inline Cost &Cost::operator+=( const Cost &other ) {
+                if ( *this == infinity ) return *this;
+                if ( other == infinity ) {
+                        *this = infinity;
+                        return *this;
+                }
                 unsafeCost += other.unsafeCost;
                 polyCost += other.polyCost;