Changeset d0c91a6 for src/Parser/TypeData.cc

Timestamp:

Jan 15, 2019, 4:16:15 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

c802eb88

Parents:

5e49e47 (diff), c9aba81 (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' into jenkins-sandbox

File:

• src/Parser/TypeData.cc (modified) (6 diffs)

src/Parser/TypeData.cc

@@ -322 +322 @@
                         function.params->printList( os, indent + 4 );
                 } else {
-                        os << string( indent + 2, ' ' ) << "with no parameters " << endl;
+                        os << string( indent + 2, ' ' ) << "with no parameters" << endl;
                 } // if
                 if ( function.idList ) {
@@ -347 +347 @@
                 os << DeclarationNode::aggregateNames[ aggregate.kind ] << ' ' << *aggregate.name << endl;
                 if ( aggregate.params ) {
-                        os << string( indent + 2, ' ' ) << "with type parameters " << endl;
+                        os << string( indent + 2, ' ' ) << "with type parameters" << endl;
                         aggregate.params->printList( os, indent + 4 );
                 } // if
                 if ( aggregate.actuals ) {
-                        os << string( indent + 2, ' ' ) << "instantiated with actual parameters " << endl;
+                        os << string( indent + 2, ' ' ) << "instantiated with actual parameters" << endl;
                         aggregate.actuals->printList( os, indent + 4 );
                 } // if
                 if ( aggregate.fields ) {
-                        os << string( indent + 2, ' ' ) << "with members " << endl;
+                        os << string( indent + 2, ' ' ) << "with members" << endl;
                         aggregate.fields->printList( os, indent + 4 );
                 } // if
                 if ( aggregate.body ) {
-                        os << string( indent + 2, ' ' ) << " with body " << endl;
+                        os << string( indent + 2, ' ' ) << " with body" << endl;
                 } // if
                 break;
@@ -370 +370 @@
                 } // if
                 if ( aggInst.params ) {
-                        os << string( indent + 2, ' ' ) << "with parameters " << endl;
+                        os << string( indent + 2, ' ' ) << "with parameters" << endl;
                         aggInst.params->printList( os, indent + 2 );
                 } // if
@@ -381 +381 @@
                 } // if
                 if ( enumeration.body ) {
-                        os << string( indent + 2, ' ' ) << " with body " << endl;
+                        os << string( indent + 2, ' ' ) << " with body" << endl;
                 } // if
                 break;
@@ -418 +418 @@
                 os << "tuple ";
                 if ( tuple ) {
-                        os << "with members " << endl;
+                        os << "with members" << endl;
                         tuple->printList( os, indent + 2 );
                 } // if
@@ -942 +942 @@
         assert( td->typeexpr );
         // assert( td->typeexpr->expr );
-        return new TypeofType{ 
+        return new TypeofType{
                 buildQualifiers( td ), td->typeexpr->build(), td->kind == TypeData::Basetypeof };
 } // buildTypeof