commit 2f5a23103f691b1bf7522494fabeaa8f7bd7122b
author Samuel Benzaquen <sbenza@google.com> Fri Jul 19 20:02:35 2013 +0000
committer Samuel Benzaquen <sbenza@google.com> Fri Jul 19 20:02:35 2013 +0000
tree 63da6420f1f1151d1cc2b090b2082e18a2432983
parent 5b92696c8f1f8ef943ad87397b95c031b5787305

Add support for raw_ostream on the printing methods of Diagnostics.

Summary:
Add printToStream*(llvm::raw_ostream&) methods to Diagnostics, and reimplement everything based on streams instead of concatenating strings.
Also, fix some functions to start with lowercase to match the style guide.

Reviewers: klimek

CC: cfe-commits, revane

Differential Revision: http://llvm-reviews.chandlerc.com/D1187

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@186715 91177308-0d34-0410-b5e6-96231b3b80d8

unittests/ASTMatchers/Dynamic/ParserTest.cpp

diff --git a/unittests/ASTMatchers/Dynamic/ParserTest.cpp b/unittests/ASTMatchers/Dynamic/ParserTest.cpp
index 6ef32dd..9ccd3dc 100644
--- a/unittests/ASTMatchers/Dynamic/ParserTest.cpp
+++ b/unittests/ASTMatchers/Dynamic/ParserTest.cpp
@@ -73,7 +73,7 @@
     VariantValue Value;
     Parser::parseExpression(Code, this, &Value, &Error);
     Values.push_back(Value);
-    Errors.push_back(Error.ToStringFull());
+    Errors.push_back(Error.toStringFull());
   }
 
   MatcherList actOnMatcherExpression(StringRef MatcherName,
@@ -184,7 +184,7 @@
       "varDecl(hasInitializer(binaryOperator(hasLHS(integerLiteral()),"
       "                                      hasOperatorName(\"+\"))))",
       &Error));
-  EXPECT_EQ("", Error.ToStringFull());
+  EXPECT_EQ("", Error.toStringFull());
   Matcher<Decl> M = Matcher<Decl>::constructFrom(*VarDecl);
   EXPECT_TRUE(matches("int x = 1 + false;", M));
   EXPECT_FALSE(matches("int x = true + 1;", M));
@@ -193,7 +193,7 @@
 
   OwningPtr<DynTypedMatcher> HasParameter(Parser::parseMatcherExpression(
       "functionDecl(hasParameter(1, hasName(\"x\")))", &Error));
-  EXPECT_EQ("", Error.ToStringFull());
+  EXPECT_EQ("", Error.toStringFull());
   M = Matcher<Decl>::constructFrom(*HasParameter);
 
   EXPECT_TRUE(matches("void f(int a, int x);", M));
@@ -206,20 +206,20 @@
             "2:20: Error building matcher hasLHS.\n"
             "2:27: Incorrect type for arg 1. "
             "(Expected = Matcher<Expr>) != (Actual = String)",
-            Error.ToStringFull());
+            Error.toStringFull());
 }
 
 std::string ParseWithError(StringRef Code) {
   Diagnostics Error;
   VariantValue Value;
   Parser::parseExpression(Code, &Value, &Error);
-  return Error.ToStringFull();
+  return Error.toStringFull();
 }
 
 std::string ParseMatcherWithError(StringRef Code) {
   Diagnostics Error;
   Parser::parseMatcherExpression(Code, &Error);
-  return Error.ToStringFull();
+  return Error.toStringFull();
 }
 
 TEST(ParserTest, Errors) {

unittests/ASTMatchers/Dynamic/RegistryTest.cpp

diff --git a/unittests/ASTMatchers/Dynamic/RegistryTest.cpp b/unittests/ASTMatchers/Dynamic/RegistryTest.cpp
index d546fe5..178a64a 100644
--- a/unittests/ASTMatchers/Dynamic/RegistryTest.cpp
+++ b/unittests/ASTMatchers/Dynamic/RegistryTest.cpp
@@ -42,7 +42,7 @@
     if (!Error) Error = &DummyError;
     const MatcherList Out =
         Registry::constructMatcher(MatcherName, SourceRange(), Args(), Error);
-    EXPECT_EQ("", DummyError.ToStringFull());
+    EXPECT_EQ("", DummyError.toStringFull());
     return Out;
   }
 
@@ -52,7 +52,7 @@
     if (!Error) Error = &DummyError;
     const MatcherList Out = Registry::constructMatcher(
         MatcherName, SourceRange(), Args(Arg1), Error);
-    EXPECT_EQ("", DummyError.ToStringFull());
+    EXPECT_EQ("", DummyError.toStringFull());
     return Out;
   }
 
@@ -63,7 +63,7 @@
     if (!Error) Error = &DummyError;
     const MatcherList Out = Registry::constructMatcher(
         MatcherName, SourceRange(), Args(Arg1, Arg2), Error);
-    EXPECT_EQ("", DummyError.ToStringFull());
+    EXPECT_EQ("", DummyError.toStringFull());
     return Out;
   }
 };
@@ -203,24 +203,24 @@
   OwningPtr<Diagnostics> Error(new Diagnostics());
   EXPECT_TRUE(constructMatcher("hasInitializer", Error.get()).empty());
   EXPECT_EQ("Incorrect argument count. (Expected = 1) != (Actual = 0)",
-            Error->ToString());
+            Error->toString());
   Error.reset(new Diagnostics());
   EXPECT_TRUE(constructMatcher("isArrow", std::string(), Error.get()).empty());
   EXPECT_EQ("Incorrect argument count. (Expected = 0) != (Actual = 1)",
-            Error->ToString());
+            Error->toString());
 
   // Bad argument type
   Error.reset(new Diagnostics());
   EXPECT_TRUE(constructMatcher("ofClass", std::string(), Error.get()).empty());
   EXPECT_EQ("Incorrect type for arg 1. (Expected = Matcher<CXXRecordDecl>) != "
             "(Actual = String)",
-            Error->ToString());
+            Error->toString());
   Error.reset(new Diagnostics());
   EXPECT_TRUE(constructMatcher("recordDecl", recordDecl(), parameterCountIs(3),
                                Error.get()).empty());
   EXPECT_EQ("Incorrect type for arg 2. (Expected = Matcher<CXXRecordDecl>) != "
             "(Actual = Matcher<FunctionDecl>)",
-            Error->ToString());
+            Error->toString());
 }
 
 } // end anonymous namespace