Changeset 17fa94f for src/ResolvExpr

Timestamp:

Feb 11, 2025, 11:24:07 AM (8 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

691bf0a

Parents:

3e5e32cf

Message:

Reworked some nodes so they can be typed or untyped. This allowed me to remove TranslationDeps as the type information is only needed in the candidate finder, which can easily insert it.

File:

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

src/ResolvExpr/CandidateFinder.cpp

@@ -1486 +1486 @@
 
         void Finder::postvisit( const ast::SizeofExpr * sizeofExpr ) {
+                const ast::Type * type = resolveTypeof( sizeofExpr->type, context );
+                const ast::Type * sizeType = context.global.sizeType.get();
                 addCandidate(
-                        new ast::SizeofExpr{
-                                sizeofExpr->location, resolveTypeof( sizeofExpr->type, context ) },
+                        new ast::SizeofExpr( sizeofExpr->location, type, sizeType ),
+                        tenv );
+        }
+
+        void Finder::postvisit( const ast::AlignofExpr * alignofExpr ) {
+                const ast::Type * type = resolveTypeof( alignofExpr->type, context );
+                const ast::Type * sizeType = context.global.sizeType.get();
+                addCandidate(
+                        new ast::AlignofExpr( alignofExpr->location, type, sizeType ),
                         tenv );
         }
@@ -1516 +1525 @@
         }
 
-        void Finder::postvisit( const ast::AlignofExpr * alignofExpr ) {
-                addCandidate(
-                        new ast::AlignofExpr{
-                                alignofExpr->location, resolveTypeof( alignofExpr->type, context ) },
-                        tenv );
-        }
-
         void Finder::postvisit( const ast::UntypedOffsetofExpr * offsetofExpr ) {
                 const ast::BaseInstType * aggInst;
@@ -1529 +1531 @@
                 else return;
 
+                const ast::Type * sizeType = context.global.sizeType.get();
                 for ( const ast::Decl * member : aggInst->lookup( offsetofExpr->member ) ) {
                         auto dwt = strict_dynamic_cast< const ast::DeclWithType * >( member );
                         addCandidate(
-                                new ast::OffsetofExpr{ offsetofExpr->location, aggInst, dwt }, tenv );
+                                new ast::OffsetofExpr( offsetofExpr->location, aggInst, dwt, sizeType ), tenv );
                 }
         }