From 4e8be2c98e4142ce02c96865f81f7ed9bdbd5f82 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Wed, 13 Jun 2018 16:21:24 +0000 Subject: Fix/unify the spelling of Objective-C. llvm-svn: 334614 --- lldb/CODE_OWNERS.txt | 2 +- lldb/examples/darwin/heap_find/heap/heap_find.cpp | 4 ++-- lldb/include/lldb/lldb-enumerations.h | 2 +- .../test/functionalities/breakpoint/objc/TestObjCBreakpoints.py | 2 +- .../Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m | 2 +- lldb/source/Commands/CommandObjectBreakpoint.cpp | 2 +- lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm | 2 +- lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp | 2 +- .../LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp | 2 +- .../LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp | 4 ++-- lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp | 8 ++++---- lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp | 2 +- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp | 2 +- lldb/source/Symbol/ClangASTContext.cpp | 2 +- lldb/source/Target/Process.cpp | 2 +- lldb/www/index.html | 4 ++-- lldb/www/lldb-gdb.html | 2 +- lldb/www/status.html | 2 +- lldb/www/tutorial.html | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lldb/CODE_OWNERS.txt b/lldb/CODE_OWNERS.txt index dac88687077..8ee04557af6 100644 --- a/lldb/CODE_OWNERS.txt +++ b/lldb/CODE_OWNERS.txt @@ -17,7 +17,7 @@ D: Build scripts, Test suite, Platform, gdb-remote, Anything not covered by this N: Jim Ingham E: jingham@apple.com D: Overall LLDB architecture, Thread plans, Expression parser, ValueObject, Breakpoints, ABI -D: Watchpoints, Trampolines, Target, Command Interpreter, C++ / Objective C Language runtime +D: Watchpoints, Trampolines, Target, Command Interpreter, C++ / Objective-C Language runtime D: Expression evaluator, IR interpreter, Clang integration D: Data Formatters diff --git a/lldb/examples/darwin/heap_find/heap/heap_find.cpp b/lldb/examples/darwin/heap_find/heap/heap_find.cpp index 3567e559a6a..b63d18b712b 100644 --- a/lldb/examples/darwin/heap_find/heap/heap_find.cpp +++ b/lldb/examples/darwin/heap_find/heap/heap_find.cpp @@ -410,7 +410,7 @@ public: m_sort_type = eSortTypeBytes; } if (print && m_size > 0) { - puts("Objective C objects by total bytes:"); + puts("Objective-C objects by total bytes:"); puts("Total Bytes Class Name"); puts("----------- " "-----------------------------------------------------------------"); @@ -427,7 +427,7 @@ public: m_sort_type = eSortTypeCount; } if (print && m_size > 0) { - puts("Objective C objects by total count:"); + puts("Objective-C objects by total count:"); puts("Count Class Name"); puts("-------- " "-----------------------------------------------------------------"); diff --git a/lldb/include/lldb/lldb-enumerations.h b/lldb/include/lldb/lldb-enumerations.h index 7bf6fdaecf2..22311defc36 100644 --- a/lldb/include/lldb/lldb-enumerations.h +++ b/lldb/include/lldb/lldb-enumerations.h @@ -626,7 +626,7 @@ enum SectionType { eSectionTypeDebug, eSectionTypeZeroFill, eSectionTypeDataObjCMessageRefs, // Pointer to function pointer + selector - eSectionTypeDataObjCCFStrings, // Objective C const CFString/NSString objects + eSectionTypeDataObjCCFStrings, // Objective-C const CFString/NSString objects eSectionTypeDWARFDebugAbbrev, eSectionTypeDWARFDebugAddr, eSectionTypeDWARFDebugAranges, diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py index 799206719b1..e5e8473eedd 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py @@ -22,7 +22,7 @@ class TestObjCBreakpoints(TestBase): mydir = TestBase.compute_mydir(__file__) def test_break(self): - """Test setting Objective C specific breakpoints (DWARF in .o files).""" + """Test setting Objective-C specific breakpoints (DWARF in .o files).""" self.build() self.setTearDownCleanup() self.check_objc_breakpoints(False) diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m index 337ab3408ce..6b13a3a3d59 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m +++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m @@ -32,7 +32,7 @@ int main() struct things_to_sum tts = { 2, 3, 4 }; int ret = [summer sumThings:tts]; NSRect rect = {{0, 0}, {10, 20}}; - // The Objective C V1 runtime won't read types from metadata so we need + // The Objective-C V1 runtime won't read types from metadata so we need // NSValue in our debug info to use it in our test. NSValue *v = [NSValue valueWithRect:rect]; return rect.origin.x; // Set breakpoint here. diff --git a/lldb/source/Commands/CommandObjectBreakpoint.cpp b/lldb/source/Commands/CommandObjectBreakpoint.cpp index 838759dbddd..79b92dc446d 100644 --- a/lldb/source/Commands/CommandObjectBreakpoint.cpp +++ b/lldb/source/Commands/CommandObjectBreakpoint.cpp @@ -283,7 +283,7 @@ static OptionDefinition g_breakpoint_set_options[] = { { LLDB_OPT_SET_9, false, "source-regexp-function", 'X', OptionParser::eRequiredArgument, nullptr, nullptr, CommandCompletions::eSymbolCompletion, eArgTypeFunctionName, "When used with '-p' limits the source regex to source contained in the named " "functions. Can be repeated multiple times." }, { LLDB_OPT_SET_4, true, "fullname", 'F', OptionParser::eRequiredArgument, nullptr, nullptr, CommandCompletions::eSymbolCompletion, eArgTypeFullName, "Set the breakpoint by fully qualified function names. For C++ this means " - "namespaces and all arguments, and for Objective C this means a full function " + "namespaces and all arguments, and for Objective-C this means a full function " "prototype with class and selector. Can be repeated multiple times to make " "one breakpoint for multiple names." }, { LLDB_OPT_SET_5, true, "selector", 'S', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeSelector, "Set the breakpoint by ObjC selector name. Can be repeated multiple times to " diff --git a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm index fb9e4e02765..7647e722536 100644 --- a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm +++ b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm @@ -31,7 +31,7 @@ #include #include -// Objective C/C++ includes +// Objective-C/C++ includes #include #include #include diff --git a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp index 95d2d047bb0..6ebd89a4626 100644 --- a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp +++ b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp @@ -107,7 +107,7 @@ bool ObjCLanguage::MethodName::SetName(llvm::StringRef name, bool strict) { if (valid_prefix) { int name_len = name.size(); - // Objective C methods must have at least: + // Objective-C methods must have at least: // "-[" or "+[" prefix // One character for a class name // One character for the space between the class name diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp index 270e83642ac..78270d4f722 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp @@ -84,7 +84,7 @@ AppleObjCRuntimeV1::CreateInstance(Process *process, void AppleObjCRuntimeV1::Initialize() { PluginManager::RegisterPlugin( - GetPluginNameStatic(), "Apple Objective C Language Runtime - Version 1", + GetPluginNameStatic(), "Apple Objective-C Language Runtime - Version 1", CreateInstance); } diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index e3a389d6e33..78afdb0f272 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -769,7 +769,7 @@ public: void AppleObjCRuntimeV2::Initialize() { PluginManager::RegisterPlugin( - GetPluginNameStatic(), "Apple Objective C Language Runtime - Version 2", + GetPluginNameStatic(), "Apple Objective-C Language Runtime - Version 2", CreateInstance, [](CommandInterpreter &interpreter) -> lldb::CommandObjectSP { return CommandObjectSP(new CommandObjectMultiwordObjC(interpreter)); @@ -1785,7 +1785,7 @@ void AppleObjCRuntimeV2::UpdateISAToDescriptorMapIfNeeded() { DescriptorMapUpdateResult dynamic_update_result = UpdateISAToDescriptorMapDynamic(hash_table); - // Now get the objc classes that are baked into the Objective C runtime in + // Now get the objc classes that are baked into the Objective-C runtime in // the shared cache, but only once per process as this data never changes if (!m_loaded_objc_opt) { // it is legitimately possible for the shared cache to be empty - in that diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp index 31c66fefd32..10028186636 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp @@ -474,7 +474,7 @@ TypeSP DWARFASTParserClang::ParseTypeFromDWARF(const SymbolContext &sc, if (log) dwarf->GetObjectFile()->GetModule()->LogMessage( log, "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' " - "is Objective C 'id' built-in type.", + "is Objective-C 'id' built-in type.", die.GetOffset(), die.GetTagAsCString(), die.GetName()); clang_type = m_ast.GetBasicType(eBasicTypeObjCID); encoding_data_type = Type::eEncodingIsUID; @@ -485,7 +485,7 @@ TypeSP DWARFASTParserClang::ParseTypeFromDWARF(const SymbolContext &sc, if (log) dwarf->GetObjectFile()->GetModule()->LogMessage( log, "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' " - "is Objective C 'Class' built-in type.", + "is Objective-C 'Class' built-in type.", die.GetOffset(), die.GetTagAsCString(), die.GetName()); clang_type = m_ast.GetBasicType(eBasicTypeObjCClass); encoding_data_type = Type::eEncodingIsUID; @@ -495,7 +495,7 @@ TypeSP DWARFASTParserClang::ParseTypeFromDWARF(const SymbolContext &sc, if (log) dwarf->GetObjectFile()->GetModule()->LogMessage( log, "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' " - "is Objective C 'selector' built-in type.", + "is Objective-C 'selector' built-in type.", die.GetOffset(), die.GetTagAsCString(), die.GetName()); clang_type = m_ast.GetBasicType(eBasicTypeObjCSel); encoding_data_type = Type::eEncodingIsUID; @@ -3515,7 +3515,7 @@ size_t DWARFASTParserClang::ParseChildParameters( skip = true; } else { - // HACK: Objective C formal parameters "self" and "_cmd" + // HACK: Objective-C formal parameters "self" and "_cmd" // are not marked as artificial in the DWARF... CompileUnit *comp_unit = die.GetLLDBCompileUnit(); if (comp_unit) { diff --git a/lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp b/lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp index 98c782caed8..6438f02fe8e 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp @@ -477,7 +477,7 @@ void ManualDWARFIndex::Dump(Stream &s) { m_set.function_methods.Dump(&s); s.Printf("\nFunction selectors:\n"); m_set.function_selectors.Dump(&s); - s.Printf("\nObjective C class selectors:\n"); + s.Printf("\nObjective-C class selectors:\n"); m_set.objc_class_selectors.Dump(&s); s.Printf("\nGlobals and statics:\n"); m_set.globals.Dump(&s); diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp index 218e6a3a862..d25e2c61200 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp @@ -1089,7 +1089,7 @@ bool SymbolFileDWARFDebugMap::Supports_DW_AT_APPLE_objc_complete_type( TypeSP SymbolFileDWARFDebugMap::FindCompleteObjCDefinitionTypeForDIE( const DWARFDIE &die, const ConstString &type_name, bool must_be_implementation) { - // If we have a debug map, we will have an Objective C symbol whose name is + // If we have a debug map, we will have an Objective-C symbol whose name is // the type name and whose type is eSymbolTypeObjCClass. If we can find that // symbol and find its containing parent, we can locate the .o file that will // contain the implementation definition since it will be scoped inside the diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index 98886703d79..61f63b746a4 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -1649,7 +1649,7 @@ bool ClangASTContext::RecordHasFields(const RecordDecl *record_decl) { return false; } -#pragma mark Objective C Classes +#pragma mark Objective-C Classes CompilerType ClangASTContext::CreateObjCClass(const char *name, DeclContext *decl_ctx, diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 32ed39842e3..a1826a77be1 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -1465,7 +1465,7 @@ void Process::UpdateThreadListIfNeeded() { old_thread_list.GetThreadAtIndex(i, false)->ClearBackingThread(); // Turn off dynamic types to ensure we don't run any expressions. - // Objective C can run an expression to determine if a SBValue is a + // Objective-C can run an expression to determine if a SBValue is a // dynamic type or not and we need to avoid this. OperatingSystem // plug-ins can't run expressions that require running code... diff --git a/lldb/www/index.html b/lldb/www/index.html index 4b20c760fc5..bc8b01ae70a 100755 --- a/lldb/www/index.html +++ b/lldb/www/index.html @@ -52,14 +52,14 @@

LLDB currently converts debug information into clang types so that it can leverage the clang compiler infrastructure. - This allows LLDB to support the latest C, C++, Objective C and Objective C++ + This allows LLDB to support the latest C, C++, Objective-C and Objective-C++ language features and runtimes in expressions without having to reimplement any of this functionality. It also leverages the compiler to take care of all ABI details when making functions calls for expressions, when disassembling instructions and extracting instruction details, and much more.

The major benefits include:

    -
  • Up to date language support for C, C++, Objective C
    • +
  • Up to date language support for C, C++, Objective-C
  • Multi-line expressions that can declare local variables and types
  • Utilize the JIT for expressions when supported
  • Evaluate expression Intermediate Representation (IR) when JIT can't be used
    • diff --git a/lldb/www/lldb-gdb.html b/lldb/www/lldb-gdb.html index 69179bd8c07..8cd387d10d6 100755 --- a/lldb/www/lldb-gdb.html +++ b/lldb/www/lldb-gdb.html @@ -380,7 +380,7 @@ - Set a breakpoint at all Objective C methods whose selector is count. + Set a breakpoint at all Objective-C methods whose selector is count. (gdb) break count
    diff --git a/lldb/www/status.html b/lldb/www/status.html index a14e9154a5f..09dff8cf28b 100755 --- a/lldb/www/status.html +++ b/lldb/www/status.html @@ -21,7 +21,7 @@

    LLDB has matured a lot in the last year and can be used for - C, C++ and Objective C development for x86_64, i386 and ARM debugging. + C, C++ and Objective-C development for x86_64, i386 and ARM debugging. The entire public API is exposed though a framework on Mac OS X which is used by Xcode, the lldb command line tool, and can also be used by Python. The entire public API is exposed through script bridging which diff --git a/lldb/www/tutorial.html b/lldb/www/tutorial.html index f3f80253cca..c351635f63f 100755 --- a/lldb/www/tutorial.html +++ b/lldb/www/tutorial.html @@ -109,7 +109,7 @@
    (lldb) breakpoint set -M foo -

    To set a breakpoint Objective C selectors named alignLeftEdges: you can enter either of:

    +

    To set a breakpoint Objective-C selectors named alignLeftEdges: you can enter either of:

    (lldb) breakpoint set --selector alignLeftEdges: -- cgit v1.2.3