Skip to content
This repository was archived by the owner on May 21, 2019. It is now read-only.

Commit 11563a3

Browse files
committedJun 13, 2018
Fix/unify the spelling of Objective-C.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@334614 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 8da3f41 commit 11563a3

File tree

19 files changed

+25
-25
lines changed

19 files changed

+25
-25
lines changed
 

‎CODE_OWNERS.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ D: Build scripts, Test suite, Platform, gdb-remote, Anything not covered by this
1717
N: Jim Ingham
1818
E: jingham@apple.com
1919
D: Overall LLDB architecture, Thread plans, Expression parser, ValueObject, Breakpoints, ABI
20-
D: Watchpoints, Trampolines, Target, Command Interpreter, C++ / Objective C Language runtime
20+
D: Watchpoints, Trampolines, Target, Command Interpreter, C++ / Objective-C Language runtime
2121
D: Expression evaluator, IR interpreter, Clang integration
2222
D: Data Formatters
2323

‎examples/darwin/heap_find/heap/heap_find.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ class ObjCClassInfo {
410410
m_sort_type = eSortTypeBytes;
411411
}
412412
if (print && m_size > 0) {
413-
puts("Objective C objects by total bytes:");
413+
puts("Objective-C objects by total bytes:");
414414
puts("Total Bytes Class Name");
415415
puts("----------- "
416416
"-----------------------------------------------------------------");
@@ -427,7 +427,7 @@ class ObjCClassInfo {
427427
m_sort_type = eSortTypeCount;
428428
}
429429
if (print && m_size > 0) {
430-
puts("Objective C objects by total count:");
430+
puts("Objective-C objects by total count:");
431431
puts("Count Class Name");
432432
puts("-------- "
433433
"-----------------------------------------------------------------");

‎include/lldb/lldb-enumerations.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ enum SectionType {
626626
eSectionTypeDebug,
627627
eSectionTypeZeroFill,
628628
eSectionTypeDataObjCMessageRefs, // Pointer to function pointer + selector
629-
eSectionTypeDataObjCCFStrings, // Objective C const CFString/NSString objects
629+
eSectionTypeDataObjCCFStrings, // Objective-C const CFString/NSString objects
630630
eSectionTypeDWARFDebugAbbrev,
631631
eSectionTypeDWARFDebugAddr,
632632
eSectionTypeDWARFDebugAranges,

‎packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class TestObjCBreakpoints(TestBase):
2222
mydir = TestBase.compute_mydir(__file__)
2323

2424
def test_break(self):
25-
"""Test setting Objective C specific breakpoints (DWARF in .o files)."""
25+
"""Test setting Objective-C specific breakpoints (DWARF in .o files)."""
2626
self.build()
2727
self.setTearDownCleanup()
2828
self.check_objc_breakpoints(False)

‎packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ int main()
3232
struct things_to_sum tts = { 2, 3, 4 };
3333
int ret = [summer sumThings:tts];
3434
NSRect rect = {{0, 0}, {10, 20}};
35-
// The Objective C V1 runtime won't read types from metadata so we need
35+
// The Objective-C V1 runtime won't read types from metadata so we need
3636
// NSValue in our debug info to use it in our test.
3737
NSValue *v = [NSValue valueWithRect:rect];
3838
return rect.origin.x; // Set breakpoint here.

‎source/Commands/CommandObjectBreakpoint.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ static OptionDefinition g_breakpoint_set_options[] = {
283283
{ 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 "
284284
"functions. Can be repeated multiple times." },
285285
{ 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 "
286-
"namespaces and all arguments, and for Objective C this means a full function "
286+
"namespaces and all arguments, and for Objective-C this means a full function "
287287
"prototype with class and selector. Can be repeated multiple times to make "
288288
"one breakpoint for multiple names." },
289289
{ 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 "

‎source/Host/macosx/objcxx/HostInfoMacOSX.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <sys/syslimits.h>
3232
#include <sys/types.h>
3333

34-
// Objective C/C++ includes
34+
// Objective-C/C++ includes
3535
#include <CoreFoundation/CoreFoundation.h>
3636
#include <Foundation/Foundation.h>
3737
#include <mach-o/dyld.h>

‎source/Plugins/Language/ObjC/ObjCLanguage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ bool ObjCLanguage::MethodName::SetName(llvm::StringRef name, bool strict) {
107107

108108
if (valid_prefix) {
109109
int name_len = name.size();
110-
// Objective C methods must have at least:
110+
// Objective-C methods must have at least:
111111
// "-[" or "+[" prefix
112112
// One character for a class name
113113
// One character for the space between the class name

‎source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ AppleObjCRuntimeV1::CreateInstance(Process *process,
8484

8585
void AppleObjCRuntimeV1::Initialize() {
8686
PluginManager::RegisterPlugin(
87-
GetPluginNameStatic(), "Apple Objective C Language Runtime - Version 1",
87+
GetPluginNameStatic(), "Apple Objective-C Language Runtime - Version 1",
8888
CreateInstance);
8989
}
9090

‎source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ class CommandObjectMultiwordObjC : public CommandObjectMultiword {
769769

770770
void AppleObjCRuntimeV2::Initialize() {
771771
PluginManager::RegisterPlugin(
772-
GetPluginNameStatic(), "Apple Objective C Language Runtime - Version 2",
772+
GetPluginNameStatic(), "Apple Objective-C Language Runtime - Version 2",
773773
CreateInstance,
774774
[](CommandInterpreter &interpreter) -> lldb::CommandObjectSP {
775775
return CommandObjectSP(new CommandObjectMultiwordObjC(interpreter));
@@ -1785,7 +1785,7 @@ void AppleObjCRuntimeV2::UpdateISAToDescriptorMapIfNeeded() {
17851785
DescriptorMapUpdateResult dynamic_update_result =
17861786
UpdateISAToDescriptorMapDynamic(hash_table);
17871787

1788-
// Now get the objc classes that are baked into the Objective C runtime in
1788+
// Now get the objc classes that are baked into the Objective-C runtime in
17891789
// the shared cache, but only once per process as this data never changes
17901790
if (!m_loaded_objc_opt) {
17911791
// it is legitimately possible for the shared cache to be empty - in that

‎source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ TypeSP DWARFASTParserClang::ParseTypeFromDWARF(const SymbolContext &sc,
474474
if (log)
475475
dwarf->GetObjectFile()->GetModule()->LogMessage(
476476
log, "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' "
477-
"is Objective C 'id' built-in type.",
477+
"is Objective-C 'id' built-in type.",
478478
die.GetOffset(), die.GetTagAsCString(), die.GetName());
479479
clang_type = m_ast.GetBasicType(eBasicTypeObjCID);
480480
encoding_data_type = Type::eEncodingIsUID;
@@ -485,7 +485,7 @@ TypeSP DWARFASTParserClang::ParseTypeFromDWARF(const SymbolContext &sc,
485485
if (log)
486486
dwarf->GetObjectFile()->GetModule()->LogMessage(
487487
log, "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' "
488-
"is Objective C 'Class' built-in type.",
488+
"is Objective-C 'Class' built-in type.",
489489
die.GetOffset(), die.GetTagAsCString(), die.GetName());
490490
clang_type = m_ast.GetBasicType(eBasicTypeObjCClass);
491491
encoding_data_type = Type::eEncodingIsUID;
@@ -495,7 +495,7 @@ TypeSP DWARFASTParserClang::ParseTypeFromDWARF(const SymbolContext &sc,
495495
if (log)
496496
dwarf->GetObjectFile()->GetModule()->LogMessage(
497497
log, "SymbolFileDWARF::ParseType (die = 0x%8.8x) %s '%s' "
498-
"is Objective C 'selector' built-in type.",
498+
"is Objective-C 'selector' built-in type.",
499499
die.GetOffset(), die.GetTagAsCString(), die.GetName());
500500
clang_type = m_ast.GetBasicType(eBasicTypeObjCSel);
501501
encoding_data_type = Type::eEncodingIsUID;
@@ -3515,7 +3515,7 @@ size_t DWARFASTParserClang::ParseChildParameters(
35153515
skip = true;
35163516
} else {
35173517

3518-
// HACK: Objective C formal parameters "self" and "_cmd"
3518+
// HACK: Objective-C formal parameters "self" and "_cmd"
35193519
// are not marked as artificial in the DWARF...
35203520
CompileUnit *comp_unit = die.GetLLDBCompileUnit();
35213521
if (comp_unit) {

‎source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ void ManualDWARFIndex::Dump(Stream &s) {
477477
m_set.function_methods.Dump(&s);
478478
s.Printf("\nFunction selectors:\n");
479479
m_set.function_selectors.Dump(&s);
480-
s.Printf("\nObjective C class selectors:\n");
480+
s.Printf("\nObjective-C class selectors:\n");
481481
m_set.objc_class_selectors.Dump(&s);
482482
s.Printf("\nGlobals and statics:\n");
483483
m_set.globals.Dump(&s);

‎source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ bool SymbolFileDWARFDebugMap::Supports_DW_AT_APPLE_objc_complete_type(
10891089
TypeSP SymbolFileDWARFDebugMap::FindCompleteObjCDefinitionTypeForDIE(
10901090
const DWARFDIE &die, const ConstString &type_name,
10911091
bool must_be_implementation) {
1092-
// If we have a debug map, we will have an Objective C symbol whose name is
1092+
// If we have a debug map, we will have an Objective-C symbol whose name is
10931093
// the type name and whose type is eSymbolTypeObjCClass. If we can find that
10941094
// symbol and find its containing parent, we can locate the .o file that will
10951095
// contain the implementation definition since it will be scoped inside the

‎source/Symbol/ClangASTContext.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ bool ClangASTContext::RecordHasFields(const RecordDecl *record_decl) {
16491649
return false;
16501650
}
16511651

1652-
#pragma mark Objective C Classes
1652+
#pragma mark Objective-C Classes
16531653

16541654
CompilerType ClangASTContext::CreateObjCClass(const char *name,
16551655
DeclContext *decl_ctx,

‎source/Target/Process.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1465,7 +1465,7 @@ void Process::UpdateThreadListIfNeeded() {
14651465
old_thread_list.GetThreadAtIndex(i, false)->ClearBackingThread();
14661466

14671467
// Turn off dynamic types to ensure we don't run any expressions.
1468-
// Objective C can run an expression to determine if a SBValue is a
1468+
// Objective-C can run an expression to determine if a SBValue is a
14691469
// dynamic type or not and we need to avoid this. OperatingSystem
14701470
// plug-ins can't run expressions that require running code...
14711471

‎www/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ <h1 class ="postheader">Compiler Integration Benefits</h1>
5252
<div class="postcontent">
5353
<p>LLDB currently converts debug information into clang types so that
5454
it can leverage the clang compiler infrastructure.
55-
This allows LLDB to support the latest C, C++, Objective C and Objective C++
55+
This allows LLDB to support the latest C, C++, Objective-C and Objective-C++
5656
language features and runtimes in expressions without having to reimplement <b>any</b>
5757
of this functionality. It also leverages the compiler to take care of all ABI
5858
details when making functions calls for expressions, when disassembling
5959
instructions and extracting instruction details, and much more.
6060
<p>The major benefits include:</p>
6161
<ul>
62-
<li>Up to date language support for C, C++, Objective C</li>
62+
<li>Up to date language support for C, C++, Objective-C</li>
6363
<li>Multi-line expressions that can declare local variables and types</li>
6464
<li>Utilize the JIT for expressions when supported</li>
6565
<li>Evaluate expression Intermediate Representation (IR) when JIT can't be used</li>

‎www/lldb-gdb.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ <h1 class ="postheader">Breakpoint Commands</h1>
380380
</td>
381381
</tr>
382382

383-
<tr><td class="header" colspan="2">Set a breakpoint at all Objective C methods whose selector is <b>count</b>.</td></tr>
383+
<tr><td class="header" colspan="2">Set a breakpoint at all Objective-C methods whose selector is <b>count</b>.</td></tr>
384384
<tr>
385385
<td class="content">
386386
<b>(gdb)</b> break count<br>

‎www/status.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h1 class ="postheader">Mac OS X Status</h1>
2121
<div class="postcontent">
2222

2323
<p>LLDB has matured a lot in the last year and can be used for
24-
C, C++ and Objective C development for x86_64, i386 and ARM debugging.
24+
C, C++ and Objective-C development for x86_64, i386 and ARM debugging.
2525
The entire public API is exposed though a framework on Mac OS X which
2626
is used by Xcode, the lldb command line tool, and can also be used by
2727
Python. The entire public API is exposed through script bridging which

‎www/tutorial.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ <h1 class ="postheader">Command Structure</h1>
109109
<br>(lldb) breakpoint set -M foo
110110
</code>
111111

112-
<p>To set a breakpoint Objective C selectors named <code>alignLeftEdges:</code> you can enter either of:</p>
112+
<p>To set a breakpoint Objective-C selectors named <code>alignLeftEdges:</code> you can enter either of:</p>
113113

114114
<code>
115115
(lldb) breakpoint set --selector alignLeftEdges:

0 commit comments

Comments
 (0)
This repository has been archived.