Changeset 2295320

Timestamp:

Nov 11, 2024, 10:35:49 PM (30 hours ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

47174c4

Parents:

0cb3479 (diff), 2ae845e9 (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/Resolver.cpp (modified) (1 diff)

src/ResolvExpr/Resolver.cpp

@@ -201 +201 @@
                                 && typesCompatible( castExpr->arg->result, castExpr->result )
                         ) {
-                                auto argAsEnum = castExpr->arg.as<ast::EnumInstType>();
-                                auto resultAsEnum = castExpr->result.as<ast::EnumInstType>();
-                                if (argAsEnum && resultAsEnum) {
-                                        if (argAsEnum->base->name != resultAsEnum->base->name) {
-                                                std::cerr << "Enum Cast: " << argAsEnum->base->name << " to " << resultAsEnum->base->name << std::endl;
-                                                return castExpr;
-                                        }
+                                ast::EnumInstType const * arg, * result;
+                                if ( ( result = castExpr->result.as<ast::EnumInstType>() ) &&
+                                                ( arg = castExpr->arg.as<ast::EnumInstType>() ) &&
+                                                arg->base->name != result->base->name) {
+                                        return castExpr;
                                 }
                                 // generated cast is the same type as its argument, remove it after keeping env