From 20bcaff6a7f93a9894f7233c449b016bafe93b26 Mon Sep 17 00:00:00 2001 From: Devang Patel Date: Wed, 24 Sep 2008 00:06:15 +0000 Subject: Put FN_NOTE_AlwaysInline and others in FnAttr namespace. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@56527 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AsmParser/llvmAsmParser.cpp.cvs | 16 ++++++++-------- lib/AsmParser/llvmAsmParser.y | 16 ++++++++-------- lib/AsmParser/llvmAsmParser.y.cvs | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) (limited to 'lib/AsmParser') diff --git a/lib/AsmParser/llvmAsmParser.cpp.cvs b/lib/AsmParser/llvmAsmParser.cpp.cvs index 4d8ab74..9fb6134 100644 --- a/lib/AsmParser/llvmAsmParser.cpp.cvs +++ b/lib/AsmParser/llvmAsmParser.cpp.cvs @@ -4125,11 +4125,11 @@ yyreduce: #line 1298 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y" { unsigned tmp = (yyvsp[(1) - (3)].ParamAttrs) | (yyvsp[(3) - (3)].ParamAttrs); - if ((yyvsp[(3) - (3)].ParamAttrs) == FN_NOTE_NoInline - && ((yyvsp[(1) - (3)].ParamAttrs) & FN_NOTE_AlwaysInline)) + if ((yyvsp[(3) - (3)].ParamAttrs) == FnAttr::NoInline + && ((yyvsp[(1) - (3)].ParamAttrs) & FnAttr::AlwaysInline)) GEN_ERROR("Function Notes may include only one inline notes!") - if ((yyvsp[(3) - (3)].ParamAttrs) == FN_NOTE_AlwaysInline - && ((yyvsp[(1) - (3)].ParamAttrs) & FN_NOTE_NoInline)) + if ((yyvsp[(3) - (3)].ParamAttrs) == FnAttr::AlwaysInline + && ((yyvsp[(1) - (3)].ParamAttrs) & FnAttr::NoInline)) GEN_ERROR("Function Notes may include only one inline notes!") (yyval.ParamAttrs) = tmp; CHECK_FOR_ERROR @@ -4138,22 +4138,22 @@ yyreduce: case 131: #line 1311 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = FN_NOTE_NoInline; ;} + { (yyval.ParamAttrs) = FnAttr::NoInline; ;} break; case 132: #line 1312 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = FN_NOTE_AlwaysInline; ;} + { (yyval.ParamAttrs) = FnAttr::AlwaysInline; ;} break; case 133: #line 1313 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = FN_NOTE_OptimizeForSize; ;} + { (yyval.ParamAttrs) = FnAttr::OptimizeForSize; ;} break; case 134: #line 1316 "/Volumes/Nanpura/mainline/llvm/lib/AsmParser/llvmAsmParser.y" - { (yyval.ParamAttrs) = FN_NOTE_None; ;} + { (yyval.ParamAttrs) = FnAttr::None; ;} break; case 135: diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index 5de34a7..2241778 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -1297,23 +1297,23 @@ OptFuncAttrs : /* empty */ { $$ = ParamAttr::None; } FuncNoteList : FuncNote { $$ = $1; } | FuncNoteList ',' FuncNote { unsigned tmp = $1 | $3; - if ($3 == FN_NOTE_NoInline - && ($1 & FN_NOTE_AlwaysInline)) + if ($3 == FnAttr::NoInline + && ($1 & FnAttr::AlwaysInline)) GEN_ERROR("Function Notes may include only one inline notes!") - if ($3 == FN_NOTE_AlwaysInline - && ($1 & FN_NOTE_NoInline)) + if ($3 == FnAttr::AlwaysInline + && ($1 & FnAttr::NoInline)) GEN_ERROR("Function Notes may include only one inline notes!") $$ = tmp; CHECK_FOR_ERROR } ; -FuncNote : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; } - | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; } - | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; } +FuncNote : INLINE '=' NEVER { $$ = FnAttr::NoInline; } + | INLINE '=' ALWAYS { $$ = FnAttr::AlwaysInline; } + | OPTIMIZEFORSIZE { $$ = FnAttr::OptimizeForSize; } ; -OptFuncNotes : /* empty */ { $$ = FN_NOTE_None; } +OptFuncNotes : /* empty */ { $$ = FnAttr::None; } | FNNOTE '(' FuncNoteList ')' { $$ = $3; } diff --git a/lib/AsmParser/llvmAsmParser.y.cvs b/lib/AsmParser/llvmAsmParser.y.cvs index 5de34a7..2241778 100644 --- a/lib/AsmParser/llvmAsmParser.y.cvs +++ b/lib/AsmParser/llvmAsmParser.y.cvs @@ -1297,23 +1297,23 @@ OptFuncAttrs : /* empty */ { $$ = ParamAttr::None; } FuncNoteList : FuncNote { $$ = $1; } | FuncNoteList ',' FuncNote { unsigned tmp = $1 | $3; - if ($3 == FN_NOTE_NoInline - && ($1 & FN_NOTE_AlwaysInline)) + if ($3 == FnAttr::NoInline + && ($1 & FnAttr::AlwaysInline)) GEN_ERROR("Function Notes may include only one inline notes!") - if ($3 == FN_NOTE_AlwaysInline - && ($1 & FN_NOTE_NoInline)) + if ($3 == FnAttr::AlwaysInline + && ($1 & FnAttr::NoInline)) GEN_ERROR("Function Notes may include only one inline notes!") $$ = tmp; CHECK_FOR_ERROR } ; -FuncNote : INLINE '=' NEVER { $$ = FN_NOTE_NoInline; } - | INLINE '=' ALWAYS { $$ = FN_NOTE_AlwaysInline; } - | OPTIMIZEFORSIZE { $$ = FN_NOTE_OptimizeForSize; } +FuncNote : INLINE '=' NEVER { $$ = FnAttr::NoInline; } + | INLINE '=' ALWAYS { $$ = FnAttr::AlwaysInline; } + | OPTIMIZEFORSIZE { $$ = FnAttr::OptimizeForSize; } ; -OptFuncNotes : /* empty */ { $$ = FN_NOTE_None; } +OptFuncNotes : /* empty */ { $$ = FnAttr::None; } | FNNOTE '(' FuncNoteList ')' { $$ = $3; } -- cgit v1.1