Changeset 5fda7143 for src/SynTree

Timestamp:

Sep 7, 2016, 9:30:25 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

9f70ab57

Parents:

1f75e2d (diff), f04a8b81 (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:software/cfa/cfa-cc

Conflicts:

src/Common/utility.h

Location:

src/SynTree

Files:

• Declaration.cc (modified) (1 diff)
• Declaration.h (modified) (1 diff)
• Expression.cc (modified) (2 diffs)
• Expression.h (modified) (1 diff)
• FunctionDecl.cc (modified) (1 diff)
• Statement.cc (modified) (1 diff)
• Statement.h (modified) (2 diffs)
• Type.cc (modified) (1 diff)
• Type.h (modified) (1 diff)

src/SynTree/Declaration.cc

@@ -56 +56 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Declaration * decl ) {
+std::ostream & operator<<( std::ostream & out, const Declaration * decl ) {
         decl->print( out );
         return out;

src/SynTree/Declaration.h

@@ -279 +279 @@
 };
 
-std::ostream & operator<<( std::ostream & out, Declaration * decl );
+std::ostream & operator<<( std::ostream & out, const Declaration * decl );
 
 #endif // DECLARATION_H

src/SynTree/Expression.cc

@@ -358 +358 @@
         assert( member );
         os << std::string( indent + 2, ' ' );
-        os << (void*)member << " ";
         member->print( os, indent + 2 );
         os << std::endl;
@@ -541 +540 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Expression * expr ) {
+std::ostream & operator<<( std::ostream & out, const Expression * expr ) {
         expr->print( out );
         return out;

src/SynTree/Expression.h

@@ -653 +653 @@
 };
 
-std::ostream & operator<<( std::ostream & out, Expression * expr );
+std::ostream & operator<<( std::ostream & out, const Expression * expr );
 
 #endif // EXPRESSION_H

src/SynTree/FunctionDecl.cc

@@ -21 +21 @@
 #include "Attribute.h"
 #include "Common/utility.h"
+#include "InitTweak/InitTweak.h"
 
 FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )

src/SynTree/Statement.cc

@@ -387 +387 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Statement * statement ) {
+std::ostream & operator<<( std::ostream & out, const Statement * statement ) {
         statement->print( out );
         return out;

src/SynTree/Statement.h

@@ -47 +47 @@
 
         std::list<Statement*>& get_kids() { return kids; }
+        void push_back( Statement * stmt ) { kids.push_back( stmt ); }
+        void push_front( Statement * stmt ) { kids.push_front( stmt ); }
 
         virtual CompoundStmt *clone() const { return new CompoundStmt( *this ); }
@@ -395 +397 @@
 
 
-std::ostream & operator<<( std::ostream & out, Statement * statement );
+std::ostream & operator<<( std::ostream & out, const Statement * statement );
 
 #endif // STATEMENT_H

src/SynTree/Type.cc

@@ -84 +84 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Type * type ) {
+std::ostream & operator<<( std::ostream & out, const Type * type ) {
         type->print( out );
         return out;

src/SynTree/Type.h

@@ -481 +481 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Type * type );
+std::ostream & operator<<( std::ostream & out, const Type * type );
 
 #endif // TYPE_H