Changeset 90be0cf for src/ResolvExpr

Timestamp:

Oct 24, 2024, 12:50:14 PM (6 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

d031f7f

Parents:

12c4a5f

Message:

Moved some methods out of EnumDecl?. These were calculations and the ast types are supposed to be data focused so they should either go with utility functions or to their use site. I tried the use site.

Location:

src/ResolvExpr

Files:

• CandidateFinder.cpp (modified) (2 diffs)
• CommonType.cpp (modified) (2 diffs)

src/ResolvExpr/CandidateFinder.cpp ¶

@@ -2136 +2136 @@
 }
 
+/// If the target enum is a child, get the offset from the base to the target.
+static unsigned findChildOffset(
+                const ast::EnumDecl * decl, const ast::EnumDecl * target ) {
+        unsigned offset = 0;
+        for ( auto inlined : decl->inlinedDecl ) {
+                auto childDecl = inlined->base;
+                if ( childDecl == target ) {
+                        return offset;
+                }
+                offset += childDecl->members.size();
+        }
+        SemanticError( decl, "Cannot find the target enum." );
+}
+
 const ast::Expr * CandidateFinder::makeEnumOffsetCast( const ast::EnumInstType * src, 
         const ast::EnumInstType * dst, const ast::Expr * expr, Cost minCost ) {
@@ -2147 +2161 @@
                 ast::CastExpr * castToDst;
                 if (c<minCost) {
-                        unsigned offset = dstDecl->calChildOffset(dstChild.get());
+                        unsigned offset = findChildOffset( dstDecl, dstChild.get()->base );
                         if (offset > 0) {
                                 auto untyped = ast::UntypedExpr::createCall(
-                                        expr->location, 
-                                        "?+?", 
+                                        expr->location,
+                                        "?+?",
                                         { new ast::CastExpr( expr->location,
                                                 expr,

src/ResolvExpr/CommonType.cpp ¶

@@ -636 +636 @@
         void postvisit( const ast::UnionInstType * ) {}
 
+        /// Is the target enum a child of the base enum?
+        static bool isChildEnum(
+                        const ast::EnumDecl * decl, const ast::EnumDecl * target ) {
+                if ( decl == target ) return true;
+                for ( auto inlined : decl->inlinedDecl ) {
+                        if ( isChildEnum( inlined->base, target ) ) return true;
+                }
+                return false;
+        }
+
         void postvisit( const ast::EnumInstType * param ) {
                 auto argAsEnumInst = dynamic_cast<const ast::EnumInstType *>(type2);
@@ -641 +651 @@
                         const ast::EnumDecl* paramDecl = param->base;
                         const ast::EnumDecl* argDecl = argAsEnumInst->base;
-                        if (argDecl->isSubTypeOf(paramDecl)) result = param;
+                        if ( isChildEnum( paramDecl, argDecl ) ) {
+                                result = param;
+                        }
                 } else if ( param->base && !param->base->isCfa ) {
                         auto basicType = new ast::BasicType( ast::BasicKind::UnsignedInt );