[cfe-commits] r170933 - in /cfe/trunk: include/clang/Sema/DeclSpec.h lib/Parse/ParseDecl.cpp lib/Sema/DeclSpec.cpp

[Dmitri Gribenko]

Hello Chad,

On Sat, Dec 22, 2012 at 12:24 AM, Chad Rosier <mcrosier at apple.com> wrote:
> Author: mcrosier
> Date: Fri Dec 21 16:24:43 2012
> New Revision: 170933
>
> URL: http://llvm.org/viewvc/llvm-project?rev=170933&view=rev
> Log:
> Remove unused arguments and rename to conform to coding standards.
>
> Modified:
>     cfe/trunk/include/clang/Sema/DeclSpec.h
>     cfe/trunk/lib/Parse/ParseDecl.cpp
>     cfe/trunk/lib/Sema/DeclSpec.cpp
>
> Modified: cfe/trunk/include/clang/Sema/DeclSpec.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/DeclSpec.h?rev=170933&r1=170932&r2=170933&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Sema/DeclSpec.h (original)
> +++ cfe/trunk/include/clang/Sema/DeclSpec.h Fri Dec 21 16:24:43 2012
> @@ -608,12 +608,9 @@
>    bool SetTypeQual(TQ T, SourceLocation Loc, const char *&PrevSpec,
>                     unsigned &DiagID, const LangOptions &Lang);
>
> -  bool SetFunctionSpecInline(SourceLocation Loc, const char *&PrevSpec,
> -                             unsigned &DiagID);
> -  bool SetFunctionSpecVirtual(SourceLocation Loc, const char *&PrevSpec,
> -                              unsigned &DiagID);
> -  bool SetFunctionSpecExplicit(SourceLocation Loc, const char *&PrevSpec,
> -                               unsigned &DiagID);
> +  bool setFunctionSpecInline(SourceLocation Loc);
> +  bool setFunctionSpecVirtual(SourceLocation Loc);
> +  bool setFunctionSpecExplicit(SourceLocation Loc);
>
>    bool SetFriendSpec(SourceLocation Loc, const char *&PrevSpec,
>                       unsigned &DiagID);
>
> Modified: cfe/trunk/lib/Parse/ParseDecl.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDecl.cpp?rev=170933&r1=170932&r2=170933&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Parse/ParseDecl.cpp (original)
> +++ cfe/trunk/lib/Parse/ParseDecl.cpp Fri Dec 21 16:24:43 2012
> @@ -2528,7 +2528,7 @@
>
>      // Microsoft single token adornments.
>      case tok::kw___forceinline: {
> -      isInvalid = DS.SetFunctionSpecInline(Loc, PrevSpec, DiagID);
> +      isInvalid = DS.setFunctionSpecInline(Loc);
>        IdentifierInfo *AttrName = Tok.getIdentifierInfo();
>        SourceLocation AttrNameLoc = Tok.getLocation();
>        // FIXME: This does not work correctly if it is set to be a declspec
> @@ -2609,13 +2609,13 @@
>
>      // function-specifier
>      case tok::kw_inline:
> -      isInvalid = DS.SetFunctionSpecInline(Loc, PrevSpec, DiagID);
> +      isInvalid = DS.setFunctionSpecInline(Loc);
>        break;
>      case tok::kw_virtual:
> -      isInvalid = DS.SetFunctionSpecVirtual(Loc, PrevSpec, DiagID);
> +      isInvalid = DS.setFunctionSpecVirtual(Loc);
>        break;
>      case tok::kw_explicit:
> -      isInvalid = DS.SetFunctionSpecExplicit(Loc, PrevSpec, DiagID);
> +      isInvalid = DS.setFunctionSpecExplicit(Loc);
>        break;
>
>      // alignment-specifier
>
> Modified: cfe/trunk/lib/Sema/DeclSpec.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/DeclSpec.cpp?rev=170933&r1=170932&r2=170933&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/DeclSpec.cpp (original)
> +++ cfe/trunk/lib/Sema/DeclSpec.cpp Fri Dec 21 16:24:43 2012
> @@ -713,24 +713,19 @@
>    return false;
>  }
>
> -bool DeclSpec::SetFunctionSpecInline(SourceLocation Loc, const char *&PrevSpec,
> -                                     unsigned &DiagID) {
> -  // 'inline inline' is ok.
> +bool DeclSpec::setFunctionSpecInline(SourceLocation Loc) {
>    FS_inline_specified = true;
>    FS_inlineLoc = Loc;
>    return false;
>  }
>
> -bool DeclSpec::SetFunctionSpecVirtual(SourceLocation Loc, const char *&PrevSpec,
> -                                      unsigned &DiagID) {
> -  // 'virtual virtual' is ok.
> +bool DeclSpec::setFunctionSpecVirtual(SourceLocation Loc) {
>    FS_virtual_specified = true;
>    FS_virtualLoc = Loc;
>    return false;
>  }

Did you intend to remove "'foo foo' is ok" comments?

Dmitri

>
> -bool DeclSpec::SetFunctionSpecExplicit(SourceLocation Loc, const char *&PrevSpec,
> -                                       unsigned &DiagID) {
> +bool DeclSpec::setFunctionSpecExplicit(SourceLocation Loc) {
>    // 'explicit explicit' is ok.
>    FS_explicit_specified = true;
>    FS_explicitLoc = Loc;

-- 
main(i,j){for(i=2;;i++){for(j=2;j<i;j++){if(!(i%j)){j=0;break;}}if
(j){printf("%d\n",i);}}} /*Dmitri Gribenko <gribozavr at gmail.com>*/