Changeset e67a82d for src/ResolvExpr/CurrentObject.cc

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

• src/ResolvExpr/CurrentObject.cc (modified) (15 diffs)

src/ResolvExpr/CurrentObject.cc

@@ -21 +21 @@
 #include <string>                      // for string, operator<<, allocator
 
+#include "AST/Copy.hpp"                // for shallowCopy
 #include "AST/Expr.hpp"                // for InitAlternative
 #include "AST/GenericSubstitution.hpp" // for genericSubstitution
 #include "AST/Init.hpp"                // for Designation
 #include "AST/Node.hpp"                // for readonly
+#include "AST/Print.hpp"                // for readonly
 #include "AST/Type.hpp"
 #include "Common/Indenter.h"           // for Indenter, operator<<
@@ -596 +598 @@
                 SimpleIterator( const CodeLocation & loc, const Type * t ) : location( loc ), type( t ) {}
 
-                void setPosition( 
-                        std::deque< ptr< Expr > >::const_iterator begin, 
+                void setPosition(
+                        std::deque< ptr< Expr > >::const_iterator begin,
                         std::deque< ptr< Expr > >::const_iterator end
                 ) override {
@@ -637 +639 @@
                         auto res = eval(expr);
                         if ( ! res.second ) {
-                                SemanticError( location, 
+                                SemanticError( location,
                                         toString("Array designator must be a constant expression: ", expr ) );
                         }
@@ -644 +646 @@
 
         public:
-                ArrayIterator( const CodeLocation & loc, const ArrayType * at ) 
+                ArrayIterator( const CodeLocation & loc, const ArrayType * at )
                 : location( loc ), array( at ), base( at->base ) {
                         PRINT( std::cerr << "Creating array iterator: " << at << std::endl; )
@@ -655 +657 @@
 
                 void setPosition( const Expr * expr ) {
-                        // need to permit integer-constant-expressions, including: integer constants, 
-                        // enumeration constants, character constants, sizeof expressions, alignof expressions, 
+                        // need to permit integer-constant-expressions, including: integer constants,
+                        // enumeration constants, character constants, sizeof expressions, alignof expressions,
                         // cast expressions
                         if ( auto constExpr = dynamic_cast< const ConstantExpr * >( expr ) ) {
@@ -662 +664 @@
                                         index = constExpr->intValue();
                                 } catch ( SemanticErrorException & ) {
-                                        SemanticError( expr, 
+                                        SemanticError( expr,
                                                 "Constant expression of non-integral type in array designator: " );
                                 }
                         } else if ( auto castExpr = dynamic_cast< const CastExpr * >( expr ) ) {
                                 setPosition( castExpr->arg );
-                        } else if ( 
-                                dynamic_cast< const SizeofExpr * >( expr ) 
-                                || dynamic_cast< const AlignofExpr * >( expr ) 
+                        } else if (
+                                dynamic_cast< const SizeofExpr * >( expr )
+                                || dynamic_cast< const AlignofExpr * >( expr )
                         ) {
                                 index = 0;
                         } else {
-                                assertf( false, 
+                                assertf( false,
                                         "bad designator given to ArrayIterator: %s", toString( expr ).c_str() );
                         }
                 }
 
-                void setPosition( 
-                        std::deque< ptr< Expr > >::const_iterator begin, 
+                void setPosition(
+                        std::deque< ptr< Expr > >::const_iterator begin,
                         std::deque< ptr< Expr > >::const_iterator end
                 ) override {
@@ -758 +760 @@
                 }
 
-                AggregateIterator( 
-                        const CodeLocation & loc, const std::string k, const std::string & n, const Type * i, 
+                AggregateIterator(
+                        const CodeLocation & loc, const std::string k, const std::string & n, const Type * i,
                         const MemberList & ms )
-                : location( loc ), kind( k ), name( n ), inst( i ), members( ms ), curMember( ms.begin() ), 
+                : location( loc ), kind( k ), name( n ), inst( i ), members( ms ), curMember( ms.begin() ),
                   sub( genericSubstitution( i ) ) {
                         PRINT( std::cerr << "Creating " << kind << "(" << name << ")"; )
@@ -768 +770 @@
 
         public:
-                void setPosition( 
-                        std::deque< ptr< Expr > >::const_iterator begin, 
+                void setPosition(
+                        std::deque< ptr< Expr > >::const_iterator begin,
                         std::deque< ptr< Expr > >::const_iterator end
                 ) final {
@@ -786 +788 @@
                                         return;
                                 }
-                                assertf( false, 
+                                assertf( false,
                                         "could not find member in %s: %s", kind.c_str(), toString( varExpr ).c_str() );
                         } else {
-                                assertf( false, 
+                                assertf( false,
                                         "bad designator given to %s: %s", kind.c_str(), toString( *begin ).c_str() );
                         }
@@ -803 +805 @@
                                                 new VariableExpr{ location, curMember->strict_as< ObjectDecl >() } );
                                         // need to substitute for generic types so that casts are to concrete types
+                                        alt.type = shallowCopy(alt.type.get());
                                         PRINT( std::cerr << "  type is: " << alt.type; )
                                         sub.apply( alt.type ); // also apply to designation??
@@ -842 +845 @@
                                 for ( InitAlternative & alt : ret ) {
                                         PRINT( std::cerr << "iterating and adding designators" << std::endl; )
-                                        alt.designation.get_and_mutate()->designators.emplace_front( 
+                                        alt.designation.get_and_mutate()->designators.emplace_front(
                                                 new VariableExpr{ location, curMember->strict_as< ObjectDecl >() } );
                                 }
@@ -897 +900 @@
         class TupleIterator final : public AggregateIterator {
         public:
-                TupleIterator( const CodeLocation & loc, const TupleType * inst ) 
-                : AggregateIterator( 
-                        loc, "TupleIterator", toString("Tuple", inst->size()), inst, inst->members 
+                TupleIterator( const CodeLocation & loc, const TupleType * inst )
+                : AggregateIterator(
+                        loc, "TupleIterator", toString("Tuple", inst->size()), inst, inst->members
                 ) {}
 
@@ -926 +929 @@
                                 return new UnionIterator{ loc, uit };
                         } else {
-                                assertf( 
-                                        dynamic_cast< const EnumInstType * >( aggr ) 
-                                                || dynamic_cast< const TypeInstType * >( aggr ), 
+                                assertf(
+                                        dynamic_cast< const EnumInstType * >( type )
+                                                || dynamic_cast< const TypeInstType * >( type ),
                                         "Encountered unhandled ReferenceToType in createMemberIterator: %s",
                                                 toString( type ).c_str() );
@@ -949 +952 @@
                 using DesignatorChain = std::deque< ptr< Expr > >;
                 PRINT( std::cerr << "___findNext" << std::endl; )
-                
+
                 // find all the d's
                 std::vector< DesignatorChain > desigAlts{ {} }, newDesigAlts;
@@ -1013 +1016 @@
                 // set new designators
                 assertf( ! objStack.empty(), "empty object stack when setting designation" );
-                Designation * actualDesignation = 
+                Designation * actualDesignation =
                         new Designation{ designation->location, DesignatorChain{d} };
                 objStack.back()->setPosition( d ); // destroys d