Changeset 2a3d446 for src/AST/Expr.cpp

Timestamp:

Dec 12, 2019, 10:25:49 AM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

983edfd

Parents:

f80f840 (diff), 737c98a (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 relaxed_ready

File:

• src/AST/Expr.cpp (modified) (2 diffs)

src/AST/Expr.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed May 15 17:00:00 2019
-// Last Modified By : Andrew Beach
+// Last Modified By : Peter A. Buhr
 // Created On       : Thr Jun 13 13:38:00 2019
-// Update Count     : 2
+// Update Count     : 6
 //
 
@@ -141 +141 @@
 // --- KeywordCastExpr
 
-const std::string & KeywordCastExpr::targetString() const {
-        static const std::string targetStrs[] = {
-                "coroutine", "thread", "monitor"
-        };
-        static_assert(
-                (sizeof(targetStrs) / sizeof(targetStrs[0])) == ((unsigned long)NUMBER_OF_TARGETS),
-                "Each KeywordCastExpr::Target should have a corresponding string representation"
-        );
-        return targetStrs[(unsigned long)target];
+const char * KeywordCastExpr::targetString() const {
+        return AggregateDecl::aggrString( target );
 }