diff options
author | David Blaikie <dblaikie@gmail.com> | 2012-03-11 07:00:24 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2012-03-11 07:00:24 +0000 |
commit | 4e4d08403ca5cfd4d558fa2936215d3a4e5a528d (patch) | |
tree | bc9bf6ce1639dc8a7ba02d0e3046ab14b5329d8c /tools | |
parent | 7c02cfeb0861278c09ba05d1b92bd2a996bbe2e0 (diff) |
Unify naming of LangOptions variable/get function across the Clang stack (Lex to AST).
The member variable is always "LangOpts" and the member function is always "getLangOpts".
Reviewed by Chris Lattner
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152536 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/arcmt-test/arcmt-test.cpp | 2 | ||||
-rw-r--r-- | tools/libclang/CIndex.cpp | 8 | ||||
-rw-r--r-- | tools/libclang/CIndexCodeCompletion.cpp | 10 | ||||
-rw-r--r-- | tools/libclang/CIndexDiagnostic.cpp | 2 | ||||
-rw-r--r-- | tools/libclang/CIndexUSRs.cpp | 2 | ||||
-rw-r--r-- | tools/libclang/CXSourceLocation.h | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/tools/arcmt-test/arcmt-test.cpp b/tools/arcmt-test/arcmt-test.cpp index 2dc8034e32..3983c24902 100644 --- a/tools/arcmt-test/arcmt-test.cpp +++ b/tools/arcmt-test/arcmt-test.cpp @@ -318,7 +318,7 @@ static void printSourceLocation(SourceLocation loc, ASTContext &Ctx, static void printSourceRange(CharSourceRange range, ASTContext &Ctx, raw_ostream &OS) { SourceManager &SM = Ctx.getSourceManager(); - const LangOptions &langOpts = Ctx.getLangOptions(); + const LangOptions &langOpts = Ctx.getLangOpts(); PresumedLoc PL = SM.getPresumedLoc(range.getBegin()); diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 92c9fde041..52a7cd6a5d 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -2586,7 +2586,7 @@ static void clang_parseTranslationUnit_Impl(void *UserData) { for (ASTUnit::stored_diag_iterator D = Unit->stored_diag_begin(), DEnd = Unit->stored_diag_end(); D != DEnd; ++D) { - CXStoredDiagnostic Diag(*D, Unit->getASTContext().getLangOptions()); + CXStoredDiagnostic Diag(*D, Unit->getASTContext().getLangOpts()); CXString Msg = clang_formatDiagnostic(&Diag, clang_defaultDiagnosticDisplayOptions()); fprintf(stderr, "%s\n", clang_getCString(Msg)); @@ -3782,7 +3782,7 @@ CXCursor cxcursor::getCursor(CXTranslationUnit TU, SourceLocation SLoc) { // Translate the given source location to make it point at the beginning of // the token under the cursor. SLoc = Lexer::GetBeginningOfToken(SLoc, CXXUnit->getSourceManager(), - CXXUnit->getASTContext().getLangOptions()); + CXXUnit->getASTContext().getLangOpts()); CXCursor Result = MakeCXCursorInvalid(CXCursor_NoDeclFound); if (SLoc.isValid()) { @@ -4487,7 +4487,7 @@ static void getTokens(ASTUnit *CXXUnit, SourceRange Range, return; Lexer Lex(SourceMgr.getLocForStartOfFile(BeginLocInfo.first), - CXXUnit->getASTContext().getLangOptions(), + CXXUnit->getASTContext().getLangOpts(), Buffer.begin(), Buffer.data() + BeginLocInfo.second, Buffer.end()); Lex.SetCommentRetentionState(true); @@ -5020,7 +5020,7 @@ static void annotatePreprocessorTokens(CXTranslationUnit TU, return; Lexer Lex(SourceMgr.getLocForStartOfFile(BeginLocInfo.first), - CXXUnit->getASTContext().getLangOptions(), + CXXUnit->getASTContext().getLangOpts(), Buffer.begin(), Buffer.data() + BeginLocInfo.second, Buffer.end()); Lex.SetCommentRetentionState(true); diff --git a/tools/libclang/CIndexCodeCompletion.cpp b/tools/libclang/CIndexCodeCompletion.cpp index caf8fe7fd1..10f2411320 100644 --- a/tools/libclang/CIndexCodeCompletion.cpp +++ b/tools/libclang/CIndexCodeCompletion.cpp @@ -332,7 +332,7 @@ static unsigned long long getContextsForContextKind( case CodeCompletionContext::CCC_Type: { contexts = CXCompletionContext_AnyType | CXCompletionContext_ObjCInterface; - if (S.getLangOptions().CPlusPlus) { + if (S.getLangOpts().CPlusPlus) { contexts |= CXCompletionContext_EnumTag | CXCompletionContext_UnionTag | CXCompletionContext_StructTag | @@ -345,7 +345,7 @@ static unsigned long long getContextsForContextKind( contexts = CXCompletionContext_AnyType | CXCompletionContext_ObjCInterface | CXCompletionContext_AnyValue; - if (S.getLangOptions().CPlusPlus) { + if (S.getLangOpts().CPlusPlus) { contexts |= CXCompletionContext_EnumTag | CXCompletionContext_UnionTag | CXCompletionContext_StructTag | @@ -356,7 +356,7 @@ static unsigned long long getContextsForContextKind( } case CodeCompletionContext::CCC_Expression: { contexts = CXCompletionContext_AnyValue; - if (S.getLangOptions().CPlusPlus) { + if (S.getLangOpts().CPlusPlus) { contexts |= CXCompletionContext_AnyType | CXCompletionContext_ObjCInterface | CXCompletionContext_EnumTag | @@ -371,7 +371,7 @@ static unsigned long long getContextsForContextKind( contexts = CXCompletionContext_ObjCObjectValue | CXCompletionContext_ObjCSelectorValue | CXCompletionContext_ObjCInterface; - if (S.getLangOptions().CPlusPlus) { + if (S.getLangOpts().CPlusPlus) { contexts |= CXCompletionContext_CXXClassTypeValue | CXCompletionContext_AnyType | CXCompletionContext_EnumTag | @@ -438,7 +438,7 @@ static unsigned long long getContextsForContextKind( contexts = CXCompletionContext_AnyType | CXCompletionContext_ObjCInterface | CXCompletionContext_AnyValue; - if (S.getLangOptions().CPlusPlus) { + if (S.getLangOpts().CPlusPlus) { contexts |= CXCompletionContext_EnumTag | CXCompletionContext_UnionTag | CXCompletionContext_StructTag | diff --git a/tools/libclang/CIndexDiagnostic.cpp b/tools/libclang/CIndexDiagnostic.cpp index 24a2652f7f..67aa77027f 100644 --- a/tools/libclang/CIndexDiagnostic.cpp +++ b/tools/libclang/CIndexDiagnostic.cpp @@ -180,7 +180,7 @@ CXDiagnosticSetImpl *cxdiag::lazyCreateDiags(CXTranslationUnit TU, TU->Diagnostics = Set; DiagnosticOptions DOpts; CXDiagnosticRenderer Renderer(AU->getSourceManager(), - AU->getASTContext().getLangOptions(), + AU->getASTContext().getLangOpts(), DOpts, Set); for (ASTUnit::stored_diag_iterator it = AU->stored_diag_begin(), diff --git a/tools/libclang/CIndexUSRs.cpp b/tools/libclang/CIndexUSRs.cpp index 8cd549bae8..7c79b69315 100644 --- a/tools/libclang/CIndexUSRs.cpp +++ b/tools/libclang/CIndexUSRs.cpp @@ -194,7 +194,7 @@ void USRGenerator::VisitFunctionDecl(FunctionDecl *D) { D->printName(Out); ASTContext &Ctx = *Context; - if (!Ctx.getLangOptions().CPlusPlus || D->isExternC()) + if (!Ctx.getLangOpts().CPlusPlus || D->isExternC()) return; if (const TemplateArgumentList * diff --git a/tools/libclang/CXSourceLocation.h b/tools/libclang/CXSourceLocation.h index 7a50205963..6c5e858aaa 100644 --- a/tools/libclang/CXSourceLocation.h +++ b/tools/libclang/CXSourceLocation.h @@ -41,7 +41,7 @@ translateSourceLocation(const SourceManager &SM, const LangOptions &LangOpts, static inline CXSourceLocation translateSourceLocation(ASTContext &Context, SourceLocation Loc) { return translateSourceLocation(Context.getSourceManager(), - Context.getLangOptions(), + Context.getLangOpts(), Loc); } @@ -59,7 +59,7 @@ CXSourceRange translateSourceRange(const SourceManager &SM, static inline CXSourceRange translateSourceRange(ASTContext &Context, SourceRange R) { return translateSourceRange(Context.getSourceManager(), - Context.getLangOptions(), + Context.getLangOpts(), CharSourceRange::getTokenRange(R)); } |