Changeset afc1045 for src/GenPoly

Timestamp:

Apr 5, 2016, 3:31:09 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

d75038c

Parents:

b3f9a0cb

Message:

Hoist OffsetPackExpr? to top level expression

Location:

src/GenPoly

Files:

• Box.cc (modified) (3 diffs)
• ScopedSet.h (added)

src/GenPoly/Box.cc

@@ -214 +214 @@
                 };
 
-                class OffsetPackExpr;  // forward declaration so that it can be mutated by Pass2
-
                 /// * Moves polymorphic returns in function types to pointer-type parameters
                 /// * adds type size and assertion parameters to parameter lists
@@ -232 +230 @@
                         virtual Expression *mutate( AlignofExpr *alignofExpr );
                         virtual Expression *mutate( OffsetofExpr *offsetofExpr );
-                                Expression *mutate( OffsetPackExpr *offsetPackExpr );
+                        virtual Expression *mutate( OffsetPackExpr *offsetPackExpr );
 
                         virtual void doBeginScope();
@@ -248 +246 @@
                         ScopedSet< std::string > knownLayouts;          ///< Set of generic type layouts known in the current scope, indexed by sizeofName
                         ScopedSet< std::string > knownOffsets;          ///< Set of non-generic types for which the offset array exists in the current scope, indexed by offsetofName
-                };
-
-                /// Special internal expression for offset arrays inserted by Pass1 and replaced by Pass2
-                class OffsetPackExpr : public Expression {
-                public:
-                        OffsetPackExpr( StructInstType *type_, Expression *aname_ = 0 ) : Expression( aname_ ), type( type_ ) {
-                                        add_result( new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0, false, false ) );
-                        }
-                        
-                        OffsetPackExpr( const OffsetPackExpr &other ) : Expression( other ), type( maybeClone( other.type ) ) {}
-                        virtual ~OffsetPackExpr() { delete type; }
-
-                        StructInstType *get_type() const { return type; }
-                        void set_type( StructInstType *newValue ) { type = newValue; }
-
-                        virtual OffsetPackExpr *clone() const { return new OffsetPackExpr( *this ); }
-                        virtual void accept( Visitor &v ) { /* do nothing */ }
-                        virtual Expression *acceptMutator( Mutator &m ) {
-                                // only act if the mutator is a Pass2, which knows about this class
-                                if ( Pass2 *m2 = dynamic_cast< Pass2* >( &m ) ) {
-                                        return m2->mutate( this );
-                                } else {
-                                        return this;
-                                }
-                        }
-
-                        virtual void print( std::ostream &os, int indent = 0 ) const {
-                                os << std::string( indent, ' ' ) << "Offset pack expression on ";
-
-                                if ( type ) {
-                                        type->print(os, indent + 2);
-                                } else {
-                                        os << "<NULL>";
-                                }
-
-                                os << std::endl;
-                                Expression::print( os, indent );
-                        }
-                        
-                private:
-                        StructInstType *type;
                 };