Changes in src/SynTree/Expression.cc [630a82a:bb8ea30]

File:

• src/SynTree/Expression.cc (modified) (12 diffs)

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 : Fri Apr  8 17:16:23 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri May 13 13:19:09 2016
 // Update Count     : 40
 //
@@ -72 +72 @@
 
 void ConstantExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "constant expression " ;
+        os << "constant expression " ;
         constant.print( os );
         Expression::print( os, indent );
-        os << std::endl;
 }
 
@@ -93 +92 @@
 
 void VariableExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Variable Expression: ";
+        os << "Variable Expression: ";
 
         Declaration *decl = get_var();
@@ -122 +121 @@
 
 void SizeofExpr::print( std::ostream &os, int indent) const {
-        os << std::string( indent, ' ' ) << "Sizeof Expression on: ";
+        os << "Sizeof Expression on: ";
 
         if (isType)
@@ -212 +211 @@
 
         os << " of ";
+
+        if ( type ) {
+                type->print(os, indent + 2);
+        } else {
+                os << "<NULL>";
+        }
+
+        os << std::endl;
+        Expression::print( os, indent );
+}
+
+OffsetPackExpr::OffsetPackExpr( StructInstType *type_, Expression *aname_ ) : Expression( aname_ ), type( type_ ) {
+        add_result( new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0, false, false ) );
+}
+
+OffsetPackExpr::OffsetPackExpr( const OffsetPackExpr &other ) : Expression( other ), type( maybeClone( other.type ) ) {}
+
+OffsetPackExpr::~OffsetPackExpr() { delete type; }
+
+void OffsetPackExpr::print( std::ostream &os, int indent ) const {
+        os << std::string( indent, ' ' ) << "Offset pack expression on ";
 
         if ( type ) {
@@ -274 +294 @@
 
 void CastExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Cast of:" << std::endl;
+        os << "Cast of:" << std::endl << std::string( indent+2, ' ' );
         arg->print(os, indent+2);
         os << std::endl << std::string( indent, ' ' ) << "to:" << std::endl;
@@ -297 +317 @@
 
 void UntypedMemberExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Member Expression, with field: " << get_member();
+        os << "Untyped Member Expression, with field: " << get_member();
 
         Expression *agg = get_aggregate();
-        os << std::string( indent, ' ' ) << "from aggregate: ";
-        if (agg != 0) agg->print(os, indent + 2);
+        os << ", from aggregate: ";
+        if (agg != 0) {
+                os << std::string( indent + 2, ' ' );
+                agg->print(os, indent + 2);
+        }
+        os << std::string( indent+2, ' ' );
         Expression::print( os, indent );
 }
@@ -324 +348 @@
 
 void MemberExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Member Expression, with field: " << std::endl;
+        os << "Member Expression, with field: " << std::endl;
 
         assert( member );
@@ -333 +357 @@
         Expression *agg = get_aggregate();
         os << std::string( indent, ' ' ) << "from aggregate: " << std::endl;
-        if (agg != 0) agg->print(os, indent + 2);
+        if (agg != 0) {
+                os << std::string( indent + 2, ' ' );
+                agg->print(os, indent + 2);
+        }
+        os << std::string( indent+2, ' ' );
         Expression::print( os, indent );
 }
@@ -351 +379 @@
 
 void UntypedExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Applying untyped: " << std::endl;
-        function->print(os, indent + 4);
+        os << "Applying untyped: " << std::endl;
+        os << std::string( indent+2, ' ' );
+        function->print(os, indent + 2);
         os << std::string( indent, ' ' ) << "...to: " << std::endl;
-        printArgs(os, indent + 4);
+        printAll(args, os, indent + 2);
         Expression::print( os, indent );
 }
@@ -360 +389 @@
 void UntypedExpr::printArgs( std::ostream &os, int indent ) const {
         std::list<Expression *>::const_iterator i;
-        for (i = args.begin(); i != args.end(); i++)
+        for (i = args.begin(); i != args.end(); i++) {
+                os << std::string(indent, ' ' );
                 (*i)->print(os, indent);
+        }
 }
 
@@ -372 +403 @@
 
 void NameExpr::print( std::ostream &os, int indent ) const {
-        os << std::string( indent, ' ' ) << "Name: " << get_name() << std::endl;
+        os << "Name: " << get_name() << std::endl;
         Expression::print( os, indent );
 }