Changeset 777ed2b for src/SynTree

Timestamp:

Jul 11, 2018, 11:55:59 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

0fc52b6

Parents:

fc20514 (diff), 7de22b28 (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

Location:

src/SynTree

Files:

• Declaration.h (modified) (1 diff)
• Mutator.h (modified) (2 diffs)
• ReferenceToType.cc (modified) (3 diffs)
• SynTree.h (modified) (2 diffs)
• Type.cc (modified) (1 diff)
• Type.h (modified) (6 diffs)
• Visitor.h (modified) (2 diffs)

src/SynTree/Declaration.h

@@ -266 +266 @@
         bool body;
         std::list< Attribute * > attributes;
+        AggregateDecl * parent = nullptr;
 
         AggregateDecl( const std::string &name, const std::list< Attribute * > & attributes = std::list< class Attribute * >(), LinkageSpec::Spec linkage = LinkageSpec::Cforall );

src/SynTree/Mutator.h

@@ -101 +101 @@
         virtual Type * mutate( ArrayType * arrayType ) = 0;
         virtual Type * mutate( ReferenceType * refType ) = 0;
+        virtual Type * mutate( QualifiedType * qualType ) = 0;
         virtual Type * mutate( FunctionType * functionType ) = 0;
         virtual Type * mutate( StructInstType * aggregateUseType ) = 0;
@@ -113 +114 @@
         virtual Type * mutate( ZeroType * zeroType ) = 0;
         virtual Type * mutate( OneType * oneType ) = 0;
+        virtual Type * mutate( GlobalScopeType * globalType ) = 0;
 
         virtual Designation * mutate( Designation * designation ) = 0 ;

src/SynTree/ReferenceToType.cc

@@ -76 +76 @@
 bool StructInstType::isComplete() const { return baseStruct ? baseStruct->has_body() : false; }
 
-AggregateDecl * StructInstType::getAggr() { return baseStruct; }
+AggregateDecl * StructInstType::getAggr() const { return baseStruct; }
 
 TypeSubstitution StructInstType::genericSubstitution() const {
@@ -119 +119 @@
 bool UnionInstType::isComplete() const { return baseUnion ? baseUnion->has_body() : false; }
 
-AggregateDecl * UnionInstType::getAggr() { return baseUnion; }
+AggregateDecl * UnionInstType::getAggr() const { return baseUnion; }
 
 TypeSubstitution UnionInstType::genericSubstitution() const {
@@ -152 +152 @@
 bool EnumInstType::isComplete() const { return baseEnum ? baseEnum->has_body() : false; }
 
+AggregateDecl * EnumInstType::getAggr() const { return baseEnum; }
+
 void EnumInstType::print( std::ostream &os, Indenter indent ) const {
         using std::endl;

src/SynTree/SynTree.h

@@ -110 +110 @@
 class ArrayType;
 class ReferenceType;
+class QualifiedType;
 class FunctionType;
 class ReferenceToType;
@@ -123 +124 @@
 class ZeroType;
 class OneType;
+class GlobalScopeType;
 
 class Designation;

src/SynTree/Type.cc

@@ -105 +105 @@
 }
 
+
+QualifiedType::QualifiedType( const Type::Qualifiers & tq, Type * parent, Type * child ) : Type( tq, {} ), parent( parent ), child( child ) {
+}
+
+QualifiedType::QualifiedType( const QualifiedType & other ) : Type( other ), parent( maybeClone( other.parent ) ), child( maybeClone( other.child ) ) {
+}
+
+QualifiedType::~QualifiedType() {
+        delete parent;
+        delete child;
+}
+
+void QualifiedType::print( std::ostream & os, Indenter indent ) const {
+        os << "Qualified Type: " << endl;
+        os << indent+1;
+        parent->print( os, indent+1 );
+        os << endl << indent+1;
+        child->print( os, indent+1 );
+        os << endl;
+        Type::print( os, indent+1 );
+}
+
+GlobalScopeType::GlobalScopeType() : Type( Type::Qualifiers(), {} ) {}
+
+void GlobalScopeType::print( std::ostream & os, Indenter ) const {
+        os << "Global Scope Type" << endl;
+}
+
+
 // Empty Variable declarations:
 const Type::FuncSpecifiers noFuncSpecifiers;

src/SynTree/Type.h

@@ -178 +178 @@
         virtual bool isComplete() const { return true; }
 
-        virtual AggregateDecl * getAggr() { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
+        virtual AggregateDecl * getAggr() const { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
 
         virtual TypeSubstitution genericSubstitution() const;
@@ -315 +315 @@
 };
 
+class QualifiedType : public Type {
+public:
+        Type * parent;
+        Type * child;
+
+        QualifiedType( const Type::Qualifiers & tq, Type * parent, Type * child );
+        QualifiedType( const QualifiedType & tq );
+        virtual ~QualifiedType();
+
+        virtual QualifiedType *clone() const override { return new QualifiedType( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+
 class ReferenceType : public Type {
 public:
@@ -416 +431 @@
         virtual bool isComplete() const override;
 
-        virtual AggregateDecl * getAggr() override;
+        virtual AggregateDecl * getAggr() const override;
 
         virtual TypeSubstitution genericSubstitution() const override;
@@ -453 +468 @@
         virtual bool isComplete() const override;
 
-        virtual AggregateDecl * getAggr() override;
+        virtual AggregateDecl * getAggr() const override;
 
         virtual TypeSubstitution genericSubstitution() const override;
@@ -485 +500 @@
 
         virtual bool isComplete() const override;
+
+        virtual AggregateDecl * getAggr() const override;
 
         virtual EnumInstType *clone() const override { return new EnumInstType( *this ); }
@@ -665 +682 @@
 };
 
+class GlobalScopeType : public Type {
+  public:
+        GlobalScopeType();
+
+        virtual GlobalScopeType *clone() const override { return new GlobalScopeType( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Visitor.h

@@ -103 +103 @@
         virtual void visit( ArrayType * arrayType ) = 0;
         virtual void visit( ReferenceType * refType ) = 0;
+        virtual void visit( QualifiedType * qualType ) = 0;
         virtual void visit( FunctionType * functionType ) = 0;
         virtual void visit( StructInstType * aggregateUseType ) = 0;
@@ -115 +116 @@
         virtual void visit( ZeroType * zeroType ) = 0;
         virtual void visit( OneType * oneType ) = 0;
+        virtual void visit( GlobalScopeType * globalType ) = 0;
 
         virtual void visit( Designation * designation ) = 0;