Changeset 2f31773

Timestamp:

Aug 14, 2024, 1:13:06 PM (3 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master

Children:

8da3cc4d

Parents:

f9ad69d

Message:

Improve inability to declare a struct member having a managed type via typeof.

Fix is evaluating typeof on both types in a cast; one was missing.

One layer of struct wrapping now works, with its test added. Multiple layers of wrapping still does not work.

Files:

• src/ResolvExpr/CandidateFinder.cpp (modified) (3 diffs)
• tests/raii/.expect/typeof-member.txt (added)
• tests/raii/typeof-member.cfa (added)

src/ResolvExpr/CandidateFinder.cpp

@@ -1241 +1241 @@
                 Cost minCastCost = Cost::infinity;
                 for ( CandidateRef & cand : finder.candidates ) {
+                        ast::ptr< ast::Type > fromType = cand->expr->result;
+                        assert( fromType );
+                        fromType = resolveTypeof( fromType, context );
+                        fromType = adjustExprType( fromType, tenv, symtab );
+
                         ast::AssertionSet need( cand->need.begin(), cand->need.end() ), have;
                         ast::OpenVarSet open( cand->open );
@@ -1250 +1255 @@
                         // subexpression results that are cast directly. The candidate is invalid if it
                         // has fewer results than there are types to cast to.
-                        int discardedValues = cand->expr->result->size() - toType->size();
+                        int discardedValues = fromType->size() - toType->size();
                         if ( discardedValues < 0 ) continue;
 
                         // unification run for side-effects
-                        unify( toType, cand->expr->result, cand->env, need, have, open );
+                        unify( toType, fromType, cand->env, need, have, open );
                         Cost thisCost =
                                 (castExpr->isGenerated == ast::GeneratedFlag::GeneratedCast)
-                                        ? conversionCost( cand->expr->result, toType, cand->expr->get_lvalue(), symtab, cand->env )
-                                        : castCost( cand->expr->result, toType, cand->expr->get_lvalue(), symtab, cand->env );
+                                        ? conversionCost( fromType, toType, cand->expr->get_lvalue(), symtab, cand->env )
+                                        : castCost( fromType, toType, cand->expr->get_lvalue(), symtab, cand->env );
                         
                         // Redefine enum cast
-                        auto argAsEnum = cand->expr->result.as<ast::EnumInstType>();
+                        auto argAsEnum = fromType.as<ast::EnumInstType>();
                         auto toAsEnum = toType.as<ast::EnumInstType>();
                         if ( argAsEnum && toAsEnum && argAsEnum->name != toAsEnum->name ) {
@@ -1272 +1277 @@
                         PRINT(
                                 std::cerr << "working on cast with result: " << toType << std::endl;
-                                std::cerr << "and expr type: " << cand->expr->result << std::endl;
+                                std::cerr << "and expr type: " << fromType << std::endl;
                                 std::cerr << "env: " << cand->env << std::endl;
                         )