Changeset 8492b85

Timestamp:

Aug 12, 2024, 10:35:01 AM (3 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

97f8f0f, a51dc0d

Parents:

206ecae (diff), 0e6aba06 (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/AST/Expr.hpp (modified) (8 diffs)

src/AST/Expr.hpp

@@ -11 +11 @@
 // Last Modified By : Peter A. Buhr
 // Created On       : Fri May 10 10:30:00 2019
-// Update Count     : 7
+// Update Count     : 8
 //
 
@@ -86 +86 @@
 
                 /// initializes from other InferUnion
-                void init_from( const InferUnion& o ) {
+                void init_from( const InferUnion & o ) {
                         if (o.data.resnSlots) {
                                 data.resnSlots = new ResnSlots(*o.data.resnSlots);
@@ -96 +96 @@
 
                 /// initializes from other InferUnion (move semantics)
-                void init_from( InferUnion&& o ) {
+                void init_from( InferUnion && o ) {
                         data.resnSlots = o.data.resnSlots;
                         data.inferParams = o.data.inferParams;
@@ -104 +104 @@
 
                 InferUnion() : mode(Empty), data() {}
-                InferUnion( const InferUnion& o ) : mode( o.mode ), data() { init_from( o ); }
-                InferUnion( InferUnion&& o ) : mode( o.mode ), data() { init_from( std::move(o) ); }
-                InferUnion& operator= ( const InferUnion& ) = delete;
-                InferUnion& operator= ( InferUnion&& ) = delete;
+                InferUnion( const InferUnion & o ) : mode( o.mode ), data() { init_from( o ); }
+                InferUnion( InferUnion && o ) : mode( o.mode ), data() { init_from( std::move(o) ); }
+                InferUnion & operator= ( const InferUnion & ) = delete;
+                InferUnion & operator= ( InferUnion && ) = delete;
 
                 bool hasSlots() const { return data.resnSlots; }
                 bool hasParams() const { return data.inferParams; }
 
-                ResnSlots& resnSlots() {
+                ResnSlots & resnSlots() {
                         if (!data.resnSlots) {
                                 data.resnSlots = new ResnSlots();
@@ -119 +119 @@
                 }
 
-                const ResnSlots& resnSlots() const {
+                const ResnSlots & resnSlots() const {
                         if (data.resnSlots) {
                                 return *data.resnSlots;
@@ -127 +127 @@
                 }
 
-                InferredParams& inferParams() {
+                InferredParams & inferParams() {
                         if (!data.inferParams) {
                                 data.inferParams = new InferredParams();
@@ -134 +134 @@
                 }
 
-                const InferredParams& inferParams() const {
+                const InferredParams & inferParams() const {
                         if (data.inferParams) {
                                 return *data.inferParams;
@@ -669 +669 @@
         ptr<ApplicationExpr> callExpr;
 
-        ImplicitCopyCtorExpr( const CodeLocation& loc, const ApplicationExpr * call )
+        ImplicitCopyCtorExpr( const CodeLocation & loc, const ApplicationExpr * call )
         : Expr( loc, call->result ), callExpr(call) { assert( call ); assert(call->result); }