<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Nov 9, 2015 at 8:50 AM, Aaron Ballman <span dir="ltr"><<a href="mailto:aaron@aaronballman.com" target="_blank">aaron@aaronballman.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><span class="">On Mon, Nov 9, 2015 at 11:45 AM, Alexander Kornienko via cfe-commits<br>
<<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br>
> Author: alexfh<br>
> Date: Mon Nov  9 10:45:17 2015<br>
> New Revision: 252488<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=252488&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=252488&view=rev</a><br>
> Log:<br>
> Adjust printQualifiedName to handle unscoped enums in a way similar to anonymous namespaces.<br>
><br>
> Patch by Sterling Augustine!<br>
><br>
> Differential revision: <a href="http://reviews.llvm.org/D14459" rel="noreferrer" target="_blank">http://reviews.llvm.org/D14459</a><br>
><br>
> Modified:<br>
>     cfe/trunk/lib/AST/Decl.cpp<br>
>     cfe/trunk/unittests/AST/NamedDeclPrinterTest.cpp<br>
><br>
> Modified: cfe/trunk/lib/AST/Decl.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Decl.cpp?rev=252488&r1=252487&r2=252488&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Decl.cpp?rev=252488&r1=252487&r2=252488&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/AST/Decl.cpp (original)<br>
> +++ cfe/trunk/lib/AST/Decl.cpp Mon Nov  9 10:45:17 2015<br>
> @@ -1430,6 +1430,15 @@ void NamedDecl::printQualifiedName(raw_o<br>
>          }<br>
>        }<br>
>        OS << ')';<br>
> +    } else if (const EnumDecl *ED = dyn_cast<EnumDecl>(*I)) {<br>
<br>
</span>Should use auto instead of spelling the type twice.<br></blockquote><div><br></div><div>Sent you <span style="color:rgb(0,0,0)"><a href="http://reviews.llvm.org/D14501">http://reviews.llvm.org/D14501</a>.</span></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<span class=""><font color="#888888"><br>
~Aaron<br>
</font></span><div class=""><div class="h5"><br>
> +      // C++ [dcl.enum]p10: Each enum-name and each unscoped<br>
> +      // enumerator is declared in the scope that immediately contains<br>
> +      // the enum-specifier. Each scoped enumerator is declared in the<br>
> +      // scope of the enumeration.<br>
> +      if (ED->isScoped() || ED->getIdentifier())<br>
> +        OS << *ED;<br>
> +      else<br>
> +        continue;<br>
>      } else {<br>
>        OS << *cast<NamedDecl>(*I);<br>
>      }<br>
><br>
> Modified: cfe/trunk/unittests/AST/NamedDeclPrinterTest.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/AST/NamedDeclPrinterTest.cpp?rev=252488&r1=252487&r2=252488&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/AST/NamedDeclPrinterTest.cpp?rev=252488&r1=252487&r2=252488&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/unittests/AST/NamedDeclPrinterTest.cpp (original)<br>
> +++ cfe/trunk/unittests/AST/NamedDeclPrinterTest.cpp Mon Nov  9 10:45:17 2015<br>
> @@ -131,3 +131,45 @@ TEST(NamedDeclPrinter, TestNamespace2) {<br>
>      "A",<br>
>      "A"));<br>
>  }<br>
> +<br>
> +TEST(NamedDeclPrinter, TestUnscopedUnnamedEnum) {<br>
> +  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(<br>
> +    "enum { A };",<br>
> +    "A",<br>
> +    "A"));<br>
> +}<br>
> +<br>
> +TEST(NamedDeclPrinter, TestNamedEnum) {<br>
> +  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(<br>
> +    "enum X { A };",<br>
> +    "A",<br>
> +    "X::A"));<br>
> +}<br>
> +<br>
> +TEST(NamedDeclPrinter, TestScopedNamedEnum) {<br>
> +  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(<br>
> +    "enum class X { A };",<br>
> +    "A",<br>
> +    "X::A"));<br>
> +}<br>
> +<br>
> +TEST(NamedDeclPrinter, TestClassWithUnscopedUnnamedEnum) {<br>
> +  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(<br>
> +    "class X { enum { A }; };",<br>
> +    "A",<br>
> +    "X::A"));<br>
> +}<br>
> +<br>
> +TEST(NamedDeclPrinter, TestClassWithUnscopedNamedEnum) {<br>
> +  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(<br>
> +    "class X { enum Y { A }; };",<br>
> +    "A",<br>
> +    "X::Y::A"));<br>
> +}<br>
> +<br>
> +TEST(NamedDeclPrinter, TestClassWithScopedNamedEnum) {<br>
> +  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(<br>
> +    "class X { enum class Y { A }; };",<br>
> +    "A",<br>
> +    "X::Y::A"));<br>
> +}<br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br></div></div>