Changeset 9236060 for src/Tuples

Timestamp:

Aug 14, 2017, 2:03:39 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

74b007ba

Parents:

fd344aa (diff), 54cd58b (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 references

Location:

src/Tuples

Files:

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

src/Tuples/Explode.h

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Wed Nov 9 13:12:24 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Nov 9 13:20:24 2016
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:55:16 2017
+// Update Count     : 3
 //
 
-#ifndef _EXPLODE_H_
-#define _EXPLODE_H_
+#pragma once
 
 #include "ResolvExpr/AlternativeFinder.h"
@@ -83 +82 @@
 } // namespace Tuples
 
-#endif // _TUPLE_ASSIGNMENT_H_
-
 // Local Variables: //
 // tab-width: 4 //

src/Tuples/TupleExpansion.cc

@@ -66 +66 @@
                 };
 
-                class TupleTypeReplacer : public GenPoly::DeclMutator {
-                  public:
-                        typedef GenPoly::DeclMutator Parent;
-                        using Parent::mutate;
-
-                        virtual Type * mutate( TupleType * tupleType ) override;
-
-                        virtual CompoundStmt * mutate( CompoundStmt * stmt ) override {
-                                typeMap.beginScope();
-                                stmt = Parent::mutate( stmt );
-                                typeMap.endScope();
-                                return stmt;
+                struct TupleTypeReplacer : public WithDeclsToAdd, public WithGuards, public WithTypeSubstitution {
+                        Type * postmutate( TupleType * tupleType );
+
+                        void premutate( CompoundStmt * ) {
+                                GuardScope( typeMap );
                         }
                   private:
@@ -111 +104 @@
                 mutateAll( translationUnit, assnExpander );
 
-                TupleTypeReplacer replacer;
-                replacer.mutateDeclarationList( translationUnit );
+                PassVisitor<TupleTypeReplacer> replacer;
+                mutateAll( translationUnit, replacer );
 
                 PassVisitor<TupleIndexExpander> idxExpander;
@@ -218 +211 @@
         }
 
-        Type * TupleTypeReplacer::mutate( TupleType * tupleType ) {
-                tupleType = safe_dynamic_cast< TupleType * > ( Parent::mutate( tupleType ) );
+        Type * TupleTypeReplacer::postmutate( TupleType * tupleType ) {
                 unsigned tupleSize = tupleType->size();
                 if ( ! typeMap.count( tupleSize ) ) {
@@ -226 +218 @@
                         decl->set_body( true );
                         for ( size_t i = 0; i < tupleSize; ++i ) {
-                                TypeDecl * tyParam = new TypeDecl( toString( "tuple_param_", i ), Type::StorageClasses(), nullptr, TypeDecl::Any );
+                                TypeDecl * tyParam = new TypeDecl( toString( "tuple_param_", tupleSize, "_", i ), Type::StorageClasses(), nullptr, TypeDecl::Any );
                                 decl->get_members().push_back( new ObjectDecl( toString("field_", i ), Type::StorageClasses(), LinkageSpec::C, nullptr, new TypeInstType( Type::Qualifiers(), tyParam->get_name(), tyParam ), nullptr ) );
                                 decl->get_parameters().push_back( tyParam );
@@ -235 +227 @@
                         }
                         typeMap[tupleSize] = decl;
-                        addDeclaration( decl );
+                        declsToAddBefore.push_back( decl );
                 }
                 Type::Qualifiers qualifiers = tupleType->get_qualifiers();
@@ -241 +233 @@
                 StructDecl * decl = typeMap[tupleSize];
                 StructInstType * newType = new StructInstType( qualifiers, decl );
-                for ( Type * t : *tupleType ) {
+                for ( auto p : group_iterate( tupleType->get_types(), decl->get_parameters() ) ) {
+                        Type * t = std::get<0>(p);
+                        TypeDecl * td = std::get<1>(p);
                         newType->get_parameters().push_back( new TypeExpr( t->clone() ) );
+                        if ( env ) {
+                                // add bindings to the type environment.
+                                // xxx - This may not be sufficient, it may be necessary to rename type variables on StructInstType?
+                                env->add( td->get_name(), t->clone() );
+                        }
                 }
                 delete tupleType;

src/Tuples/Tuples.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Nov 9 13:17:58 2016
-// Update Count     : 15
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:55:00 2017
+// Update Count     : 16
 //
 
-#ifndef _TUPLES_H_
-#define _TUPLES_H_
+#pragma once
 
 #include <string>
@@ -49 +48 @@
 } // namespace Tuples
 
-#endif // _TUPLE_ASSIGNMENT_H_
-
 // Local Variables: //
 // tab-width: 4 //