Changes in src/SynTree/Declaration.h [f0ecf9b:e3e16bc]

File:

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

src/SynTree/Declaration.h

@@ -61 +61 @@
 
         void fixUniqueId( void );
-        virtual Declaration *clone() const override = 0;
-        virtual void accept( Visitor &v ) override = 0;
-        virtual Declaration *acceptMutator( Mutator &m ) override = 0;
-        virtual void print( std::ostream &os, Indenter indent = {} ) const override = 0;
-        virtual void printShort( std::ostream &os, Indenter indent = {} ) const = 0;
+        virtual Declaration *clone() const = 0;
+        virtual void accept( Visitor &v ) = 0;
+        virtual Declaration *acceptMutator( Mutator &m ) = 0;
+        virtual void print( std::ostream &os, int indent = 0 ) const = 0;
+        virtual void printShort( std::ostream &os, int indent = 0 ) const = 0;
 
         static void dumpIds( std::ostream &os );
@@ -106 +106 @@
         //void set_functionSpecifiers( Type::FuncSpecifiers newValue ) { fs = newValue; }
 
-        virtual DeclarationWithType *clone() const override = 0;
-        virtual DeclarationWithType *acceptMutator( Mutator &m )  override = 0;
+        virtual DeclarationWithType *clone() const = 0;
+        virtual DeclarationWithType *acceptMutator( Mutator &m ) = 0;
 
         virtual Type * get_type() const = 0;
@@ -128 +128 @@
         virtual ~ObjectDecl();
 
-        virtual Type * get_type() const override { return type; }
-        virtual void set_type(Type *newType) override { type = newType; }
+        virtual Type * get_type() const { return type; }
+        virtual void set_type(Type *newType) { type = newType; }
 
         Initializer *get_init() const { return init; }
@@ -137 +137 @@
         void set_bitfieldWidth( Expression *newValue ) { bitfieldWidth = newValue; }
 
-        static ObjectDecl * newObject( const std::string & name, Type * type, Initializer * init );
-
-        virtual ObjectDecl *clone() const override { return new ObjectDecl( *this ); }
-        virtual void accept( Visitor &v ) override { v.visit( this ); }
-        virtual DeclarationWithType *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;
+        virtual ObjectDecl *clone() const { return new ObjectDecl( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual DeclarationWithType *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual void printShort( std::ostream &os, int indent = 0 ) const;
 };
 
@@ -157 +155 @@
         virtual ~FunctionDecl();
 
-        virtual Type * get_type() const override { return type; }
-        virtual void set_type(Type * t) override { type = strict_dynamic_cast< FunctionType* >( t ); }
+        Type * get_type() const { return type; }
+        virtual void set_type(Type * t) { type = strict_dynamic_cast< FunctionType* >( t ); }
 
         FunctionType * get_functionType() const { return type; }
@@ -165 +163 @@
         void set_statements( CompoundStmt *newValue ) { statements = newValue; }
 
-        static FunctionDecl * newFunction( const std::string & name, FunctionType * type, CompoundStmt * statements );
-
-        virtual FunctionDecl *clone() const override { return new FunctionDecl( *this ); }
-        virtual void accept( Visitor &v ) override { v.visit( this ); }
-        virtual DeclarationWithType *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;
+        virtual FunctionDecl *clone() const { return new FunctionDecl( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual DeclarationWithType *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual void printShort( std::ostream &os, int indent = 0 ) const;
 };
 
@@ -192 +188 @@
         virtual std::string typeString() const = 0;
 
-        virtual NamedTypeDecl *clone() const override = 0;
-        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
-        virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
+        virtual NamedTypeDecl *clone() const = 0;
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual void printShort( std::ostream &os, int indent = 0 ) const;
 };
 
@@ -200 +196 @@
         typedef NamedTypeDecl Parent;
   public:
-        enum Kind { Dtype, Ftype, Ttype };
+        enum Kind { Any, Dtype, Ftype, Ttype };
 
         Type * init;
@@ -216 +212 @@
         };
 
-        TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, bool sized, Type * init = nullptr );
+        TypeDecl( const std::string &name, Type::StorageClasses scs, Type *type, Kind kind, Type * init = nullptr );
         TypeDecl( const TypeDecl &other );
         virtual ~TypeDecl();
@@ -225 +221 @@
         TypeDecl * set_init( Type * newValue ) { init = newValue; return this; }
 
-        bool isComplete() const { return sized; }
+        bool isComplete() const { return kind == Any || sized; }
         bool get_sized() const { return sized; }
         TypeDecl * set_sized( bool newValue ) { sized = newValue; return this; }
 
-        virtual std::string typeString() const override;
+        virtual std::string typeString() const;
         virtual std::string genTypeString() const;
 
-        virtual TypeDecl *clone() const override { return new TypeDecl( *this ); }
-        virtual void accept( Visitor &v ) override { v.visit( this ); }
-        virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
-        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
+        virtual TypeDecl *clone() const { return new TypeDecl( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual TypeDecl *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
 
   private:
@@ -247 +243 @@
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}
 
-        virtual std::string typeString() const override;
-
-        virtual TypedefDecl *clone() const override { return new TypedefDecl( *this ); }
-        virtual void accept( Visitor &v ) override { v.visit( this ); }
-        virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        virtual std::string typeString() const;
+
+        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:
 };
@@ -276 +272 @@
         AggregateDecl * set_body( bool body ) { AggregateDecl::body = body; return this; }
 
-        virtual void print( std::ostream &os, Indenter indent = {} ) const override;
-        virtual void printShort( std::ostream &os, Indenter indent = {} ) const override;
+        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;
@@ -292 +288 @@
         bool is_thread() { return kind == DeclarationNode::Thread; }
 
-        virtual StructDecl *clone() const override { return new StructDecl( *this ); }
-        virtual void accept( Visitor &v ) override { v.visit( this ); }
-        virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
+        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:
         DeclarationNode::Aggregate kind;
-        virtual std::string typeString() const override;
+        virtual std::string typeString() const;
 };
 
@@ -306 +302 @@
         UnionDecl( const UnionDecl &other ) : Parent( other ) {}
 
-        virtual UnionDecl *clone() const override { return new UnionDecl( *this ); }
-        virtual void accept( Visitor &v ) override { v.visit( this ); }
-        virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
-  private:
-        virtual std::string typeString() const override;
+        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;
 };
 
@@ -319 +315 @@
         EnumDecl( const EnumDecl &other ) : Parent( other ) {}
 
-        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:
-        virtual std::string typeString() const override;
+        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;
 };
 
@@ -334 +330 @@
         TraitDecl( const TraitDecl &other ) : Parent( other ) {}
 
-        virtual TraitDecl *clone() const override { return new TraitDecl( *this ); }
-        virtual void accept( Visitor &v ) override { v.visit( this ); }
-        virtual Declaration *acceptMutator( Mutator &m )  override { return m.mutate( this ); }
-  private:
-        virtual std::string typeString() const override;
+        virtual TraitDecl *clone() const { return new TraitDecl( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Declaration *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+  private:
+        virtual std::string typeString() const;
 };
 
@@ -352 +348 @@
         void set_stmt( AsmStmt *newValue ) { stmt = newValue; }
 
-        virtual AsmDecl *clone() const override { return new AsmDecl( *this ); }
-        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;
-};
-
+        virtual AsmDecl *clone() const { return new AsmDecl( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual AsmDecl *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+        virtual void printShort( std::ostream &os, int indent = 0 ) const;
+};
+
+std::ostream & operator<<( std::ostream & out, const Declaration * decl );
 std::ostream & operator<<( std::ostream & os, const TypeDecl::Data & data );