Changeset 0c327ce for src/ResolvExpr

Timestamp:

Jul 12, 2024, 3:30:06 PM (8 days ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

76b507d

Parents:

9c447e2

Message:

1. Add bound check to Serial function: now compiler generates the unchecked functions in ImplementEnumFunc?, and enum.hfa implements the bound check on top. Todo: Wrapped the checked version into a trait; 2. countof is now works on any type that implement Countof(). Because Countof() is implemented in enum.hfa for all CfaEnum?, we can call countof on { T | CfaEnum?(T) }

File:

• src/ResolvExpr/CandidateFinder.cpp (modified) (1 diff)

src/ResolvExpr/CandidateFinder.cpp

@@ -1485 +1485 @@
 
         void Finder::postvisit( const ast::CountExpr * countExpr ) {
-                assert( countExpr->type );
-                auto enumInst = countExpr->type.as<ast::EnumInstType>();
-                if ( !enumInst ) {
-                        SemanticError( countExpr, "Count Expression only supports Enum Type as operand: ");
-                }
-                addCandidate( ast::ConstantExpr::from_ulong(countExpr->location, enumInst->base->members.size()), tenv );
+                const ast::UntypedExpr * untyped;
+                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 );
+                finder.find( untyped );
+                CandidateList winners = findMinCost( finder.candidates );
+                if ( winners.size() == 0 ) {
+                        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();
+                choice->expr = referenceToRvalueConversion( choice->expr, choice->cost );
+                addCandidate( *choice, choice->expr );
         }