From 1d9bf42009301bee11ebdafb26ca6a0a18240e84 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 31 Jul 2020 09:33:35 -0600 Subject: Update language to comply with Android's inclusive language guidance See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Change-Id: I171bc299e660f96f20041a67a3052bd8a2ed781c --- native/jni/src/dictionary/header/header_policy.cpp | 2 +- native/jni/src/dictionary/header/header_policy.h | 2 +- .../structure/backward/v402/content/probability_dict_content.cpp | 2 +- .../dictionary/structure/backward/v402/content/probability_entry.h | 2 +- .../structure/backward/v402/ver4_patricia_trie_node_writer.cpp | 2 +- .../dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp | 4 ++-- .../structure/pt_common/shortcut/shortcut_list_reading_utils.cpp | 2 +- native/jni/src/dictionary/structure/v4/content/probability_entry.h | 2 +- .../src/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp | 2 +- native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) (limited to 'native') diff --git a/native/jni/src/dictionary/header/header_policy.cpp b/native/jni/src/dictionary/header/header_policy.cpp index d4f84d39f..173cfd982 100644 --- a/native/jni/src/dictionary/header/header_policy.cpp +++ b/native/jni/src/dictionary/header/header_policy.cpp @@ -105,7 +105,7 @@ bool HeaderPolicy::fillInAndWriteHeaderToBuffer(const bool updatesLastDecayedTim &writingPos)) { return false; } - // Temporarily writes a dummy header size. + // Temporarily writes a placeholder header size. int headerSizeFieldPos = writingPos; if (!HeaderReadWriteUtils::writeDictionaryHeaderSize(outBuffer, 0 /* size */, &writingPos)) { diff --git a/native/jni/src/dictionary/header/header_policy.h b/native/jni/src/dictionary/header/header_policy.h index 47cc9196a..1b37575a0 100644 --- a/native/jni/src/dictionary/header/header_policy.h +++ b/native/jni/src/dictionary/header/header_policy.h @@ -97,7 +97,7 @@ class HeaderPolicy : public DictionaryHeaderStructurePolicy { headerPolicy->mForgettingCurveProbabilityValuesTableId), mCodePointTable(headerPolicy->mCodePointTable) {} - // Temporary dummy header. + // Temporary placeholder header. HeaderPolicy() : mDictFormatVersion(FormatUtils::UNKNOWN_VERSION), mDictionaryFlags(0), mSize(0), mAttributeMap(), mLocale(CharUtils::EMPTY_STRING), mMultiWordCostMultiplier(0.0f), diff --git a/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp index b167f0ab2..587a1c097 100644 --- a/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp @@ -69,7 +69,7 @@ bool ProbabilityDictContent::setProbabilityEntry(const int terminalId, // Write new entry. int writingPos = getBuffer()->getTailPosition(); while (writingPos <= entryPos) { - // Fulfilling with dummy entries until writingPos. + // Fulfilling with placeholder entries until writingPos. if (!writeEntry(&dummyEntry, writingPos)) { AKLOGE("Cannot write dummy entry. pos: %d, mSize: %d", writingPos, mSize); return false; diff --git a/native/jni/src/dictionary/structure/backward/v402/content/probability_entry.h b/native/jni/src/dictionary/structure/backward/v402/content/probability_entry.h index 94e36bf51..68176a457 100644 --- a/native/jni/src/dictionary/structure/backward/v402/content/probability_entry.h +++ b/native/jni/src/dictionary/structure/backward/v402/content/probability_entry.h @@ -38,7 +38,7 @@ class ProbabilityEntry { : mFlags(probabilityEntry.mFlags), mProbability(probabilityEntry.mProbability), mHistoricalInfo(probabilityEntry.mHistoricalInfo) {} - // Dummy entry + // Placeholder entry ProbabilityEntry() : mFlags(0), mProbability(NOT_A_PROBABILITY), mHistoricalInfo() {} diff --git a/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp index e3ab5ec20..075dc6d01 100644 --- a/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/ver4_patricia_trie_node_writer.cpp @@ -339,7 +339,7 @@ bool Ver4PatriciaTrieNodeWriter::writePtNodeAndGetTerminalIdAndAdvancePosition( const PtNodeParams *const ptNodeParams, int *const outTerminalId, int *const ptNodeWritingPos) { const int nodePos = *ptNodeWritingPos; - // Write dummy flags. The Node flags are updated with appropriate flags at the last step of the + // Write placeholder flags. The Node flags are updated with appropriate flags at the last step of the // PtNode writing. if (!DynamicPtWritingUtils::writeFlagsAndAdvancePosition(mTrieBuffer, 0 /* nodeFlags */, ptNodeWritingPos)) { diff --git a/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp index b5e2e9dae..1b1be324b 100644 --- a/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp +++ b/native/jni/src/dictionary/structure/pt_common/dynamic_pt_gc_event_listeners.cpp @@ -76,14 +76,14 @@ bool DynamicPtGcEventListeners::TraversePolicyToUpdateBigramProbability return true; } -// Writes dummy PtNode array size when the head of PtNode array is read. +// Writes placeholder PtNode array size when the head of PtNode array is read. bool DynamicPtGcEventListeners::TraversePolicyToPlaceAndWriteValidPtNodesToBuffer ::onDescend(const int ptNodeArrayPos) { mValidPtNodeCount = 0; int writingPos = mBufferToWrite->getTailPosition(); mDictPositionRelocationMap->mPtNodeArrayPositionRelocationMap.insert( PtNodeWriter::PtNodeArrayPositionRelocationMap::value_type(ptNodeArrayPos, writingPos)); - // Writes dummy PtNode array size because arrays can have a forward link or needles PtNodes. + // Writes placeholder PtNode array size because arrays can have a forward link or needles PtNodes. // This field will be updated later in onReadingPtNodeArrayTail() with actual PtNode count. mPtNodeArraySizeFieldPos = writingPos; return DynamicPtWritingUtils::writePtNodeArraySizeAndAdvancePosition( diff --git a/native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp b/native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp index 14428edd4..62ec3d85a 100644 --- a/native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp +++ b/native/jni/src/dictionary/structure/pt_common/shortcut/shortcut_list_reading_utils.cpp @@ -27,7 +27,7 @@ const ShortcutListReadingUtils::ShortcutFlags const ShortcutListReadingUtils::ShortcutFlags ShortcutListReadingUtils::MASK_ATTRIBUTE_PROBABILITY = 0x0F; const int ShortcutListReadingUtils::SHORTCUT_LIST_SIZE_FIELD_SIZE = 2; -// The numeric value of the shortcut probability that means 'whitelist'. +// The numeric value of the shortcut probability that means 'allowlist'. const int ShortcutListReadingUtils::WHITELIST_SHORTCUT_PROBABILITY = 15; /* static */ ShortcutListReadingUtils::ShortcutFlags diff --git a/native/jni/src/dictionary/structure/v4/content/probability_entry.h b/native/jni/src/dictionary/structure/v4/content/probability_entry.h index 473354b90..8dd1fb073 100644 --- a/native/jni/src/dictionary/structure/v4/content/probability_entry.h +++ b/native/jni/src/dictionary/structure/v4/content/probability_entry.h @@ -34,7 +34,7 @@ class ProbabilityEntry { : mFlags(probabilityEntry.mFlags), mProbability(probabilityEntry.mProbability), mHistoricalInfo(probabilityEntry.mHistoricalInfo) {} - // Dummy entry + // Placeholder entry ProbabilityEntry() : mFlags(Ver4DictConstants::FLAG_NOT_A_VALID_ENTRY), mProbability(NOT_A_PROBABILITY), mHistoricalInfo() {} diff --git a/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp index d974b50f4..774bc02c7 100644 --- a/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp +++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_node_writer.cpp @@ -286,7 +286,7 @@ bool Ver4PatriciaTrieNodeWriter::writePtNodeAndGetTerminalIdAndAdvancePosition( const PtNodeParams *const ptNodeParams, int *const outTerminalId, int *const ptNodeWritingPos) { const int nodePos = *ptNodeWritingPos; - // Write dummy flags. The Node flags are updated with appropriate flags at the last step of the + // Write placeholder flags. The Node flags are updated with appropriate flags at the last step of the // PtNode writing. if (!DynamicPtWritingUtils::writeFlagsAndAdvancePosition(mTrieBuffer, 0 /* nodeFlags */, ptNodeWritingPos)) { diff --git a/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h b/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h index e14805e37..3638f3866 100644 --- a/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h +++ b/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h @@ -41,7 +41,7 @@ class BinaryDictionaryShortcutIterator { } // Gets the shortcut target itself as an int string and put it to outTarget, put its length - // to outTargetLength, put whether it is whitelist to outIsWhitelist. + // to outTargetLength, put whether it is allowlist to outIsWhitelist. AK_FORCE_INLINE void nextShortcutTarget( const int maxDepth, int *const outTarget, int *const outTargetLength, bool *const outIsWhitelist) { -- cgit v1.2.3-83-g751a