Changeset d63eeb0 for src/SynTree

Timestamp:

Feb 9, 2016, 3:25:05 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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 ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

Location:

src/SynTree

Files:

• AddressExpr.cc (modified) (1 diff)
• AggregateDecl.cc (modified) (1 diff)
• ApplicationExpr.cc (modified) (1 diff)
• ArrayType.cc (modified) (1 diff)
• AttrType.cc (modified) (1 diff)
• CommaExpr.cc (modified) (1 diff)
• CompoundStmt.cc (modified) (1 diff)
• DeclStmt.cc (modified) (1 diff)
• Declaration.cc (modified) (1 diff)
• DeclarationWithType.cc (modified) (1 diff)
• Expression.cc (modified) (4 diffs)
• Expression.h (modified) (1 diff)
• FunctionDecl.cc (modified) (1 diff)
• FunctionType.cc (modified) (1 diff)
• Initializer.cc (modified) (1 diff)
• Initializer.h (modified) (3 diffs)
• Mutator.cc (modified) (2 diffs)
• Mutator.h (modified) (2 diffs)
• NamedTypeDecl.cc (modified) (1 diff)
• ObjectDecl.cc (modified) (2 diffs)
• PointerType.cc (modified) (1 diff)
• ReferenceToType.cc (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• TupleExpr.cc (modified) (1 diff)
• TupleType.cc (modified) (1 diff)
• Type.cc (modified) (1 diff)
• TypeDecl.cc (modified) (1 diff)
• TypeExpr.cc (modified) (1 diff)
• TypeofType.cc (modified) (1 diff)
• Visitor.cc (modified) (1 diff)
• Visitor.h (modified) (3 diffs)

src/SynTree/AddressExpr.cc

@@ -16 +16 @@
 #include "Expression.h"
 #include "Type.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 AddressExpr::AddressExpr( Expression *arg, Expression *_aname ) : Expression( _aname ), arg( arg ) {

src/SynTree/AggregateDecl.cc

@@ -16 +16 @@
 #include "Declaration.h"
 #include "Type.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 

src/SynTree/ApplicationExpr.cc

@@ -20 +20 @@
 #include "Type.h"
 #include "TypeSubstitution.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 

src/SynTree/ArrayType.cc

@@ -16 +16 @@
 #include "Type.h"
 #include "Expression.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 

src/SynTree/AttrType.cc

@@ -16 +16 @@
 #include "Type.h"
 #include "Expression.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 

src/SynTree/CommaExpr.cc

@@ -16 +16 @@
 #include "Expression.h"
 #include "Type.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 CommaExpr::CommaExpr( Expression *arg1, Expression *arg2, Expression *_aname )

src/SynTree/CompoundStmt.cc

@@ -15 +15 @@
 
 #include "Statement.h"
-#include "utility.h"
+#include "Common/utility.h"
 #include <algorithm>
 #include <functional>

src/SynTree/DeclStmt.cc

@@ -16 +16 @@
 #include "Statement.h"
 #include "Declaration.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 DeclStmt::DeclStmt( std::list<Label> labels, Declaration *decl ) : Statement( labels ), decl( decl ) {

src/SynTree/Declaration.cc

@@ -20 +20 @@
 #include "Initializer.h"
 #include "Type.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 static UniqueId lastUniqueId = 0;

src/SynTree/DeclarationWithType.cc

@@ -16 +16 @@
 #include "Declaration.h"
 #include "Type.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage )

src/SynTree/Expression.cc

@@ -26 +26 @@
 #include "Statement.h"
 #include "TypeSubstitution.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 
@@ -103 +103 @@
 SizeofExpr::SizeofExpr( Expression *expr_, Expression *_aname ) :
                 Expression( _aname ), expr(expr_), type(0), isType(false) {
-        add_result( new BasicType( Type::Qualifiers(), BasicType::UnsignedInt ) );
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
 }
 
 SizeofExpr::SizeofExpr( Type *type_, Expression *_aname ) :
                 Expression( _aname ), expr(0), type(type_), isType(true) {
-        add_result( new BasicType( Type::Qualifiers(), BasicType::UnsignedInt ) );
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
 }
 
@@ -134 +134 @@
 AlignofExpr::AlignofExpr( Expression *expr_, Expression *_aname ) :
                 Expression( _aname ), expr(expr_), type(0), isType(false) {
-        add_result( new BasicType( Type::Qualifiers(), BasicType::UnsignedInt ) );
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
 }
 
 AlignofExpr::AlignofExpr( Type *type_, Expression *_aname ) :
                 Expression( _aname ), expr(0), type(type_), isType(true) {
-        add_result( new BasicType( Type::Qualifiers(), BasicType::UnsignedInt ) );
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
 }
 
@@ -158 +158 @@
         else
                 expr->print(os, indent + 2);
+
+        os << std::endl;
+        Expression::print( os, indent );
+}
+
+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_) {
+        add_result( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) );
+}
+
+OffsetofExpr::OffsetofExpr( const OffsetofExpr &other ) :
+        Expression( other ), type( maybeClone( other.type ) ), member( maybeClone( other.member ) ) {}
+
+OffsetofExpr::~OffsetofExpr() {
+        delete type;
+        delete member;
+}
+
+void OffsetofExpr::print( std::ostream &os, int indent) const {
+        os << std::string( indent, ' ' ) << "Offsetof Expression on member ";
+
+        if ( member ) {
+                os << member->get_name();
+        } else {
+                os << "<NULL>";
+        }
+
+        os << " of ";
+
+        if ( type ) {
+                type->print(os, indent + 2);
+        } else {
+                os << "<NULL>";
+        }
 
         os << std::endl;

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 {
+  public:
+        OffsetofExpr( Type *type, DeclarationWithType *member, Expression *_aname = 0 );
+        OffsetofExpr( const OffsetofExpr &other );
+        virtual ~OffsetofExpr();
+
+        Type *get_type() const { return type; }
+        void set_type( Type *newValue ) { type = newValue; }
+        DeclarationWithType *get_member() const { return member; }
+        void set_member( DeclarationWithType *newValue ) { member = newValue; }
+
+        virtual OffsetofExpr *clone() const { return new OffsetofExpr( *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;
+        DeclarationWithType *member;
+};
+
 /// AttrExpr represents an @attribute expression (like sizeof, but user-defined)
 class AttrExpr : public Expression {

src/SynTree/FunctionDecl.cc

@@ -19 +19 @@
 #include "Statement.h"
 #include "Type.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn )

src/SynTree/FunctionType.cc

@@ -18 +18 @@
 #include "Type.h"
 #include "Declaration.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 FunctionType::FunctionType( const Type::Qualifiers &tq, bool isVarArgs ) : Type( tq ), isVarArgs( isVarArgs ) {

src/SynTree/Initializer.cc

@@ -16 +16 @@
 #include "Initializer.h"
 #include "Expression.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 Initializer::Initializer( bool maybeConstructed ) : maybeConstructed( maybeConstructed ) {}

src/SynTree/Initializer.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jan 13 15:29:53 2016
-// Update Count     : 17
+// Last Modified On : Tue Feb 09 14:40:15 2016
+// Update Count     : 19
 //
 
@@ -58 +58 @@
 class SingleInit : public Initializer {
   public:
-        SingleInit( Expression *value, std::list< Expression *> &designators, bool maybeConstructed );
+        SingleInit( Expression *value, std::list< Expression *> &designators, bool maybeConstructed = false );
         SingleInit( const SingleInit &other );
         virtual ~SingleInit();
@@ -83 +83 @@
   public:
         ListInit( std::list<Initializer*> &,
-                          std::list<Expression *> &designators, bool maybeConstructed );
+                          std::list<Expression *> &designators, bool maybeConstructed = false );
         virtual ~ListInit();
 

src/SynTree/Mutator.cc

@@ -22 +22 @@
 #include "Expression.h"
 #include "Constant.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 Mutator::Mutator() {}
@@ -259 +259 @@
         }
         return alignofExpr;
+}
+
+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 );
+        offsetofExpr->set_type( maybeMutate( offsetofExpr->get_type(), *this ) );
+        offsetofExpr->set_member( maybeMutate( offsetofExpr->get_member(), *this ) );
+        return offsetofExpr;
 }
 

