Changeset 24d6572 for src/Common/CodeLocationTools.cpp

Timestamp:

Jun 12, 2023, 2:45:32 PM (2 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

62d62db

Parents:

34b4268 (diff), 251ce80 (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' into ast-experimental

File:

• src/Common/CodeLocationTools.cpp (modified) (3 diffs)

src/Common/CodeLocationTools.cpp

@@ -128 +128 @@
     macro(FinallyClause, FinallyClause) \
     macro(SuspendStmt, Stmt) \
+    macro(WhenClause, WhenClause) \
     macro(WaitForStmt, Stmt) \
     macro(WaitForClause, WaitForClause) \
+    macro(WaitUntilStmt, Stmt) \
     macro(WithStmt, Decl) \
     macro(NullStmt, NullStmt) \
@@ -208 +210 @@
 
 struct LeafKindVisitor : public ast::Visitor {
-        LeafKind kind;
+        LeafKind result;
 
 #define VISIT(node_type, return_type) \
         const ast::return_type * visit( const ast::node_type * ) final { \
-                kind = LeafKind::node_type; \
+                result = LeafKind::node_type; \
                 return nullptr; \
         }
@@ -222 +224 @@
 
 LeafKind get_leaf_kind( ast::Node const * node ) {
-        LeafKindVisitor visitor;
-        node->accept( visitor );
-        return visitor.kind;
+        return ast::Pass<LeafKindVisitor>::read( node );
 }