Changeset 06d75931 for src/ResolvExpr

Timestamp:

Oct 26, 2024, 8:17:20 AM (3 weeks ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

14c31eb

Parents:

3a08cb1 (diff), d031f7f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• CandidateFinder.cpp (modified) (2 diffs)
• CommonType.cpp (modified) (2 diffs)
• CurrentObject.cpp (modified) (6 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 );

src/ResolvExpr/CurrentObject.cpp

@@ -60 +60 @@
         /// Retrieve the list of possible (Type,Designation) pairs for the
         /// current position in the current object.
-        virtual std::deque< InitAlternative > operator* () const = 0;
+        virtual std::deque< InitAlternative > getOptions() const = 0;
 
         /// True if the iterator is not currently at the end.
@@ -77 +77 @@
         virtual const Type * getNext() = 0;
 
-        /// Helper for operator*; aggregates must add designator to each init
-        /// alternative, but adding designators in operator* creates duplicates.
+        /// Helper for getOptions; aggregates must add designator to each init
+        /// alternative, but adding designators in getOptions creates duplicates.
         virtual std::deque< InitAlternative > first() const = 0;
 };
@@ -103 +103 @@
         }
 
-        std::deque< InitAlternative > operator* () const override { return first(); }
+        std::deque< InitAlternative > getOptions() const override { return first(); }
 
         operator bool() const override { return type; }
@@ -169 +169 @@
         }
 
-        std::deque< InitAlternative > operator* () const override { return first(); }
+        std::deque< InitAlternative > getOptions() const override { return first(); }
 
         operator bool() const override { return index < size; }
@@ -297 +297 @@
         }
 
-        std::deque< InitAlternative > operator* () const final {
+        std::deque< InitAlternative > getOptions() const final {
                 if ( memberIter && *memberIter ) {
                         std::deque< InitAlternative > ret = memberIter->first();
@@ -594 +594 @@
         PRINT( std::cerr << "____getting current options" << std::endl; )
         assertf( ! objStack.empty(), "objstack empty in getOptions" );
-        return **objStack.back();
+        return objStack.back()->getOptions();
 }