Changeset 2a4b088 for src/SynTree

Timestamp:

Feb 2, 2016, 2:00:37 PM (10 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:

4789f44, b10c9959

Parents:

5721a6d

Message:

Make offsetof expressions work

Location:

src/SynTree

Files:

• Expression.cc (modified) (1 diff)
• Expression.h (modified) (1 diff)
• Mutator.cc (modified) (1 diff)
• Mutator.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Visitor.cc (modified) (1 diff)
• Visitor.h (modified) (1 diff)

src/SynTree/Expression.cc

@@ -163 +163 @@
 }
 
+UntypedOffsetofExpr::UntypedOffsetofExpr( Type *type_, const std::string &member_, Expression *_aname ) :
+                Expression( _aname ), type(type_), member(member_) {
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+}
+
+UntypedOffsetofExpr::UntypedOffsetofExpr( const UntypedOffsetofExpr &other ) :
+        Expression( other ), type( maybeClone( other.type ) ), member( other.member ) {}
+
+UntypedOffsetofExpr::~UntypedOffsetofExpr() {
+        delete type;
+}
+
+void UntypedOffsetofExpr::print( std::ostream &os, int indent) const {
+        os << std::string( indent, ' ' ) << "Untyped Offsetof Expression on member " << member << " of ";
+
+        if ( type ) {
+                type->print(os, indent + 2);
+        } else {
+                os << "<NULL>";
+        }
+
+        os << std::endl;
+        Expression::print( os, indent );
+}
+
 OffsetofExpr::OffsetofExpr( Type *type_, DeclarationWithType *member_, Expression *_aname ) :
                 Expression( _aname ), type(type_), member(member_) {

src/SynTree/Expression.h

@@ -319 +319 @@
 };
 
+/// UntypedOffsetofExpr represents an offsetof expression before resolution
+class UntypedOffsetofExpr : public Expression {
+  public:
+        UntypedOffsetofExpr( Type *type, const std::string &member, Expression *_aname = 0 );
+        UntypedOffsetofExpr( const UntypedOffsetofExpr &other );
+        virtual ~UntypedOffsetofExpr();
+
+        std::string get_member() const { return member; }
+        void set_member( const std::string &newValue ) { member = newValue; }
+        Type *get_type() const { return type; }
+        void set_type( Type *newValue ) { type = newValue; }
+
+        virtual UntypedOffsetofExpr *clone() const { return new UntypedOffsetofExpr( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Expression *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        Type *type;
+        std::string member;
+};
+
 /// OffsetofExpr represents an offsetof expression
 class OffsetofExpr : public Expression {

src/SynTree/Mutator.cc

@@ -261 +261 @@
 }
 
+Expression *Mutator::mutate( UntypedOffsetofExpr *offsetofExpr ) {
+        mutateAll( offsetofExpr->get_results(), *this );
+        offsetofExpr->set_type( maybeMutate( offsetofExpr->get_type(), *this ) );
+        return offsetofExpr;
+}
+
 Expression *Mutator::mutate( OffsetofExpr *offsetofExpr ) {
         mutateAll( offsetofExpr->get_results(), *this );

src/SynTree/Mutator.h

@@ -65 +65 @@
         virtual Expression* mutate( SizeofExpr *sizeofExpr );
         virtual Expression* mutate( AlignofExpr *alignofExpr );
+        virtual Expression* mutate( UntypedOffsetofExpr *offsetofExpr );
         virtual Expression* mutate( OffsetofExpr *offsetofExpr );
         virtual Expression* mutate( AttrExpr *attrExpr );

src/SynTree/SynTree.h

@@ -70 +70 @@
 class SizeofExpr;
 class AlignofExpr;
+class UntypedOffsetofExpr;
 class OffsetofExpr;
 class AttrExpr;

src/SynTree/Visitor.cc

@@ -219 +219 @@
 }
 
+void Visitor::visit( UntypedOffsetofExpr *offsetofExpr ) {
+        acceptAll( offsetofExpr->get_results(), *this );
+        maybeAccept( offsetofExpr->get_type(), *this );
+}
+
 void Visitor::visit( OffsetofExpr *offsetofExpr ) {
         acceptAll( offsetofExpr->get_results(), *this );

src/SynTree/Visitor.h

@@ -65 +65 @@
         virtual void visit( SizeofExpr *sizeofExpr );
         virtual void visit( AlignofExpr *alignofExpr );
+        virtual void visit( UntypedOffsetofExpr *offsetofExpr );
         virtual void visit( OffsetofExpr *offsetofExpr );
         virtual void visit( AttrExpr *attrExpr );