Changeset cf0941d

Timestamp:

Jun 4, 2015, 11:08:06 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

44b5ca0

Parents:

c7ed6d0

Message:

adjust printing for AST dump, formatting

Location:

src

Files:

• Common/utility.h (modified) (3 diffs)
• Parser/parser.yy (modified) (1 diff)
• SynTree/ArrayType.cc (modified) (4 diffs)
• SynTree/Expression.cc (modified) (3 diffs)
• SynTree/ObjectDecl.cc (modified) (3 diffs)
• Tests/SynTree/Array.c (modified) (1 diff)

src/Common/utility.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 29 16:17:02 2015
-// Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jun  4 21:29:57 2015
+// Update Count     : 9
 //
 
@@ -60 +60 @@
         for ( typename Container::const_iterator i = container.begin(); i != container.end(); ++i ) {
                 if ( *i ) {
-                        os << std::string(indent,  ' ');
+                        os << std::string( indent,  ' ' );
                         (*i)->print( os, indent + 2 );
                         os << std::endl;
@@ -151 +151 @@
 template< typename T >
 void replace( std::list< T > &org, typename std::list< T >::iterator pos, std::list< T > &with ) {
-        // TIter should secretly be a typename std::list< T >::iterator
-        //   ( g++ 3.2 issues a 'is implicitly a typename' warning if I make this explicit )
         typename std::list< T >::iterator next = pos; advance( next, 1 );
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun  3 22:03:06 2015
-// Update Count     : 1020
+// Last Modified On : Thu Jun  4 21:38:06 2015
+// Update Count     : 1021
 // 
 

src/SynTree/ArrayType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 07:52:08 2015
-// Update Count     : 2
+// Last Modified On : Thu Jun  4 21:16:46 2015
+// Update Count     : 7
 //
 
@@ -25 +25 @@
 
 ArrayType::ArrayType( const ArrayType &other )
-        : Type( other ), base( maybeClone( other.base ) ), dimension( maybeClone( other.dimension ) ),
-          isVarLen( other.isVarLen ), isStatic( other.isStatic ) {
+                : Type( other ), base( maybeClone( other.base ) ), dimension( maybeClone( other.dimension ) ),
+                  isVarLen( other.isVarLen ), isStatic( other.isStatic ) {
 }
 
@@ -43 +43 @@
         } else if ( dimension ) {
                 os << "array of ";
-                dimension->print( os, indent );
         } else {
                 os << "open array of ";
@@ -49 +48 @@
         if ( base ) {
                 base->print( os, indent );
+        } // if
+        if ( dimension ) {
+                dimension->print( os, indent );
         } // if
 }

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 08:27:07 2015
-// Update Count     : 2
+// Last Modified On : Thu Jun  4 21:42:55 2015
+// Update Count     : 10
 //
 
@@ -52 +52 @@
 void Expression::print(std::ostream &os, int indent) const {
         if ( env ) {
-                os << std::string(indent, ' ') << "with environment:" << std::endl;
+                os << std::string( indent, ' ' ) << "with environment:" << std::endl;
                 env->print( os, indent+2 );
         } // if
 
         if ( argName ) {
-                os << std::string(indent, ' ') << "with designator:";
+                os << std::string( indent, ' ' ) << "with designator:";
                 argName->print( os, indent+2 );
         } // if
@@ -72 +72 @@
 
 void ConstantExpr::print( std::ostream &os, int indent ) const {
-        os << std::string(indent, ' ') << "Constant Expression: " ;
-        constant.print(os);
-        os << std::endl;
+        os << std::endl;
+        os << std::string( indent, ' ' ) << "dimension of constant expression: " ;
+        constant.print( os );
         Expression::print( os, indent );
 }

src/SynTree/ObjectDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu May 28 14:10:02 2015
-// Update Count     : 8
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jun  4 21:21:12 2015
+// Update Count     : 10
 //
 
@@ -36 +36 @@
 void ObjectDecl::print( std::ostream &os, int indent ) const {
         if ( get_name() != "" ) {
-                os << get_name() << ": a ";
+                os << get_name() << ": ";
         } // if
 
@@ -67 +67 @@
 #if 0
         if ( get_mangleName() != "") {
-                os << get_mangleName() << ": a "; 
+                os << get_mangleName() << ": "; 
         } else 
 #endif
         if ( get_name() != "" ) {
-                os << get_name() << ": a ";
+                os << get_name() << ": ";
         } // if
 

src/Tests/SynTree/Array.c

@@ -1 +1 @@
 int a1[];
 int a2[*];
-int a4[3];
+double a4[3.0];
 
 int m1[][3];