diff options
Diffstat (limited to 'source/Interpreter/OptionValueEnumeration.cpp')
| -rw-r--r-- | source/Interpreter/OptionValueEnumeration.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/Interpreter/OptionValueEnumeration.cpp b/source/Interpreter/OptionValueEnumeration.cpp index dbaeb185fa3a..0f163d1c4f74 100644 --- a/source/Interpreter/OptionValueEnumeration.cpp +++ b/source/Interpreter/OptionValueEnumeration.cpp @@ -55,7 +55,7 @@ OptionValueEnumeration::DumpValue (const ExecutionContext *exe_ctx, Stream &strm } Error -OptionValueEnumeration::SetValueFromCString (const char *value, VarSetOperationType op) +OptionValueEnumeration::SetValueFromString (llvm::StringRef value, VarSetOperationType op) { Error error; switch (op) @@ -67,9 +67,8 @@ OptionValueEnumeration::SetValueFromCString (const char *value, VarSetOperationT case eVarSetOperationReplace: case eVarSetOperationAssign: - if (value && value[0]) { - ConstString const_enumerator_name(value); + ConstString const_enumerator_name(value.trim()); const EnumerationMapEntry *enumerator_entry = m_enumerations.FindFirstValueForName (const_enumerator_name.GetCString()); if (enumerator_entry) { @@ -79,7 +78,7 @@ OptionValueEnumeration::SetValueFromCString (const char *value, VarSetOperationT else { StreamString error_strm; - error_strm.Printf("invalid enumeration value '%s'", value); + error_strm.Printf("invalid enumeration value '%s'", value.str().c_str()); const size_t count = m_enumerations.GetSize (); if (count) { @@ -91,19 +90,15 @@ OptionValueEnumeration::SetValueFromCString (const char *value, VarSetOperationT } error.SetErrorString(error_strm.GetData()); } + break; } - else - { - error.SetErrorString("invalid enumeration value"); - } - break; case eVarSetOperationInsertBefore: case eVarSetOperationInsertAfter: case eVarSetOperationRemove: case eVarSetOperationAppend: case eVarSetOperationInvalid: - error = OptionValue::SetValueFromCString (value, op); + error = OptionValue::SetValueFromString (value, op); break; } return error; |