src/SynTree/Mutator.h

@@ -16 +16 @@
 
 #include "SynTree.h"
-#include "SemanticError.h"
+#include "Common/SemanticError.h"
 
 #ifndef 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 );
         virtual Expression* mutate( LogicalExpr *logicalExpr );

src/SynTree/NamedTypeDecl.cc

@@ -16 +16 @@
 #include "Declaration.h"
 #include "Type.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 NamedTypeDecl::NamedTypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *base )

src/SynTree/ObjectDecl.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jan 13 16:11:19 2016
-// Update Count     : 29
+// Last Modified On : Tue Feb 09 13:21:03 2016
+// Update Count     : 30
 //
 
@@ -18 +18 @@
 #include "Initializer.h"
 #include "Expression.h"
-#include "utility.h"
+#include "Common/utility.h"
 #include "Statement.h"
 

src/SynTree/PointerType.cc

@@ -16 +16 @@
 #include "Type.h"
 #include "Expression.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 PointerType::PointerType( const Type::Qualifiers &tq, Type *base )

src/SynTree/ReferenceToType.cc

@@ -21 +21 @@
 #include "Expression.h"
 #include "TypeSubstitution.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 ReferenceToType::ReferenceToType( const Type::Qualifiers &tq, const std::string &name ) : Type( tq ), name( name ) {

