Changeset 0658672 for src/AST

Timestamp:

Jun 9, 2023, 4:56:02 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ast-experimental, master

Children:

38e266ca

Parents:

758c9ef

Message:

Improved hoisting. However, I had to change some code because of other errors, so more work will have to be done. Also folded in another invariant for MemberExpr.

Location:

src/AST

Files:

• DeclReplacer.hpp (modified) (1 diff)
• Util.cpp (modified) (2 diffs)

src/AST/DeclReplacer.hpp

@@ -18 +18 @@
 #include <unordered_map>
 
-#include "Node.hpp"
+namespace ast {
+        class DeclWithType;
+        class Expr;
+        class Node;
+        class TypeDecl;
+}
 
 namespace ast {
-        class DeclWithType;
-        class TypeDecl;
-        class Expr;
 
-        namespace DeclReplacer {
-                using DeclMap = std::unordered_map< const DeclWithType *, const DeclWithType * >;
-                using TypeMap = std::unordered_map< const TypeDecl *, const TypeDecl * >;
-                using ExprMap = std::unordered_map< const DeclWithType *, const Expr * >;
+namespace DeclReplacer {
 
-                const Node * replace( const Node * node, const DeclMap & declMap, bool debug = false );
-                const Node * replace( const Node * node, const TypeMap & typeMap, bool debug = false );
-                const Node * replace( const Node * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug = false );
-                const Node * replace( const Node * node, const ExprMap & exprMap);
-        }
+using DeclMap = std::unordered_map< const DeclWithType *, const DeclWithType * >;
+using TypeMap = std::unordered_map< const TypeDecl *, const TypeDecl * >;
+using ExprMap = std::unordered_map< const DeclWithType *, const Expr * >;
+
+const Node * replace( const Node * node, const DeclMap & declMap, bool debug = false );
+const Node * replace( const Node * node, const TypeMap & typeMap, bool debug = false );
+const Node * replace( const Node * node, const DeclMap & declMap, const TypeMap & typeMap, bool debug = false );
+const Node * replace( const Node * node, const ExprMap & exprMap);
+
+}
+
 }
 

src/AST/Util.cpp

@@ -83 +83 @@
 }
 
+/// Check that the MemberExpr has an aggregate type and matching member.
+void memberMatchesAggregate( const MemberExpr * expr ) {
+        const Type * aggrType = expr->aggregate->result->stripReferences();
+        const AggregateDecl * decl = nullptr;
+        if ( auto inst = dynamic_cast<const StructInstType *>( aggrType ) ) {
+                decl = inst->base;
+        } else if ( auto inst = dynamic_cast<const UnionInstType *>( aggrType ) ) {
+                decl = inst->base;
+        }
+        assertf( decl, "Aggregate of member not correct type." );
+
+        for ( auto aggrMember : decl->members ) {
+                if ( expr->member == aggrMember ) {
+                        return;
+                }
+        }
+        assertf( false, "Member not found." );
+}
+
 struct InvariantCore {
         // To save on the number of visits: this is a kind of composed core.
@@ -108 +127 @@
         }
 
+        void previsit( const MemberExpr * node ) {
+                previsit( (const ParseNode *)node );
+                memberMatchesAggregate( node );
+        }
+
         void postvisit( const Node * node ) {
                 no_strong_cycles.postvisit( node );