Changeset 6e1e2d0 for src/Common

Timestamp:

May 1, 2023, 4:19:09 PM (21 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

c083c3d

Parents:

a50fdfb (diff), 985b624 (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:

resolved merge conflicts

Location:

src/Common

Files:

• CodeLocationTools.cpp (modified) (2 diffs)
• Iterate.hpp (modified) (4 diffs)

src/Common/CodeLocationTools.cpp

@@ -210 +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; \
         }
@@ -224 +224 @@
 
 LeafKind get_leaf_kind( ast::Node const * node ) {
-        LeafKindVisitor visitor;
-        node->accept( visitor );
-        return visitor.kind;
+        return ast::Pass<LeafKindVisitor>::read( node );
 }
 

src/Common/Iterate.hpp

@@ -20 +20 @@
 #include <iterator>
 
-// it's nice to actually be able to increment iterators by an arbitrary amount
+// Returns an iterator that is it advanced n times.
 template< class InputIt, class Distance >
 InputIt operator+( InputIt it, Distance n ) {
@@ -50 +50 @@
 
 // -----------------------------------------------------------------------------
+// Helper struct and function to support
+// for ( val_and_index : enumerate( container ) ) {}
+// which iterates through the container and tracks the index as well.
+
 template< typename T >
 struct enumerate_t {
@@ -109 +113 @@
 
 // -----------------------------------------------------------------------------
+// Helper function to transform one iterable container into another.
+
 template< typename OutType, typename Range, typename Functor >
 OutType map_range( const Range& range, Functor&& functor ) {
@@ -206 +212 @@
 // Helper struct and function to support
 // for ( val : lazy_map( container1, f ) ) {}
-// syntax to have a for each that iterates a container, mapping each element by applying f
+// syntax to have a for each that iterates a container,
+// mapping each element by applying f.
+
 template< typename T, typename Func >
 struct lambda_iterate_t {