Changeset d2ded3e7 for src/SynTree

Timestamp:

Oct 28, 2015, 3:47:29 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

37a3b8f9, 4673385, e56cfdb0

Parents:

698664b3 (diff), 097e2b0 (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 changes into current branch

Location:

src/SynTree

Files:

• ArrayType.cc (modified) (2 diffs)
• BasicType.cc (modified) (2 diffs)
• Expression.cc (modified) (3 diffs)
• Initializer.cc (modified) (2 diffs)

src/SynTree/ArrayType.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  6 14:11:48 2015
-// Update Count     : 9
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 12 14:19:07 2015
+// Update Count     : 11
 //
 
@@ -50 +50 @@
         } // if
         if ( dimension ) {
-                os << "with dimension of ";
-                dimension->print( os, indent );
+                os << " with dimension of ";
+                dimension->print( os, 0 );
         } // if
 }

src/SynTree/BasicType.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun  7 08:44:36 2015
-// Update Count     : 5
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 12 14:15:45 2015
+// Update Count     : 6
 //
 
@@ -28 +28 @@
 
         Type::print( os, indent );
-        os << kindNames[ kind ] << ' ';
+        os << kindNames[ kind ];
 }
 

src/SynTree/Expression.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 28 16:27:17 2015
-// Update Count     : 22
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Sep 02 12:07:10 2015
+// Update Count     : 33
 //
 
@@ -31 +31 @@
 Expression::Expression( Expression *_aname ) : env( 0 ), argName( _aname ) {}
 
-Expression::Expression( const Expression &other ) : env( maybeClone( other.env ) ) {
+Expression::Expression( const Expression &other ) : env( maybeClone( other.env ) ), argName( maybeClone( other.get_argName() ) ) {
         cloneAll( other.results, results );
-        argName = other.get_argName();
 }
 
@@ -72 +71 @@
 
 void ConstantExpr::print( std::ostream &os, int indent ) const {
-        os << "constant expression " ;
+        os << std::string( indent, ' ' ) << "constant expression " ;
         constant.print( os );
         Expression::print( os, indent );
+        os << std::endl;
 }
 

src/SynTree/Initializer.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 09:02:45 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 12 14:05:25 2015
+// Update Count     : 14
 //
 
@@ -43 +43 @@
 
 void SingleInit::print( std::ostream &os, int indent ) {
-        os << std::endl << std::string(indent, ' ' ) << "Simple Initializer: ";
-        value->print( os, indent+2 );
+        os << std::endl << std::string(indent, ' ' ) << "Simple Initializer: " << std::endl;
+        value->print( os, indent+4 );
 
         if ( ! designators.empty() ) {
-                os << std::endl << std::string(indent + 2, ' ' ) << "designated by: "  ;
-                for ( std::list < Expression * >::iterator i = designators.begin(); i != designators.end(); i++ )
+                os << std::endl << std::string(indent + 2, ' ' ) << "designated by: "   << std::endl;
+                for ( std::list < Expression * >::iterator i = designators.begin(); i != designators.end(); i++ ) {
                         ( *i )->print(os, indent + 4 );
+                }
         } // if
 }