Changeset e99e43f for src/SynTree

Timestamp:

Jan 10, 2019, 3:50:34 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

d97c3a4

Parents:

aeb8f70 (diff), 08222c7 (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.

git-author:

Aaron Moss <a3moss@…> (01/10/19 14:46:09)

git-committer:

Aaron Moss <a3moss@…> (01/10/19 15:50:34)

Message:

Merge remote-tracking branch 'plg/master' into deferred_resn

Location:

src/SynTree

Files:

• Expression.cc (modified) (2 diffs)
• FunctionDecl.cc (modified) (1 diff)
• FunctionType.cc (modified) (1 diff)
• ObjectDecl.cc (modified) (1 diff)
• ReferenceToType.cc (modified) (3 diffs)
• Type.h (modified) (1 diff)
• TypeofType.cc (modified) (2 diffs)

src/SynTree/Expression.cc

@@ -376 +376 @@
         os << "Untyped Member Expression, with field: " << std::endl << indent+1;
         member->print(os, indent+1 );
-        os << indent << "... from aggregate: " << std::endl << indent+1;
+        os << indent << "... from aggregate:" << std::endl << indent+1;
         aggregate->print(os, indent+1);
         Expression::print( os, indent );
@@ -405 +405 @@
 
 void MemberExpr::print( std::ostream &os, Indenter indent ) const {
-        os << "Member Expression, with field: " << std::endl;
+        os << "Member Expression, with field:" << std::endl;
         os << indent+1;
         member->print( os, indent+1 );
-        os << std::endl << indent << "... from aggregate: " << std::endl << indent+1;
+        os << std::endl << indent << "... from aggregate:" << std::endl << indent+1;
         aggregate->print(os, indent + 1);
         Expression::print( os, indent );

src/SynTree/FunctionDecl.cc

@@ -87 +87 @@
 
         if ( statements ) {
-                os << indent << "... with body " << endl << indent+1;
+                os << indent << "... with body" << endl << indent+1;
                 statements->print( os, indent+1 );
         } // if

src/SynTree/FunctionType.cc

@@ -66 +66 @@
                 os << indent+1 << "accepting unspecified arguments" << endl;
         } // if
-        os << indent << "... returning ";
+        os << indent << "... returning";
         if ( returnVals.empty() ) {
-                os << "nothing " << endl;
+                os << " nothing" << endl;
         } else {
                 os << endl;

src/SynTree/ObjectDecl.cc

@@ -66 +66 @@
 
         if ( ! attributes.empty() ) {
-                os << std::endl << indent << "... with attributes: " << std::endl;
+                os << std::endl << indent << "... with attributes:" << std::endl;
                 printAll( attributes, os, indent+1 );
         }

src/SynTree/ReferenceToType.cc

@@ -93 +93 @@
         else {
                 Type::print( os, indent );
-                os << "instance of " << typeString() << " " << name << " with body " << baseStruct->has_body() << " ";
+                os << "instance of " << typeString() << " " << name << " with body " << baseStruct->has_body();
                 if ( ! parameters.empty() ) {
                         os << endl << indent << "... with parameters" << endl;
@@ -136 +136 @@
         else {
                 Type::print( os, indent );
-                os << "instance of " << typeString() << " " << name << " with body " << baseUnion->has_body() << " ";
+                os << "instance of " << typeString() << " " << name << " with body " << baseUnion->has_body();
                 if ( ! parameters.empty() ) {
                         os << endl << indent << "... with parameters" << endl;
@@ -160 +160 @@
         else {
                 Type::print( os, indent );
-                os << "instance of " << typeString() << " " << name << " with body " << baseEnum->has_body() << " ";
+                os << "instance of " << typeString() << " " << name << " with body " << baseEnum->has_body();
         } // if
 }

src/SynTree/Type.h

@@ -598 +598 @@
 class TypeofType : public Type {
   public:
-        Expression *expr;
-
-        TypeofType( const Type::Qualifiers & tq, Expression *expr, const std::list< Attribute * > & attributes = std::list< Attribute * >()  );
+        Expression *expr;    ///< expression to take the type of
+        bool is_basetypeof;  ///< true iff is basetypeof type
+
+        TypeofType( const Type::Qualifiers & tq, Expression *expr, const std::list< Attribute * > & attributes = std::list< Attribute * >() );
+        TypeofType( const Type::Qualifiers & tq, Expression *expr, bool is_basetypeof, 
+                const std::list< Attribute * > & attributes = std::list< Attribute * >() );
         TypeofType( const TypeofType& );
         virtual ~TypeofType();

src/SynTree/TypeofType.cc

@@ -23 +23 @@
 class Attribute;
 
-TypeofType::TypeofType( const Type::Qualifiers &tq, Expression *expr, const std::list< Attribute * > & attributes ) : Type( tq, attributes ), expr( expr ) {
-}
+TypeofType::TypeofType( const Type::Qualifiers &tq, Expression *expr, 
+        const std::list< Attribute * > & attributes ) 
+: Type( tq, attributes ), expr( expr ), is_basetypeof(false) {}
 
-TypeofType::TypeofType( const TypeofType &other ) : Type( other ), expr( maybeClone( other.expr ) ) {
-}
+TypeofType::TypeofType( const Type::Qualifiers &tq, Expression *expr, bool is_basetypeof, 
+        const std::list< Attribute * > & attributes ) 
+: Type( tq, attributes ), expr( expr ), is_basetypeof( is_basetypeof ) {}
+
+TypeofType::TypeofType( const TypeofType &other )
+: Type( other ), expr( maybeClone( other.expr ) ), is_basetypeof( other.is_basetypeof ) {}
 
 TypeofType::~TypeofType() {
@@ -35 +40 @@
 void TypeofType::print( std::ostream &os, Indenter indent ) const {
         Type::print( os, indent );
+        if ( is_basetypeof ) { os << "base-"; }
         os << "type-of expression ";
         if ( expr ) {