Changeset 17cd4eb for translator/SynTree/Declaration.h

Timestamp:

Jan 7, 2015, 6:04:42 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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

Children:

0b8cd722

Parents:

d9a0e76

Message:

fixed restrict, fixed parameter copy, introduced name table for types, changed variable after to string

File:

• translator/SynTree/Declaration.h (modified) (17 diffs)

translator/SynTree/Declaration.h

@@ -1 @@
-/*
- * This file is part of the Cforall project
- *
- * $Id: Declaration.h,v 1.22 2005/08/29 20:59:25 rcbilson Exp $
- *
- */
-
 #ifndef DECLARATION_H
 #define DECLARATION_H
@@ -15 +8 @@
 
 
-class Declaration
-{
-public:
-    enum StorageClass
-    {  
+class Declaration {
+  public:
+    enum StorageClass {  
         NoStorageClass,
         Auto,
@@ -27 +18 @@
         Fortran
     };  
-    
+
     Declaration( const std::string &name, StorageClass sc, LinkageSpec::Type linkage );
     Declaration( const Declaration &other );
@@ -39 +30 @@
     void set_linkage( LinkageSpec::Type newValue ) { linkage = newValue; }
     UniqueId get_uniqueId() const { return uniqueId; }
-    
+
     void fixUniqueId( void );
     virtual Declaration *clone() const = 0;
@@ -46 +37 @@
     virtual void print( std::ostream &os, int indent = 0 ) const = 0;
     virtual void printShort( std::ostream &os, int indent = 0 ) const = 0;
-    
+
     static const char* storageClassName[];  
-    
+
     static void dumpIds( std::ostream &os );
     static Declaration *declFromId( UniqueId id );
-    
-private:
+  private:
     std::string name;
     StorageClass storageClass;
@@ -59 +49 @@
 };
 
-class DeclarationWithType : public Declaration
-{
-public:
+class DeclarationWithType : public Declaration {
+  public:
     DeclarationWithType( const std::string &name, StorageClass sc, LinkageSpec::Type linkage );
     DeclarationWithType( const DeclarationWithType &other );
@@ -68 +57 @@
     std::string get_mangleName() const { return mangleName; }
     void set_mangleName( std::string newValue ) { mangleName = newValue; }
-    
+
     virtual DeclarationWithType *clone() const = 0;
     virtual DeclarationWithType *acceptMutator( Mutator &m ) = 0;
-    
+
     virtual Type *get_type() const = 0;
     virtual void set_type(Type *) = 0;
-    
-private:
-    // this represents the type with all types and typedefs expanded
-    // it is generated by SymTab::Validate::Pass2
+  private:
+    // this represents the type with all types and typedefs expanded it is generated by SymTab::Validate::Pass2
     std::string mangleName;
 };
 
-class ObjectDecl : public DeclarationWithType
-{
+class ObjectDecl : public DeclarationWithType {
     typedef DeclarationWithType Parent;
-
-public:
+  public:
     ObjectDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init );
     ObjectDecl( const ObjectDecl &other );
@@ -97 +82 @@
     Expression *get_bitfieldWidth() const { return bitfieldWidth; }
     void set_bitfieldWidth( Expression *newValue ) { bitfieldWidth = newValue; }
-    
+
     virtual ObjectDecl *clone() const { return new ObjectDecl( *this ); }
     virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -103 +88 @@
     virtual void print( std::ostream &os, int indent = 0 ) const;
     virtual void printShort( std::ostream &os, int indent = 0 ) const;
-    
-private:
+  private:
     Type *type;
     Initializer *init;
@@ -110 +94 @@
 };
 
-class FunctionDecl : public DeclarationWithType
-{
+class FunctionDecl : public DeclarationWithType {
     typedef DeclarationWithType Parent;
-
-public:
+  public:
     FunctionDecl( const std::string &name, StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline );
     FunctionDecl( const FunctionDecl &other );
@@ -130 +112 @@
     std::list< std::string >& get_oldIdents() { return oldIdents; }
     std::list< Declaration* >& get_oldDecls() { return oldDecls; }
-    
+
     virtual FunctionDecl *clone() const { return new FunctionDecl( *this ); }
     virtual void accept( Visitor &v ) { v.visit( this ); }
@@ -136 +118 @@
     virtual void print( std::ostream &os, int indent = 0 ) const;
     virtual void printShort( std::ostream &os, int indent = 0 ) const;
-    
-private:
+  private:
     FunctionType *type;
     CompoundStmt *statements;
@@ -145 +126 @@
 };
 
-class NamedTypeDecl : public Declaration
-{
+class NamedTypeDecl : public Declaration {
     typedef Declaration Parent;
-
-public:
+  public:
     NamedTypeDecl( const std::string &name, StorageClass sc, Type *type );
     NamedTypeDecl( const TypeDecl &other );
@@ -162 +141 @@
     virtual void print( std::ostream &os, int indent = 0 ) const;
     virtual void printShort( std::ostream &os, int indent = 0 ) const;
-    
-protected:
+  protected:
     virtual std::string typeString() const = 0;
-    
-private:
+  private:
     Type *base;
     std::list< TypeDecl* > parameters;
@@ -172 +149 @@
 };
 
-class TypeDecl : public NamedTypeDecl
-{
+class TypeDecl : public NamedTypeDecl {
     typedef NamedTypeDecl Parent;
-
-public:
+  public:
     enum Kind { Any, Dtype, Ftype };
 
     TypeDecl( const std::string &name, StorageClass sc, Type *type, Kind kind );
     TypeDecl( const TypeDecl &other );
-    
+
     Kind get_kind() const { return kind; }
 
@@ -187 +162 @@
     virtual void accept( Visitor &v ) { v.visit( this ); }
     virtual TypeDecl *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-
-private:
+  private:
     virtual std::string typeString() const;
     Kind kind;
 };
-    
-class TypedefDecl : public NamedTypeDecl
-{
+
+class TypedefDecl : public NamedTypeDecl {
     typedef NamedTypeDecl Parent;
-
-public:
+  public:
     TypedefDecl( const std::string &name, StorageClass sc, Type *type ) : Parent( name, sc, type ) {}
     TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}
-    
+
     virtual TypedefDecl *clone() const { return new TypedefDecl( *this ); }
     virtual void accept( Visitor &v ) { v.visit( this ); }
     virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-
-private:
-    virtual std::string typeString() const;
-};
-    
-class AggregateDecl : public Declaration
-{
+  private:
+    virtual std::string typeString() const;
+};
+
+class AggregateDecl : public Declaration {
     typedef Declaration Parent;
-
-public:
+  public:
     AggregateDecl( const std::string &name );
     AggregateDecl( const AggregateDecl &other );
@@ -220 +189 @@
     std::list<Declaration*>& get_members() { return members; }
     std::list<TypeDecl*>& get_parameters() { return parameters; }
-    
-    virtual void print( std::ostream &os, int indent = 0 ) const;
-    virtual void printShort( std::ostream &os, int indent = 0 ) const;
-
-protected:
+
+    virtual void print( std::ostream &os, int indent = 0 ) const;
+    virtual void printShort( std::ostream &os, int indent = 0 ) const;
+  protected:
     virtual std::string typeString() const = 0;
-    
-private:
+
+  private:
     std::list<Declaration*> members;
     std::list<TypeDecl*> parameters;
 };
 
-class StructDecl : public AggregateDecl
-{
-    typedef AggregateDecl Parent;
-
-public:
+class StructDecl : public AggregateDecl {
+    typedef AggregateDecl Parent;
+  public:
     StructDecl( const std::string &name ) : Parent( name ) {}
     StructDecl( const StructDecl &other ) : Parent( other ) {}
-    
+
     virtual StructDecl *clone() const { return new StructDecl( *this ); }
     virtual void accept( Visitor &v ) { v.visit( this ); }
     virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }
 
-private:
-    virtual std::string typeString() const;
-};
-    
-class UnionDecl : public AggregateDecl
-{
-    typedef AggregateDecl Parent;
-
-public:
+  private:
+    virtual std::string typeString() const;
+};
+
+class UnionDecl : public AggregateDecl {
+    typedef AggregateDecl Parent;
+  public:
     UnionDecl( const std::string &name ) : Parent( name ) {}
     UnionDecl( const UnionDecl &other ) : Parent( other ) {}
-    
+
     virtual UnionDecl *clone() const { return new UnionDecl( *this ); }
     virtual void accept( Visitor &v ) { v.visit( this ); }
     virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-
-private:
-    virtual std::string typeString() const;
-};
-    
-class EnumDecl : public AggregateDecl
-{
-    typedef AggregateDecl Parent;
-
-public:
+  private:
+    virtual std::string typeString() const;
+};
+
+class EnumDecl : public AggregateDecl {
+    typedef AggregateDecl Parent;
+  public:
     EnumDecl( const std::string &name ) : Parent( name ) {}
     EnumDecl( const EnumDecl &other ) : Parent( other ) {}
-    
+
     virtual EnumDecl *clone() const { return new EnumDecl( *this ); }
     virtual void accept( Visitor &v ) { v.visit( this ); }
     virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-
-private:
-    virtual std::string typeString() const;
-};
-    
-class ContextDecl : public AggregateDecl
-{
-    typedef AggregateDecl Parent;
-
-public:
+  private:
+    virtual std::string typeString() const;
+};
+
+class ContextDecl : public AggregateDecl {
+    typedef AggregateDecl Parent;
+  public:
     ContextDecl( const std::string &name ) : Parent( name ) {}
     ContextDecl( const ContextDecl &other ) : Parent( other ) {}
-    
+
     virtual ContextDecl *clone() const { return new ContextDecl( *this ); }
     virtual void accept( Visitor &v ) { v.visit( this ); }
     virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-
-private:
-    virtual std::string typeString() const;
-};
-    
-
-
-#endif /* #ifndef DECLARATION_H */
+  private:
+    virtual std::string typeString() const;
+};
+
+#endif // DECLARATION_H