Changeset 67130fe for src/ResolvExpr/WidenMode.h

Timestamp:

Jun 4, 2019, 6:39:23 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

c6a1e8a

Parents:

7564e10 (diff), 1346914 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ResolvExpr/WidenMode.h (modified) (1 diff)

src/ResolvExpr/WidenMode.h

@@ -18 +18 @@
 namespace ResolvExpr {
         struct WidenMode {
-                WidenMode( bool widenFirst, bool widenSecond ): widenFirst( widenFirst ), widenSecond( widenSecond ) {}
-                WidenMode &operator|=( const WidenMode &other ) { widenFirst |= other.widenFirst; widenSecond |= other.widenSecond; return *this; }
-                WidenMode &operator&=( const WidenMode &other ) { widenFirst &= other.widenFirst; widenSecond &= other.widenSecond; return *this; }
-                WidenMode operator|( const WidenMode &other ) { WidenMode newWM( *this ); newWM |= other; return newWM; }
-                WidenMode operator&( const WidenMode &other ) { WidenMode newWM( *this ); newWM &= other; return newWM; }
-                operator bool() { return widenFirst && widenSecond; }
+                WidenMode( bool first, bool second ): first( first ), second( second ) {}
+                
+                WidenMode &operator|=( const WidenMode &other ) {
+                        first |= other.first; second |= other.second; return *this;
+                }
 
-                bool widenFirst : 1, widenSecond : 1;
+                WidenMode &operator&=( const WidenMode &other ) {
+                        first &= other.first; second &= other.second; return *this;
+                }
+
+                WidenMode operator|( const WidenMode &other ) {
+                        WidenMode newWM( *this ); newWM |= other; return newWM;
+                }
+
+                WidenMode operator&( const WidenMode &other ) {
+                        WidenMode newWM( *this ); newWM &= other; return newWM;
+                }
+                
+                operator bool() { return first && second; }
+
+                bool first : 1, second : 1;
         };
+
+        static inline WidenMode noWiden() { return { false, false }; }
 } // namespace ResolvExpr