Changeset 7821d6c for src/SynTree

Timestamp:

Oct 3, 2017, 2:55:17 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

680620d

Parents:

21b7161 (diff), e1ff775 (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

src/SynTree

Files:

• Constant.cc (modified) (1 diff)
• Constant.h (modified) (4 diffs)

src/SynTree/Constant.cc

@@ -71 +71 @@
 }
 
-void Constant::print( std::ostream &os ) const {
+void Constant::print( std::ostream &os, int indent ) const {
         os << "(" << rep << " " << val.ival;
         if ( type ) {

src/SynTree/Constant.h

@@ -19 +19 @@
 #include <string>     // for string
 
+#include "BaseSyntaxNode.h"
 #include "Mutator.h"  // for Mutator
 #include "Visitor.h"  // for Visitor
@@ -24 +25 @@
 class Type;
 
-class Constant {
+class Constant : public BaseSyntaxNode {
   public:
         Constant( Type * type, std::string rep, unsigned long long val );
@@ -30 +31 @@
         Constant( const Constant & other );
         virtual ~Constant();
+
+        virtual Constant * clone() const { return new Constant( *this ); }
 
         Type * get_type() { return type; }
@@ -54 +57 @@
         virtual void accept( Visitor & v ) { v.visit( this ); }
         virtual Constant * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os ) const;
+        virtual void print( std::ostream & os, int indent = 0 ) const;
   private:
         Type * type;