From a593419593e4ee6b4961d836dfcb2b9b58870ab7 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Wed, 23 Jul 2014 03:22:10 +0000 Subject: [PATCH] AST printer: fix double space before base class with no access specifier. llvm-svn: 213719 --- clang/lib/AST/DeclPrinter.cpp | 6 ++++-- clang/unittests/AST/DeclPrinterTest.cpp | 12 ++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/clang/lib/AST/DeclPrinter.cpp b/clang/lib/AST/DeclPrinter.cpp index ec7ba65..160e48b 100644 --- a/clang/lib/AST/DeclPrinter.cpp +++ b/clang/lib/AST/DeclPrinter.cpp @@ -784,9 +784,11 @@ void DeclPrinter::VisitCXXRecordDecl(CXXRecordDecl *D) { Out << "virtual "; AccessSpecifier AS = Base->getAccessSpecifierAsWritten(); - if (AS != AS_none) + if (AS != AS_none) { Print(AS); - Out << " " << Base->getType().getAsString(Policy); + Out << " "; + } + Out << Base->getType().getAsString(Policy); if (Base->isPackExpansion()) Out << "..."; diff --git a/clang/unittests/AST/DeclPrinterTest.cpp b/clang/unittests/AST/DeclPrinterTest.cpp index 9ba5979..9f179c4 100644 --- a/clang/unittests/AST/DeclPrinterTest.cpp +++ b/clang/unittests/AST/DeclPrinterTest.cpp @@ -268,8 +268,8 @@ TEST(DeclPrinter, TestCXXRecordDecl4) { "class Z { int a; };" "class A : Z { int b; };", "A", - "class A : Z {\n}")); - // Should be: with semicolon, with { ... }, without two spaces + "class A : Z {\n}")); + // Should be: with semicolon, with { ... } } TEST(DeclPrinter, TestCXXRecordDecl5) { @@ -277,8 +277,8 @@ TEST(DeclPrinter, TestCXXRecordDecl5) { "struct Z { int a; };" "struct A : Z { int b; };", "A", - "struct A : Z {\n}")); - // Should be: with semicolon, with { ... }, without two spaces + "struct A : Z {\n}")); + // Should be: with semicolon, with { ... } } TEST(DeclPrinter, TestCXXRecordDecl6) { @@ -313,8 +313,8 @@ TEST(DeclPrinter, TestCXXRecordDecl9) { "class Z { int a; };" "class A : virtual Z { int b; };", "A", - "class A : virtual Z {\n}")); - // Should be: with semicolon, with { ... }, without two spaces + "class A : virtual Z {\n}")); + // Should be: with semicolon, with { ... } } TEST(DeclPrinter, TestCXXRecordDecl10) { -- 2.7.4