Changeset 3d5701e for src/AST/Print.cpp

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• src/AST/Print.cpp (modified) (2 diffs)

src/AST/Print.cpp

@@ -1011 +1011 @@
                 os << "Asm Expression:" << endl;
                 ++indent;
-                if ( node->inout ) node->inout->accept( *this );
+                if ( !node->inout.empty() ) os << "[" << node->inout << "] ";
                 if ( node->constraint ) node->constraint->accept( *this );
                 if ( node->operand ) node->operand->accept( *this );
@@ -1359 +1359 @@
                 preprint( node );
                 os << "instance of type " << node->name
-                   << " (" << (node->kind == ast::TypeVar::Ftype ? "" : "not ") << "function type)";
+                   << " (" << (node->kind == ast::TypeDecl::Ftype ? "" : "not ") << "function type)";
                 print( node->params );