Changeset 9b4f329 for src/Tuples

Timestamp:

May 16, 2019, 6:46:51 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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:

246c245

Parents:

f3cc5b6

Message:

Finished porting AST::Expr subclasses

Location:

src/Tuples

Files:

• TupleExpansion.cc (modified) (2 diffs)
• Tuples.h (modified) (2 diffs)

src/Tuples/TupleExpansion.cc

@@ -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
@@ -314 +319 @@
                 return new TupleType( qualifiers, types );
         }
+        const ast::Type * makeTupleType( const std::vector<ast::ptr<ast::Expr>> & exprs ) {
+                assert(!"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 ) {

src/Tuples/Tuples.h

@@ -19 +19 @@
 #include <vector>
 
+#include "AST/Fwd.hpp"
+#include "AST/Node.hpp"
 #include "SynTree/Expression.h"
 #include "SynTree/Declaration.h"
@@ -42 +44 @@
         /// returns VoidType if any of the expressions have Voidtype, otherwise TupleType of the Expression result types
         Type * makeTupleType( const std::list< Expression * > & exprs );
+        const ast::Type * makeTupleType( const std::vector<ast::ptr<ast::Expr>> & exprs );
 
         /// returns a TypeInstType if `type` is a ttype, nullptr otherwise