Changeset f53acdf8 for src/SynTree/Constant.h

Timestamp:

Jul 19, 2019, 2:16:01 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

4eb43fa

Parents:

1f1c102 (diff), 8ac3b0e (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 new-ast

File:

• src/SynTree/Constant.h (modified) (3 diffs)

src/SynTree/Constant.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Spt 28 14:48:00 2018
-// Update Count     : 18
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jul 10 15:57:38 2019
+// Update Count     : 19
 //
 
@@ -30 +30 @@
         Constant( Type * type, std::string rep, std::optional<unsigned long long> i );
         Constant( const Constant & other );
+        Constant & operator=( const Constant & ) = default;
         virtual ~Constant();
 
-        virtual Constant * clone() const { return new Constant( *this ); }
+        virtual Constant * clone() const override { return new Constant( *this ); }
 
         Type * get_type() { return type; }
@@ -50 +51 @@
         static Constant null( Type * ptrtype = nullptr );
 
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Constant * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, Indenter indent = 0 ) const;
-  private:
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Constant * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = 0 ) const override;
+
         Type * type;
         std::string rep;
         std::optional<unsigned long long> ival;
-
-        friend class ConverterOldToNew;
 };