Changeset 4dc3b8c for src/Tuples

Timestamp:

Nov 30, 2023, 6:14:20 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master, stuck-waitfor-destruct

Children:

2f8d351

Parents:

7f2bfb7 (diff), c4570af3 (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

Location:

src/Tuples

Files:

• TupleAssignment.cc (modified) (3 diffs)
• TupleExpansion.cc (deleted)
• TupleExpansion.cpp (moved) (moved from src/Tuples/TupleExpansionNew.cpp ) (2 diffs)
• module.mk (modified) (1 diff)

src/Tuples/TupleAssignment.cc

@@ -13 +13 @@
 // Update Count     : 10
 //
+
+#include "Tuples.h"
 
 #include <algorithm>                       // for transform
@@ -224 +226 @@
                                 // by the cast type as needed, and transfer the resulting environment.
                                 ResolvExpr::CandidateFinder finder( spotter.crntFinder.context, env );
-                                finder.find( rhsCand->expr, ResolvExpr::ResolvMode::withAdjustment() );
+                                finder.find( rhsCand->expr, ResolvExpr::ResolveMode::withAdjustment() );
                                 assert( 1 == finder.candidates.size() );
                                 env = std::move( finder.candidates.front()->env );
@@ -345 +347 @@
 
                         try {
-                                finder.find( expr, ResolvExpr::ResolvMode::withAdjustment() );
+                                finder.find( expr, ResolvExpr::ResolveMode::withAdjustment() );
                         } catch (...) {
                                 // No match is not failure, just that this tuple assignment is invalid.

src/Tuples/TupleExpansion.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TupleExpansionNew.cpp --
+// TupleExpansion.cpp --
 //
 // Author           : Henry Xue
@@ -294 +294 @@
 }
 
+const ast::Type * makeTupleType( const std::vector<ast::ptr<ast::Expr>> & exprs ) {
+        // If there are no expressions, the answer is set, otherwise go through a loop.
+        if ( exprs.empty() ) return new ast::TupleType( {} );
+
+        std::vector<ast::ptr<ast::Type>> types;
+        ast::CV::Qualifiers quals(
+                ast::CV::Const | ast::CV::Volatile | ast::CV::Restrict |
+                ast::CV::Atomic | ast::CV::Mutex );
+
+        for ( const ast::Expr * expr : exprs ) {
+                assert( expr->result );
+                // If the type of any expr is void, the type of the entire tuple is void.
+                if ( expr->result->isVoid() ) return new ast::VoidType();
+
+                // Qualifiers on the tuple type are the qualifiers that exist on all components.
+                quals &= expr->result->qualifiers;
+
+                types.emplace_back( expr->result );
+        }
+
+        return new ast::TupleType( std::move( types ), quals );
+}
+
+const ast::TypeInstType * isTtype( const ast::Type * type ) {
+        if ( const ast::TypeInstType * inst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
+                if ( inst->base && inst->base->kind == ast::TypeDecl::Ttype ) {
+                        return inst;
+                }
+        }
+        return nullptr;
+}
+
 } // namespace Tuples
+

src/Tuples/module.mk

@@ -19 +19 @@
         Tuples/Explode.h \
         Tuples/TupleAssignment.cc \
-        Tuples/TupleExpansion.cc \
-        Tuples/TupleExpansionNew.cpp \
+        Tuples/TupleExpansion.cpp \
         Tuples/Tuples.cc \
         Tuples/Tuples.h