Done

Author: BHK4321

inflection/src/inflection/dialog/InflectableStringConcept-c.cpp

@@ -2,15 +2,18 @@
  * Copyright 2021-2024 Apple Inc. All rights reserved.
  */
 #include <inflection/dialog/InflectableStringConcept.h>
-
+#include <inflection/npc.hpp>
 #include <inflection/dialog/InflectableStringConcept.hpp>
 #include <inflection/dialog/SemanticFeatureConcept.h>
 #include <inflection/exception/ClassCastException.hpp>
 #include <inflection/util/ULocale.hpp>
 #include <inflection/dialog/SemanticFeature.hpp>
+#include <inflection/dialog/SemanticUtils.hpp>
+#include <inflection/dialog/SemanticFeatureModel.hpp>
 #include <inflection/util/TypeConversionUtils.hpp>
 #include <inflection/util/Validate.hpp>
 
+
 INFLECTION_CAPI IDSemanticFeatureConcept* iinf_toSemanticFeatureConcept(IDInflectableStringConcept* thisObject, UErrorCode*)
 {
     return (IDSemanticFeatureConcept*)thisObject;
@@ -49,21 +52,16 @@ iinf_create(const IDSemanticFeatureModel* model, const IDSpeakableString* value,
 }
 
 INFLECTION_CAPI IDInflectableStringConcept*
-iinf_createWithConstraints(const IDSemanticFeatureModel* model, const IDSpeakableString* value, 
-                           const ::inflection::dialog::SemanticFeature* features, const char16_t** values, int32_t SemanticFeaturesLen, UErrorCode* status) {
+iinf_createWithDefaults(const IDSemanticFeatureModel* model, const IDSpeakableString* value, 
+                           const IDDisplayValue_Constraint* defaultConstraints, int32_t defaultConstraintsLen, UErrorCode* status) {
     if (status != nullptr && U_SUCCESS(*status)) {
         try {
-            inflection::util::Validate::notNull(value);
-
-            ::std::map< ::inflection::dialog::SemanticFeature, ::std::u16string> initialConstraints;
-            for (int32_t i = 0; i < SemanticFeaturesLen; ++i) {
-                initialConstraints.emplace(features[i], ::std::u16string(values[i]));
-            }
+            auto defaultConstraintsMap(inflection::dialog::SemanticUtils::to_constraintMap(*npc((const inflection::dialog::SemanticFeatureModel*)model), defaultConstraints, defaultConstraintsLen));
 
             return (IDInflectableStringConcept*) new ::inflection::dialog::InflectableStringConcept(
                 (const ::inflection::dialog::SemanticFeatureModel*)model,
                 *((const ::inflection::dialog::SpeakableString*)value),
-                initialConstraints
+                defaultConstraintsMap
             );
         }
         catch (const ::std::exception& e) {

inflection/src/inflection/dialog/InflectableStringConcept.h

@@ -6,7 +6,7 @@
 #include <inflection/dialog/SpeakableString.h>
 #include <inflection/dialog/SemanticFeatureConcept.h>
 #include <inflection/dialog/SemanticFeatureModel.h>
-#include <inflection/dialog/SemanticFeature.hpp>
+#include <inflection/dialog/SemanticUtils.hpp>
 /**
  * An object that provides a way to format a word with additional grammatical category values or semantic features of a word for a given language.
  */
@@ -39,15 +39,14 @@ INFLECTION_CAPI IDInflectableStringConcept* iinf_create(const IDSemanticFeatureM
  *
  * @param model - The semantic feature model required to initialize the concept.
  * @param value - The speakable string to convert to a concept
- * @param features - The initial semantic features to apply to the concept
- * @param values - The initial corresponding values for the semantic features
- * @param SemanticFeaturesLen - The number of semantic features and values provided
+ * @param defaultConstraints - The initial defaultConstraints to apply to the concept
+ * @param defaultConstraintsLen - The number of semantic features and values provided
  * @param status Must be a valid pointer to an error code value,
  *        which must not indicate a failure before the function call.
  *        This is set to a failure when a failure has occurred during execution.
  */
-INFLECTION_CAPI IDInflectableStringConcept* iinf_createWithConstraints(const IDSemanticFeatureModel* model, const IDSpeakableString* value, 
-                                                                       const inflection::dialog::SemanticFeature* features, const char16_t** values, int32_t SemanticFeaturesLen, UErrorCode* status);
+INFLECTION_CAPI IDInflectableStringConcept* iinf_createWithDefaults(const IDSemanticFeatureModel* model, const IDSpeakableString* value, 
+                                                                        const IDDisplayValue_Constraint* defaultConstraints, int32_t defaultConstraintsLen, UErrorCode* status);
 /**
  * Destructor
  */

inflection/src/inflection/dialog/PronounConcept.cpp

@@ -211,6 +211,7 @@ PronounConcept::PronounConcept(const SemanticFeatureModel& model, const ::std::v
     if (pronounData->numValues() == 0) {
         throw ::inflection::exception::IllegalArgumentException(u"Display data can not be empty.");
     }
+    
     for (const auto &[semanticFeature, grammeme]: defaultConstraints) {
         this->defaultConstraints.emplace(semanticFeature.getName(), grammeme);
     }