Changeset 90152a4 for src/SynTree/Type.h

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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 cleanup-dtors

File:

• src/SynTree/Type.h (modified) (9 diffs)

src/SynTree/Type.h

@@ -178 +178 @@
         virtual bool isComplete() const { return true; }
 
-        virtual AggregateDecl * getAggr() {     assertf( false, "Non-aggregate type: %s", toString( this ).c_str() ); }
+        virtual AggregateDecl * getAggr() const { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
+
+        virtual TypeSubstitution genericSubstitution() const;
 
         virtual Type *clone() const = 0;
@@ -229 +231 @@
                 SignedInt128,
                 UnsignedInt128,
+                Float80,
+                Float128,
                 NUMBER_OF_BASIC_TYPES
         } kind;
@@ -311 +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:
@@ -328 +347 @@
         // the number of values are disallowed.
         virtual unsigned size() const override { return base->size(); }
+
+        virtual TypeSubstitution genericSubstitution() const override;
 
         virtual ReferenceType *clone() const override { return new ReferenceType( *this ); }
@@ -356 +377 @@
         bool isTtype() const;
 
+        bool isUnprototyped() const { return isVarArgs && parameters.size() == 0; }
+
         virtual FunctionType *clone() const override { return new FunctionType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
@@ -404 +427 @@
         /// Accesses generic parameters of base struct (NULL if none such)
         std::list<TypeDecl*> * get_baseParameters();
+        const std::list<TypeDecl*> * get_baseParameters() const;
 
         virtual bool isComplete() const override;
 
-        virtual AggregateDecl * getAggr() override;
+        virtual AggregateDecl * getAggr() const override;
+
+        virtual TypeSubstitution genericSubstitution() const override;
 
         /// Looks up the members of this struct named "name" and places them into "foundDecls".
@@ -437 +463 @@
 
         /// Accesses generic parameters of base union (NULL if none such)
-        std::list< TypeDecl * > * get_baseParameters();
+        std::list<TypeDecl*> * get_baseParameters();
+        const std::list<TypeDecl*> * get_baseParameters() const;
 
         virtual bool isComplete() const override;
 
-        virtual AggregateDecl * getAggr() override;
+        virtual AggregateDecl * getAggr() const override;
+
+        virtual TypeSubstitution genericSubstitution() const override;
 
         /// looks up the members of this union named "name" and places them into "foundDecls"
@@ -471 +500 @@
 
         virtual bool isComplete() const override;
+
+        virtual AggregateDecl * getAggr() const override;
 
         virtual EnumInstType *clone() const override { return new EnumInstType( *this ); }
@@ -651 +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 //