Changes in src/ResolvExpr/CandidateFinder.cpp [857b5f9:6b95feb]

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (6 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -672 +672 @@
                 void postvisit( const ast::SizeofExpr * sizeofExpr );
                 void postvisit( const ast::AlignofExpr * alignofExpr );
-                void postvisit( const ast::CountofExpr * countExpr );
                 void postvisit( const ast::AddressExpr * addressExpr );
                 void postvisit( const ast::LabelAddressExpr * labelExpr );
@@ -698 +697 @@
                 void postvisit( const ast::UntypedInitExpr * initExpr );
                 void postvisit( const ast::QualifiedNameExpr * qualifiedExpr );
+                void postvisit( const ast::CountExpr * countExpr );
 
                 void postvisit( const ast::InitExpr * ) {
@@ -941 +941 @@
                 }
         }
+        
 
         /// Adds aggregate member interpretations
@@ -1268 +1269 @@
                                         ? 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 = fromType.as<ast::EnumInstType>();
@@ -1492 +1493 @@
         }
 
-        void Finder::postvisit( const ast::CountofExpr * countExpr ) {
-                if ( auto enumInst = countExpr->type.as<ast::EnumInstType>() ) {
-                        addCandidate( ast::ConstantExpr::from_ulong( countExpr->location, enumInst->base->members.size()), tenv );
-                        return;
-                }
-                auto untypedFirst = ast::UntypedExpr::createCall( countExpr->location, "lowerBound", {} );
-                auto castFirst = new ast::CastExpr( countExpr->location, untypedFirst , countExpr->type );
-                const ast::UntypedExpr * untyped = ast::UntypedExpr::createCall(
-                        countExpr->location, "Countof", { castFirst }
+        void Finder::postvisit( const ast::CountExpr * countExpr ) {
+                const ast::UntypedExpr * untyped = nullptr;
+                if ( countExpr->type ) {
+                        auto enumInst = countExpr->type.as<ast::EnumInstType>();
+                        if ( enumInst ) {
+                                addCandidate( ast::ConstantExpr::from_ulong(countExpr->location, enumInst->base->members.size()), tenv );
+                                return;
+                        }
+                        auto untypedFirst = ast::UntypedExpr::createCall( countExpr->location, "lowerBound", {} );
+                        auto castFirst = new ast::CastExpr( countExpr->location, untypedFirst , countExpr->type );
+                        untyped = ast::UntypedExpr::createCall(
+                                countExpr->location, "Countof", { castFirst }
+                        );
+                }
+                if (!untyped) untyped = ast::UntypedExpr::createCall(
+                                countExpr->location, "Countof", { countExpr->expr }
                 );
                 CandidateFinder finder( context, tenv );
@@ -1506 +1514 @@
                 CandidateList winners = findMinCost( finder.candidates );
                 if ( winners.size() == 0 ) {
-                        SemanticError( countExpr, "Countof is not implemented: " );
-                }
-                if ( winners.size() != 1 ) {
-                        SemanticError( countExpr, "Ambiguous expression in countof: " );
+                        SemanticError( countExpr->expr, "Countof is not implemented for operand: " );
+                }
+                if ( winners.size() !=  1 ) {
+                        SemanticError( countExpr->expr, "Ambiguous expression in countof operand: " );
                 }
                 CandidateRef & choice = winners.front();