Inflection 134 Use std::unique_ptr to avoid delete (#162)

FrankYFTang · web-flow · commit b3178d3bdb26 · 2025-07-22T16:29:36.000-07:00
* Use std::unique_ptr to avoid delete

* Remove change to warm up code

* Make destructor public instead of adding friend
diff --git a/inflection/src/inflection/dialog/CommonConceptFactoryImpl.cpp b/inflection/src/inflection/dialog/CommonConceptFactoryImpl.cpp
@@ -210,10 +210,9 @@ SpeakableString* CommonConceptFactoryImpl::quantify(const NumberConcept& number,
 {
     ::std::unique_ptr<SpeakableString> formattedNumber;
     if (semanticFeatureForNumberConcept != nullptr) {
-        auto speakableFeatureValue = npc(semanticConcept)->getFeatureValue(*npc(semanticFeatureForNumberConcept));
-        if (speakableFeatureValue != nullptr) {
-            auto rulename = semanticFeatureToNumberConceptName.find(npc(speakableFeatureValue)->getPrint());
-            delete speakableFeatureValue;
+        ::std::unique_ptr<SpeakableString> speakableFeatureValue(npc(semanticConcept)->getFeatureValue(*npc(semanticFeatureForNumberConcept)));
+        if (speakableFeatureValue.get() != nullptr) {
+            auto rulename = semanticFeatureToNumberConceptName.find(speakableFeatureValue->getPrint());
             if (rulename != semanticFeatureToNumberConceptName.end()) {
                 formattedNumber.reset(new SpeakableString(number.asSpokenWords(rulename->second)));
             }
diff --git a/inflection/src/inflection/dialog/DefinitenessDisplayFunction.cpp b/inflection/src/inflection/dialog/DefinitenessDisplayFunction.cpp
@@ -79,13 +79,13 @@ int32_t DefinitenessDisplayFunction::getArticlePrefixLength(DisplayValue* origin
 DisplayValue*
 DefinitenessDisplayFunction::replaceDisplayValue(DisplayValue* originalDisplayValue, const SpeakableString& string) const
 {
-    auto displayValueConstraints(npc(originalDisplayValue)->getConstraintMap());
+    ::std::unique_ptr<DisplayValue> value(npc(originalDisplayValue));
+    auto displayValueConstraints(value->getConstraintMap());
     if (!string.speakEqualsPrint()) {
         displayValueConstraints[*npc(speakFeature)] = string.getSpeak();
     }
-    auto newValue = new DisplayValue(string.getPrint(), displayValueConstraints);
-    delete originalDisplayValue;
-    return newValue;
+    value.reset(new DisplayValue(string.getPrint(), displayValueConstraints));
+    return value.release();
 }
 
 DisplayValue*
diff --git a/inflection/src/inflection/dialog/SemanticConceptList.cpp b/inflection/src/inflection/dialog/SemanticConceptList.cpp
@@ -126,12 +126,11 @@ std::u16string SemanticConceptList::toString() const
         if (previousConcept != nullptr) {
             displayValue += comma;
         }
-        auto conceptResult = npc(conceptObj)->toSpeakableString();
-        if (conceptResult != nullptr) {
-            displayValue += *npc(conceptResult);
+        ::std::unique_ptr<::inflection::dialog::SpeakableString> conceptResult(npc(conceptObj)->toSpeakableString());
+        if (conceptResult.get() != nullptr) {
+            displayValue += *conceptResult;
         }
         previousConcept = conceptObj;
-        delete conceptResult;
     }
     return u"[" + displayValue.getPrint() + u"]";
 }
diff --git a/inflection/src/inflection/dictionary/DictionaryMetaData_MMappedDictionary.cpp b/inflection/src/inflection/dictionary/DictionaryMetaData_MMappedDictionary.cpp
@@ -45,8 +45,6 @@ DictionaryMetaData_MMappedDictionary::DictionaryMetaData_MMappedDictionary(::inf
 
 DictionaryMetaData_MMappedDictionary::~DictionaryMetaData_MMappedDictionary()
 {
-    delete inflector;
-    delete memoryMappedRegion;
 }
 
 const ::inflection::util::ULocale& DictionaryMetaData_MMappedDictionary::getLocale() const
@@ -189,11 +187,11 @@ bool DictionaryMetaData_MMappedDictionary::getWordPropertyValues(::std::vector<:
         return true;
     }
 
-    const bool useInflectionTrieForKeys = (inflector != nullptr) && (propertyNameIdentifier == inflectionKeyIdentifier);
+    const bool useInflectionTrieForKeys = (inflector.get() != nullptr) && (propertyNameIdentifier == inflectionKeyIdentifier);
 
     for (const auto propertyIdentifier: propertyIdentifiers) {
         npc(result)->emplace_back(useInflectionTrieForKeys
-                ? npc(inflector)->mmappedDictionary.identifierToInflectionPatternTrie.getKey(propertyIdentifier)
+                ? inflector->mmappedDictionary.identifierToInflectionPatternTrie.getKey(propertyIdentifier)
                 : propertyValuesStringContainer.getString(propertyIdentifier));
     }
 
diff --git a/inflection/src/inflection/dictionary/DictionaryMetaData_MMappedDictionary.hpp b/inflection/src/inflection/dictionary/DictionaryMetaData_MMappedDictionary.hpp
@@ -70,8 +70,8 @@ class INFLECTION_INTERNAL_API inflection::dictionary::DictionaryMetaData_MMapped
     ::inflection::dictionary::metadata::StringArrayContainer propertyNameToKeyId {  };
     ::inflection::dictionary::metadata::StringContainer propertyValuesStringContainer {  };
     ::inflection::dictionary::metadata::CompressedArray<int32_t> propertyValueMaps {::std::vector<int32_t>()};
-    ::inflection::dictionary::Inflector* inflector {  };
-    ::inflection::util::MemoryMappedFile* memoryMappedRegion {  };
+    ::std::unique_ptr<::inflection::dictionary::Inflector> inflector {  };
+    ::std::unique_ptr<::inflection::util::MemoryMappedFile> memoryMappedRegion {  };
     int32_t inflectionKeyIdentifier { -1 };
     int32_t bitsPropertyValueMapKeyMask {  };
     int32_t bitsPropertyValueMapKeySize {  };
diff --git a/inflection/src/inflection/dictionary/Inflector.cpp b/inflection/src/inflection/dictionary/Inflector.cpp
@@ -13,7 +13,7 @@
 namespace inflection::dictionary {
 
 const Inflector& Inflector::getInflector(const ::inflection::util::ULocale &locale) {
-    const Inflector* result = npc(DictionaryMetaData::createDictionary(locale))->dictionary->inflector;
+    const Inflector* result = npc(DictionaryMetaData::createDictionary(locale))->dictionary->inflector.get();
     if (result == nullptr) {
         throw ::inflection::exception::NullPointerException(inflection::util::StringViewUtils::to_u16string("Inflector not found for " + locale.getName()));
     }
diff --git a/inflection/src/inflection/dictionary/Inflector.hpp b/inflection/src/inflection/dictionary/Inflector.hpp
@@ -33,6 +33,7 @@ class inflection::dictionary::Inflector
 private:
     explicit Inflector(inflection::util::MemoryMappedFile& memoryMappedFile, const ::std::u16string& sourcePath, const ::inflection::dictionary::DictionaryMetaData_MMappedDictionary &dictionary);
 
+public:
     ~Inflector() override;
 
 private:
diff --git a/inflection/src/inflection/lang/StringFilterUtil.cpp b/inflection/src/inflection/lang/StringFilterUtil.cpp
@@ -117,18 +117,18 @@ static ::std::map<const ::icu4cxx::UnicodeSet*, const ::icu4cxx::UnicodeSet*>* S
     return setSingletons_;
 }
 
-const icu4cxx::UnicodeSet* StringFilterUtil::getSetSingleton(::icu4cxx::UnicodeSet* set)
+const icu4cxx::UnicodeSet* StringFilterUtil::getSetSingleton(::icu4cxx::UnicodeSet* input)
 {
     // TODO: this code probably doesn't work that well anymore. We should check the caching again.
     auto setSingletons = SET_SINGLETONS();
     const icu4cxx::UnicodeSet* singleton;
-    auto singletonCache = npc(setSingletons)->find(set);
+    ::std::unique_ptr<::icu4cxx::UnicodeSet> set(input);
+    auto singletonCache = npc(setSingletons)->find(set.get());
     if (singletonCache == npc(setSingletons)->end()) {
-        singleton = ::inflection::util::UnicodeSetUtils::freeze(set);
+        singleton = ::inflection::util::UnicodeSetUtils::freeze(set.release());
         npc(setSingletons)->emplace(singleton, singleton);
     }
     else {
-        delete set;
         singleton = singletonCache->second;
     }
     return singleton;

Original file line number	Diff line number	Diff line change
`@@ -210,10 +210,9 @@ SpeakableString* CommonConceptFactoryImpl::quantify(const NumberConcept& number,`
`210`	`210`	`{`
`211`	`211`	`::std::unique_ptr<SpeakableString> formattedNumber;`
`212`	`212`	`if (semanticFeatureForNumberConcept != nullptr) {`
`213`		`- auto speakableFeatureValue = npc(semanticConcept)->getFeatureValue(*npc(semanticFeatureForNumberConcept));`
`214`		`- if (speakableFeatureValue != nullptr) {`
`215`		`- auto rulename = semanticFeatureToNumberConceptName.find(npc(speakableFeatureValue)->getPrint());`
`216`		`- delete speakableFeatureValue;`
	`213`	`+ ::std::unique_ptr<SpeakableString> speakableFeatureValue(npc(semanticConcept)->getFeatureValue(*npc(semanticFeatureForNumberConcept)));`
	`214`	`+ if (speakableFeatureValue.get() != nullptr) {`
	`215`	`+ auto rulename = semanticFeatureToNumberConceptName.find(speakableFeatureValue->getPrint());`
`217`	`216`	`if (rulename != semanticFeatureToNumberConceptName.end()) {`
`218`	`217`	`formattedNumber.reset(new SpeakableString(number.asSpokenWords(rulename->second)));`
`219`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,13 +79,13 @@ int32_t DefinitenessDisplayFunction::getArticlePrefixLength(DisplayValue* origin`
`79`	`79`	`DisplayValue*`
`80`	`80`	`DefinitenessDisplayFunction::replaceDisplayValue(DisplayValue* originalDisplayValue, const SpeakableString& string) const`
`81`	`81`	`{`
`82`		`- auto displayValueConstraints(npc(originalDisplayValue)->getConstraintMap());`
	`82`	`+ ::std::unique_ptr<DisplayValue> value(npc(originalDisplayValue));`
	`83`	`+ auto displayValueConstraints(value->getConstraintMap());`
`83`	`84`	`if (!string.speakEqualsPrint()) {`
`84`	`85`	`displayValueConstraints[*npc(speakFeature)] = string.getSpeak();`
`85`	`86`	`}`
`86`		`- auto newValue = new DisplayValue(string.getPrint(), displayValueConstraints);`
`87`		`- delete originalDisplayValue;`
`88`		`- return newValue;`
	`87`	`+ value.reset(new DisplayValue(string.getPrint(), displayValueConstraints));`
	`88`	`+ return value.release();`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`DisplayValue*`
Original file line number	Diff line number	Diff line change
`@@ -126,12 +126,11 @@ std::u16string SemanticConceptList::toString() const`
`126`	`126`	`if (previousConcept != nullptr) {`
`127`	`127`	`displayValue += comma;`
`128`	`128`	`}`
`129`		`- auto conceptResult = npc(conceptObj)->toSpeakableString();`
`130`		`- if (conceptResult != nullptr) {`
`131`		`- displayValue += *npc(conceptResult);`
	`129`	`+ ::std::unique_ptr<::inflection::dialog::SpeakableString> conceptResult(npc(conceptObj)->toSpeakableString());`
	`130`	`+ if (conceptResult.get() != nullptr) {`
	`131`	`+ displayValue += *conceptResult;`
`132`	`132`	`}`
`133`	`133`	`previousConcept = conceptObj;`
`134`		`- delete conceptResult;`
`135`	`134`	`}`
`136`	`135`	`return u"[" + displayValue.getPrint() + u"]";`
`137`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,6 @@ DictionaryMetaData_MMappedDictionary::DictionaryMetaData_MMappedDictionary(::inf`
`45`	`45`
`46`	`46`	`DictionaryMetaData_MMappedDictionary::~DictionaryMetaData_MMappedDictionary()`
`47`	`47`	`{`
`48`		`- delete inflector;`
`49`		`- delete memoryMappedRegion;`
`50`	`48`	`}`
`51`	`49`
`52`	`50`	`const ::inflection::util::ULocale& DictionaryMetaData_MMappedDictionary::getLocale() const`
`@@ -189,11 +187,11 @@ bool DictionaryMetaData_MMappedDictionary::getWordPropertyValues(::std::vector<:`
`189`	`187`	`return true;`
`190`	`188`	`}`
`191`	`189`
`192`		`- const bool useInflectionTrieForKeys = (inflector != nullptr) && (propertyNameIdentifier == inflectionKeyIdentifier);`
	`190`	`+ const bool useInflectionTrieForKeys = (inflector.get() != nullptr) && (propertyNameIdentifier == inflectionKeyIdentifier);`
`193`	`191`
`194`	`192`	`for (const auto propertyIdentifier: propertyIdentifiers) {`
`195`	`193`	`npc(result)->emplace_back(useInflectionTrieForKeys`
`196`		`- ? npc(inflector)->mmappedDictionary.identifierToInflectionPatternTrie.getKey(propertyIdentifier)`
	`194`	`+ ? inflector->mmappedDictionary.identifierToInflectionPatternTrie.getKey(propertyIdentifier)`
`197`	`195`	`: propertyValuesStringContainer.getString(propertyIdentifier));`
`198`	`196`	`}`
`199`	`197`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`namespace inflection::dictionary {`
`14`	`14`
`15`	`15`	`const Inflector& Inflector::getInflector(const ::inflection::util::ULocale &locale) {`
`16`		`- const Inflector* result = npc(DictionaryMetaData::createDictionary(locale))->dictionary->inflector;`
	`16`	`+ const Inflector* result = npc(DictionaryMetaData::createDictionary(locale))->dictionary->inflector.get();`
`17`	`17`	`if (result == nullptr) {`
`18`	`18`	`throw ::inflection::exception::NullPointerException(inflection::util::StringViewUtils::to_u16string("Inflector not found for " + locale.getName()));`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,18 +117,18 @@ static ::std::map<const ::icu4cxx::UnicodeSet, const ::icu4cxx::UnicodeSet>* S`
`117`	`117`	`return setSingletons_;`
`118`	`118`	`}`
`119`	`119`
`120`		`-const icu4cxx::UnicodeSet* StringFilterUtil::getSetSingleton(::icu4cxx::UnicodeSet* set)`
	`120`	`+const icu4cxx::UnicodeSet* StringFilterUtil::getSetSingleton(::icu4cxx::UnicodeSet* input)`
`121`	`121`	`{`
`122`	`122`	`// TODO: this code probably doesn't work that well anymore. We should check the caching again.`
`123`	`123`	`auto setSingletons = SET_SINGLETONS();`
`124`	`124`	`const icu4cxx::UnicodeSet* singleton;`
`125`		`- auto singletonCache = npc(setSingletons)->find(set);`
	`125`	`+ ::std::unique_ptr<::icu4cxx::UnicodeSet> set(input);`
	`126`	`+ auto singletonCache = npc(setSingletons)->find(set.get());`
`126`	`127`	`if (singletonCache == npc(setSingletons)->end()) {`
`127`		`- singleton = ::inflection::util::UnicodeSetUtils::freeze(set);`
	`128`	`+ singleton = ::inflection::util::UnicodeSetUtils::freeze(set.release());`
`128`	`129`	`npc(setSingletons)->emplace(singleton, singleton);`
`129`	`130`	`}`
`130`	`131`	`else {`
`131`		`- delete set;`
`132`	`132`	`singleton = singletonCache->second;`
`133`	`133`	`}`
`134`	`134`	`return singleton;`