Changeset 6009a5a

Timestamp:

Nov 30, 2023, 12:10:06 PM (5 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

83fd57d

Parents:

ab9c1b3

Message:

Combined the new and old TupleExpansion? files.

Location:

src/Tuples

Files:

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

src/Tuples/TupleExpansion.cpp

@@ -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