Changeset 90152a4 for src/SynTree/Declaration.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/Declaration.h (modified) (7 diffs)

src/SynTree/Declaration.h

@@ -84 +84 @@
         Expression *asmName;
         std::list< Attribute * > attributes;
+        bool isDeleted = false;
 
         DeclarationWithType( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, Type::FuncSpecifiers fs );
@@ -151 +152 @@
         FunctionType *type;
         CompoundStmt *statements;
+        std::list< Expression * > withExprs;
 
         FunctionDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements,
@@ -200 +202 @@
         typedef NamedTypeDecl Parent;
   public:
-        enum Kind { Dtype, Ftype, Ttype };
+        enum Kind { Dtype, Ftype, Ttype, NUMBER_OF_KINDS };
 
         Type * init;
@@ -244 +246 @@
         typedef NamedTypeDecl Parent;
   public:
-        TypedefDecl( const std::string &name, Type::StorageClasses scs, Type *type, LinkageSpec::Spec spec = LinkageSpec::Cforall ) : Parent( name, scs, type ) { set_linkage( spec ); }
+        TypedefDecl( const std::string &name, CodeLocation location, Type::StorageClasses scs, Type *type, LinkageSpec::Spec spec = LinkageSpec::Cforall )
+                : Parent( name, scs, type ) { set_linkage( spec ); this->location = location; }
+
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}
 
@@ -262 +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 );
@@ -319 +324 @@
         EnumDecl( const EnumDecl &other ) : Parent( other ) {}
 
+        bool valueOf( Declaration * enumerator, long long int & value );
+
         virtual EnumDecl *clone() const override { return new EnumDecl( *this ); }
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
   private:
+        std::map< std::string, long long int > enumValues;
         virtual std::string typeString() const override;
 };
@@ -355 +363 @@
         virtual void accept( Visitor &v ) override { v.visit( this ); }
         virtual AsmDecl *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
+};
+
+class StaticAssertDecl : public Declaration {
+public:
+        Expression * condition;
+        ConstantExpr * message;   // string literal
+
+        StaticAssertDecl( Expression * condition, ConstantExpr * message );
+        StaticAssertDecl( const StaticAssertDecl & other );
+        virtual ~StaticAssertDecl();
+
+        virtual StaticAssertDecl * clone() const override { return new StaticAssertDecl( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual StaticAssertDecl * acceptMutator( Mutator &m )  override { return m.mutate( this ); }
         virtual void print( std::ostream &os, Indenter indent = {} ) const override;
         virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;