Changeset 51ff278 for src/AST/Expr.hpp

Timestamp:

May 21, 2019, 2:28:00 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

e0016a5

Parents:

17a0228a (diff), 19e567dd (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) (2 diffs)

src/AST/Expr.hpp

@@ -106 +106 @@
                         case Params: assert(!"Cannot return to resnSlots from Params");
                         }
+                        return *((ResnSlots*)nullptr);
+                }
+
+                const ResnSlots& resnSlotsConst() const {
+                        if (mode == Slots) {
+                                return data.resnSlots;
+                        }
+                        assert(!"Mode was not already resnSlots");
+                        return *((ResnSlots*)nullptr);
                 }
 
@@ -114 +123 @@
                         case Params: return data.inferParams;
                         }
+                        return *((InferredParams*)nullptr);
+                }
+
+                const InferredParams& inferParamsConst() const {
+                        if (mode == Params) {
+                                return data.inferParams;
+                        }
+                        assert(!"Mode was not already Params");
+                        return *((InferredParams*)nullptr);
                 }
         };