Changes in src/ResolvExpr/Resolver.cpp [ed96731:8315947]

File:

• src/ResolvExpr/Resolver.cpp (modified) (2 diffs)

src/ResolvExpr/Resolver.cpp

@@ -201 +201 @@
                                 && typesCompatible( castExpr->arg->result, castExpr->result )
                         ) {
-                                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;
+                                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;
+                                        }
                                 }
                                 // generated cast is the same type as its argument, remove it after keeping env
@@ -375 +377 @@
 : public ast::WithSymbolTable, public ast::WithGuards,
   public ast::WithVisitorRef<Resolver>, public ast::WithShortCircuiting,
-  public ast::WithStmtsToAdd {
+  public ast::WithStmtsToAdd<> {
 
         ast::ptr< ast::Type > functionReturn = nullptr;