Changeset fa2c005 for src/SynTree

Timestamp:

Jun 8, 2023, 3:19:43 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT

Parents:

044ae62

Message:

Finish Adt POC

Location:

src/SynTree

Files:

• Declaration.h (modified) (2 diffs)
• Mutator.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Type.h (modified) (1 diff)
• Visitor.h (modified) (1 diff)

src/SynTree/Declaration.h

@@ -365 +365 @@
         typedef AggregateDecl Parent;
   public:
-        std::list<StructDecl*> data_constructors;
         UnionDecl * data_union;
         EnumDecl * tag;
@@ -373 +372 @@
          const std::list< Attribute * > & attributes = std::list< class Attribute * >(),
          LinkageSpec::Spec linkage = LinkageSpec::Cforall, 
-         const std::list< StructDecl* > data_constructors = std::list< StructDecl * >(),
          UnionDecl * data_union = nullptr, EnumDecl * tag = nullptr, StructDecl * tag_union = nullptr )
-         : Parent( name, attributes, linkage ), data_constructors(data_constructors), 
+         : Parent( name, attributes, linkage ), 
          data_union( data_union ), tag( tag ), tag_union( tag_union ) {}
 

src/SynTree/Mutator.h

@@ -110 +110 @@
         virtual Type * mutate( FunctionType * functionType ) = 0;
         virtual Type * mutate( StructInstType * aggregateUseType ) = 0;
+        virtual Type * mutate( AdtInstType * aggregateUseType ) = 0;
         virtual Type * mutate( UnionInstType * aggregateUseType ) = 0;
         virtual Type * mutate( EnumInstType * aggregateUseType ) = 0;

src/SynTree/SynTree.h

@@ -119 +119 @@
 class UnionInstType;
 class EnumInstType;
+class AdtInstType;
 class TraitInstType;
 class TypeInstType;

src/SynTree/Type.h

@@ -476 +476 @@
 };
 
+class AdtInstType : public ReferenceToType {
+        typedef ReferenceToType  Parent;
+  public:
+        AdtDecl * baseAdt;
+
+        AdtInstType( const Type::Qualifiers & tq, const std::string & name, const std::list< Attribute * > & attributes = std::list< Attribute * >()  ) : Parent( tq, name, attributes ), baseAdt( 0 ) {}
+        AdtInstType( const Type::Qualifiers & tq, AdtDecl * baseAdt, const std::list< Attribute * > & attributes = std::list< Attribute * >()  );
+        AdtInstType( const AdtInstType & other ) : Parent( other ), baseAdt( other.baseAdt ) {}
+
+        AdtDecl * get_baseAdt() const { return baseAdt; }
+        void set_baseAdt( AdtDecl * newValue ) { baseAdt = newValue; }
+        
+        std::list<TypeDecl*> * get_baseParameters();
+        const std::list<TypeDecl*> * get_baseParameters() const;
+
+        virtual bool isComplete() const override;
+
+        virtual AggregateDecl * getAggr() const override;
+        
+        virtual TypeSubstitution genericSubstitution() const override;
+
+        void lookup( const std::string & name, std::list< Declaration* > & foundDecls ) const override;
+
+        virtual AdtInstType * clone() const override { return new AdtInstType( * this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Type * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+
+        virtual void print( std::ostream & os, Indenter indenter = {} ) const override;
+  private:
+        virtual std::string typeString() const override;
+};
+
 class UnionInstType : public ReferenceToType {
         typedef ReferenceToType Parent;

src/SynTree/Visitor.h

@@ -196 +196 @@
         virtual void visit( UnionInstType * node ) { visit( const_cast<const UnionInstType *>(node) ); }
         virtual void visit( const UnionInstType * aggregateUseType ) = 0;
+        virtual void visit( AdtInstType * node ) { visit( const_cast<const AdtInstType *>(node) ); }
+        virtual void visit( const AdtInstType * node ) = 0;
         virtual void visit( EnumInstType * node ) { visit( const_cast<const EnumInstType *>(node) ); }
         virtual void visit( const EnumInstType * aggregateUseType ) = 0;