Changeset 933f32f for src/Tuples/TupleExpansion.cc

Timestamp:

May 24, 2019, 10:19:41 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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 cleanup-dtors

File:

• src/Tuples/TupleExpansion.cc (modified) (4 diffs)

src/Tuples/TupleExpansion.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 21 17:35:04 2017
-// Update Count     : 19
+// Last Modified On : Wed Feb 13 18:14:12 2019
+// Update Count     : 21
 //
 
@@ -17 +17 @@
 #include <cassert>                // for assert
 #include <list>                   // for list
-
+#include <vector>
+
+#include "AST/CVQualifiers.hpp"
+#include "AST/Expr.hpp"
+#include "AST/Node.hpp"
+#include "AST/Type.hpp"
 #include "Common/PassVisitor.h"   // for PassVisitor, WithDeclsToAdd, WithGu...
 #include "Common/ScopedMap.h"     // for ScopedMap
@@ -58 +63 @@
                 };
 
-                struct TupleTypeReplacer : public WithDeclsToAdd, public WithGuards, public WithTypeSubstitution {
+                struct TupleTypeReplacer : public WithDeclsToAdd, public WithGuards, public WithConstTypeSubstitution {
                         Type * postmutate( TupleType * tupleType );
 
@@ -314 +319 @@
                 return new TupleType( qualifiers, types );
         }
+        const ast::Type * makeTupleType( const std::vector<ast::ptr<ast::Expr>> & exprs ) {
+                (void) exprs;
+                #warning Not implemented; needs Type.cpp in build
+                assertf(false, "Not implemented; needs Type.cpp in build");
+                // // produce the TupleType which aggregates the types of the exprs
+                // std::vector<ast::ptr<ast::Type>> types;
+                // ast::CV::Qualifiers quals{
+                //      ast::CV::Const | ast::CV::Volatile | ast::CV::Restrict | ast::CV::Lvalue |
+                //      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 );
+                // }
+
+                // if ( exprs.empty() ) { quals = ast::CV::Qualifiers{}; }
+                // return new ast::TupleType{ std::move(types), quals };
+        }
 
         TypeInstType * isTtype( Type * type ) {