Fix/unify the spelling of Objective-C.
llvm-svn: 334614
diff --git a/lldb/CODE_OWNERS.txt b/lldb/CODE_OWNERS.txt
index dac8868..8ee0455 100644
--- a/lldb/CODE_OWNERS.txt
+++ b/lldb/CODE_OWNERS.txt
@@ -17,7 +17,7 @@
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 3567e55..b63d18b 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 @@
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 @@
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 7bf6fda..22311de 100644
--- a/lldb/include/lldb/lldb-enumerations.h
+++ b/lldb/include/lldb/lldb-enumerations.h
@@ -626,7 +626,7 @@
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 7992067..e5e8473 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 @@
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 337ab34..6b13a3a 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 @@
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 838759d..79b92dc 100644
--- a/lldb/source/Commands/CommandObjectBreakpoint.cpp
+++ b/lldb/source/Commands/CommandObjectBreakpoint.cpp
@@ -283,7 +283,7 @@
{ 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 fb9e4e0..7647e72 100644
--- a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
+++ b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
@@ -31,7 +31,7 @@
#include <sys/syslimits.h>
#include <sys/types.h>
-// Objective C/C++ includes
+// Objective-C/C++ includes
#include <CoreFoundation/CoreFoundation.h>
#include <Foundation/Foundation.h>
#include <mach-o/dyld.h>
diff --git a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp
index 95d2d04..6ebd89a 100644
--- a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp
+++ b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp
@@ -107,7 +107,7 @@
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 270e836..78270d4 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
@@ -84,7 +84,7 @@
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 e3a389d..78afdb0 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
@@ -769,7 +769,7 @@
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 @@
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 31c66fe..1002818 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
@@ -474,7 +474,7 @@
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 @@
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 @@
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 @@
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 98c782c..6438f02 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp
@@ -477,7 +477,7 @@
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 218e6a3..d25e2c6 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
@@ -1089,7 +1089,7 @@
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 98886703..61f63b7 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -1649,7 +1649,7 @@
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 32ed398..a1826a7 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -1465,7 +1465,7 @@
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 4b20c76..bc8b01a 100755
--- a/lldb/www/index.html
+++ b/lldb/www/index.html
@@ -52,14 +52,14 @@
<div class="postcontent">
<p>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 <b>any</b>
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.
<p>The major benefits include:</p>
<ul>
- <li>Up to date language support for C, C++, Objective C</li>
+ <li>Up to date language support for C, C++, Objective-C</li>
<li>Multi-line expressions that can declare local variables and types</li>
<li>Utilize the JIT for expressions when supported</li>
<li>Evaluate expression Intermediate Representation (IR) when JIT can't be used</li>
diff --git a/lldb/www/lldb-gdb.html b/lldb/www/lldb-gdb.html
index 69179bd..8cd387d 100755
--- a/lldb/www/lldb-gdb.html
+++ b/lldb/www/lldb-gdb.html
@@ -380,7 +380,7 @@
</td>
</tr>
- <tr><td class="header" colspan="2">Set a breakpoint at all Objective C methods whose selector is <b>count</b>.</td></tr>
+ <tr><td class="header" colspan="2">Set a breakpoint at all Objective-C methods whose selector is <b>count</b>.</td></tr>
<tr>
<td class="content">
<b>(gdb)</b> break count<br>
diff --git a/lldb/www/status.html b/lldb/www/status.html
index a14e915..09dff8cf2 100755
--- a/lldb/www/status.html
+++ b/lldb/www/status.html
@@ -21,7 +21,7 @@
<div class="postcontent">
<p>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 f3f8025..c351635 100755
--- a/lldb/www/tutorial.html
+++ b/lldb/www/tutorial.html
@@ -109,7 +109,7 @@
<br>(lldb) breakpoint set -M foo
</code>
- <p>To set a breakpoint Objective C selectors named <code>alignLeftEdges:</code> you can enter either of:</p>
+ <p>To set a breakpoint Objective-C selectors named <code>alignLeftEdges:</code> you can enter either of:</p>
<code>
(lldb) breakpoint set --selector alignLeftEdges: