Changeset 45a091b

Timestamp:

Nov 15, 2023, 11:55:59 AM (8 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

b8b5535

Parents:

1ccae59

Message:

It turns out enumerate does work if you use this very particular form of the for loop added in C++17. Ironically in this simple vector case it is about as complex. Swapped the order of fields in the enuemate value to make the binding read key-then-value.

Location:

src

Files:

• Common/Iterate.hpp (modified) (2 diffs)
• Concurrency/WaitforNew.cpp (modified) (3 diffs)

src/Common/Iterate.hpp

@@ -58 +58 @@
         template<typename val_t>
         struct value_t {
+                size_t idx;
                 val_t & val;
-                size_t idx;
         };
 
@@ -69 +69 @@
                 iterator_t( iter_t _it, size_t _idx ) : it(_it), idx(_idx) {}
 
-                value_t<val_t> operator*() const { return value_t<val_t>{ *it, idx }; }
+                value_t<val_t> operator*() const { return value_t<val_t>{ idx, *it }; }
 
                 bool operator==(const iterator_t & o) const { return o.it == it; }

src/Concurrency/WaitforNew.cpp

@@ -450 +450 @@
         );
 
-        // For some reason, enumerate doesn't work here because of references.
-        for ( size_t i = 0 ; i < waitfor->clauses.size() ; ++i ) {
+        for ( const auto & [i, clause] : enumerate( waitfor->clauses ) ) {
                 theSwitch->cases.push_back(
                         new ast::CaseClause( location,
@@ -457 +456 @@
                                 {
                                         new ast::CompoundStmt( location, {
-                                                waitfor->clauses[i]->stmt,
+                                                clause->stmt,
                                                 new ast::BranchStmt( location,
                                                         ast::BranchStmt::Break,
@@ -538 +537 @@
         ast::Stmt       * setter      = makeSetter( location, flag );
 
-        // For some reason, enumerate doesn't work here because of references.
-        for ( size_t i = 0 ; i < stmt->clauses.size() ; ++i ) {
-                init_clause( comp, acceptables, i, stmt->clauses[i], setter );
+        for ( const auto & [i, clause] : enumerate( stmt->clauses ) ) {
+                init_clause( comp, acceptables, i, clause, setter );
         }