src/SynTree/SynTree.h

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

src/SynTree/TupleExpr.cc

@@ -15 +15 @@
 
 #include "Expression.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 TupleExpr::TupleExpr( Expression *_aname ) : Expression( _aname ) {

src/SynTree/TupleType.cc

@@ -15 +15 @@
 
 #include "Type.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 TupleType::TupleType( const Type::Qualifiers &tq ) : Type( tq ) {

src/SynTree/Type.cc

@@ -18 +18 @@
 #include "Type.h"
 #include "Declaration.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 const char *BasicType::typeNames[BasicType::NUMBER_OF_BASIC_TYPES] = {

src/SynTree/TypeDecl.cc

@@ -16 +16 @@
 #include "Declaration.h"
 #include "Type.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 TypeDecl::TypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type, Kind kind ) : Parent( name, sc, type ), kind( kind ) {

src/SynTree/TypeExpr.cc

@@ -16 +16 @@
 #include "Expression.h"
 #include "Type.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 TypeExpr::TypeExpr( Type *type ) : type( type ) {

src/SynTree/TypeofType.cc

@@ -16 +16 @@
 #include "Type.h"
 #include "Expression.h"
-#include "utility.h"
+#include "Common/utility.h"
 
 TypeofType::TypeofType( const Type::Qualifiers &tq, Expression *expr ) : Type( tq ), expr( expr ) {

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 );
+        maybeAccept( offsetofExpr->get_type(), *this );
+        maybeAccept( offsetofExpr->get_member(), *this );
+}
+
 void Visitor::visit( AttrExpr *attrExpr ) {
         acceptAll( attrExpr->get_results(), *this );

src/SynTree/Visitor.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jan 13 15:24:05 2016
-// Update Count     : 5
+// Last Modified On : Tue Feb 09 13:20:48 2016
+// Update Count     : 6
 //
 
@@ -18 +18 @@
 
 #include "SynTree.h"
-#include "SemanticError.h"
-#include "CompilerError.h"
+#include "Common/SemanticError.h"
+#include "Common/CompilerError.h"
 
 class Visitor {
@@ -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 );
         virtual void visit( LogicalExpr *logicalExpr );