Changeset efe420f3

Timestamp:

Sep 14, 2023, 7:42:11 AM (8 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

334e0cf2, a738c68

Parents:

f64cc42 (diff), bfeb37a6 (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

File:

• src/AST/Util.cpp (modified) (3 diffs)

src/AST/Util.cpp

@@ -104 +104 @@
         }
         assertf( false, "Member not found." );
+}
+
+template<typename node_t>
+void oneOfExprOrType( const node_t * node ) {
+        if ( node->expr ) {
+                assertf( node->expr && !node->type, "Exactly one of expr or type should be set." );
+        } else {
+                assertf( !node->expr && node->type, "Exactly one of expr or type should be set." );
+        }
 }
 
@@ -152 +161 @@
         }
 
+        void previsit( const SizeofExpr * node ) {
+                previsit( (const ParseNode *)node );
+                oneOfExprOrType( node );
+        }
+
+        void previsit( const AlignofExpr * node ) {
+                previsit( (const ParseNode *)node );
+                oneOfExprOrType( node );
+        }
+
         void previsit( const StructInstType * node ) {
                 previsit( (const Node *)node );
@@ -181 +200 @@
 /// referring to is in scope by the structural rules of code.
 // Any escapes marked with a bug should be removed once the bug is fixed.
+// This is a separate pass because of it changes the visit pattern and
+// must always be run on the entire translation unit.
 struct InScopeCore : public ast::WithShortCircuiting {
         ScopedSet<DeclWithType const *> typedDecls;