X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49751a58f046d7c37f1a4661ed4bb604d11ae38d..d7ad5a0289b22d16a67b9fc2efe1a721e4a5a1ae:/src/common/cmdline.cpp?ds=sidebyside diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp index c5956e2310..f055522190 100644 --- a/src/common/cmdline.cpp +++ b/src/common/cmdline.cpp @@ -73,20 +73,29 @@ struct wxCmdLineOption wxCmdLineParamType typ, int fl) { - wxASSERT_MSG( !shrt.empty() || !lng.empty(), - _T("option should have at least one name") ); - - wxASSERT_MSG - ( - GetShortOptionName(shrt.begin(), shrt.end()).Len() == shrt.Len(), - wxT("Short option contains invalid characters") - ); - - wxASSERT_MSG - ( - GetLongOptionName(lng.begin(), lng.end()).Len() == lng.Len(), - wxT("Long option contains invalid characters") - ); + // wxCMD_LINE_USAGE_TEXT uses only description, shortName and longName is empty + #ifdef __WXDEBUG__ + if ( k != wxCMD_LINE_USAGE_TEXT ) + { + wxASSERT_MSG + ( + !shrt.empty() || !lng.empty(), + wxT("option should have at least one name") + ); + + wxASSERT_MSG + ( + GetShortOptionName(shrt.begin(), shrt.end()).Len() == shrt.Len(), + wxT("Short option contains invalid characters") + ); + + wxASSERT_MSG + ( + GetLongOptionName(lng.begin(), lng.end()).Len() == lng.Len(), + wxT("Long option contains invalid characters") + ); + } + #endif // __WXDEBUG__ kind = k; @@ -111,6 +120,8 @@ struct wxCmdLineOption wxASSERT_MSG( type == typ, _T("type mismatch in wxCmdLineOption") ); } + double GetDoubleVal() const + { Check(wxCMD_LINE_VAL_DOUBLE); return m_doubleVal; } long GetLongVal() const { Check(wxCMD_LINE_VAL_NUMBER); return m_longVal; } const wxString& GetStrVal() const @@ -120,6 +131,8 @@ struct wxCmdLineOption { Check(wxCMD_LINE_VAL_DATE); return m_dateVal; } #endif // wxUSE_DATETIME + void SetDoubleVal(double val) + { Check(wxCMD_LINE_VAL_DOUBLE); m_doubleVal = val; m_hasVal = true; } void SetLongVal(long val) { Check(wxCMD_LINE_VAL_NUMBER); m_longVal = val; m_hasVal = true; } void SetStrVal(const wxString& val) @@ -143,6 +156,7 @@ public: private: bool m_hasVal; + double m_doubleVal; long m_longVal; wxString m_strVal; #if wxUSE_DATETIME @@ -348,7 +362,7 @@ void wxCmdLineParser::EnableLongOptions(bool enable) m_data->m_enableLongOptions = enable; } -bool wxCmdLineParser::AreLongOptionsEnabled() +bool wxCmdLineParser::AreLongOptionsEnabled() const { return m_data->m_enableLongOptions; } @@ -385,6 +399,10 @@ void wxCmdLineParser::SetDesc(const wxCmdLineEntryDesc *desc) desc->type, desc->flags); break; + case wxCMD_LINE_USAGE_TEXT: + AddUsageText(wxGetTranslation(desc->description)); + break; + default: wxFAIL_MSG( _T("unknown command line entry type") ); // still fall through @@ -453,6 +471,17 @@ void wxCmdLineParser::AddParam(const wxString& desc, m_data->m_paramDesc.Add(param); } +void wxCmdLineParser::AddUsageText(const wxString& text) +{ + wxASSERT_MSG( !text.empty(), wxT("text can't be empty") ); + + wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_USAGE_TEXT, + wxEmptyString, wxEmptyString, + text, wxCMD_LINE_VAL_NONE, 0); + + m_data->m_options.Add(option); +} + // ---------------------------------------------------------------------------- // access to parse command line // ---------------------------------------------------------------------------- @@ -510,6 +539,25 @@ bool wxCmdLineParser::Found(const wxString& name, long *value) const return true; } +bool wxCmdLineParser::Found(const wxString& name, double *value) const +{ + int i = m_data->FindOption(name); + if ( i == wxNOT_FOUND ) + i = m_data->FindOptionByLongName(name); + + wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") ); + + wxCmdLineOption& opt = m_data->m_options[(size_t)i]; + if ( !opt.HasValue() ) + return false; + + wxCHECK_MSG( value, false, _T("NULL pointer in wxCmdLineOption::Found") ); + + *value = opt.GetDoubleVal(); + + return true; +} + #if wxUSE_DATETIME bool wxCmdLineParser::Found(const wxString& name, wxDateTime *value) const { @@ -731,15 +779,15 @@ int wxCmdLineParser::Parse(bool showUsage) } else // it's an option. not a switch { - switch ( (*p).GetValue() ) + switch ( p == end ? '\0' : (*p).GetValue() ) { - case _T('='): - case _T(':'): + case '=': + case ':': // the value follows ++p; break; - case 0: + case '\0': // the value is in the next argument if ( ++n == count ) { @@ -802,12 +850,29 @@ int wxCmdLineParser::Parse(bool showUsage) } break; + case wxCMD_LINE_VAL_DOUBLE: + { + double val; + if ( value.ToDouble(&val) ) + { + opt.SetDoubleVal(val); + } + else + { + errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."), + value.c_str(), name.c_str()) + << _T('\n'); + + ok = false; + } + } + break; + #if wxUSE_DATETIME case wxCMD_LINE_VAL_DATE: { wxDateTime dt; - // FIXME-UTF8: ParseDate API will need changes - const wxChar *res = dt.ParseDate(value.c_str()); + const char *res = dt.ParseDate(value); if ( !res || *res ) { errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."), @@ -946,7 +1011,7 @@ int wxCmdLineParser::Parse(bool showUsage) // give the usage message // ---------------------------------------------------------------------------- -void wxCmdLineParser::Usage() +void wxCmdLineParser::Usage() const { wxMessageOutput* msgOut = wxMessageOutput::Get(); if ( msgOut ) @@ -959,7 +1024,7 @@ void wxCmdLineParser::Usage() } } -wxString wxCmdLineParser::GetUsageString() +wxString wxCmdLineParser::GetUsageString() const { wxString appname; if ( m_data->m_arguments.empty() ) @@ -995,58 +1060,60 @@ wxString wxCmdLineParser::GetUsageString() for ( n = 0; n < count; n++ ) { wxCmdLineOption& opt = m_data->m_options[n]; + wxString option; - usage << _T(' '); - if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) ) + if ( opt.kind != wxCMD_LINE_USAGE_TEXT ) { - usage << _T('['); - } + usage << _T(' '); + if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) ) + { + usage << _T('['); + } - if ( !opt.shortName.empty() ) - { - usage << chSwitch << opt.shortName; - } - else if ( areLongOptionsEnabled && !opt.longName.empty() ) - { - usage << _T("--") << opt.longName; - } - else - { - if (!opt.longName.empty()) + if ( !opt.shortName.empty() ) { - wxFAIL_MSG( wxT("option with only a long name while long ") - wxT("options are disabled") ); + usage << chSwitch << opt.shortName; + } + else if ( areLongOptionsEnabled && !opt.longName.empty() ) + { + usage << _T("--") << opt.longName; } else { - wxFAIL_MSG( _T("option without neither short nor long name") ); + if (!opt.longName.empty()) + { + wxFAIL_MSG( wxT("option with only a long name while long ") + wxT("options are disabled") ); + } + else + { + wxFAIL_MSG( _T("option without neither short nor long name") ); + } } - } - - wxString option; - if ( !opt.shortName.empty() ) - { - option << _T(" ") << chSwitch << opt.shortName; - } + if ( !opt.shortName.empty() ) + { + option << _T(" ") << chSwitch << opt.shortName; + } - if ( areLongOptionsEnabled && !opt.longName.empty() ) - { - option << (option.empty() ? _T(" ") : _T(", ")) - << _T("--") << opt.longName; - } + if ( areLongOptionsEnabled && !opt.longName.empty() ) + { + option << (option.empty() ? _T(" ") : _T(", ")) + << _T("--") << opt.longName; + } - if ( opt.kind != wxCMD_LINE_SWITCH ) - { - wxString val; - val << _T('<') << GetTypeName(opt.type) << _T('>'); - usage << _T(' ') << val; - option << (!opt.longName ? _T(':') : _T('=')) << val; - } + if ( opt.kind != wxCMD_LINE_SWITCH ) + { + wxString val; + val << _T('<') << GetTypeName(opt.type) << _T('>'); + usage << _T(' ') << val; + option << (!opt.longName ? _T(':') : _T('=')) << val; + } - if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) ) - { - usage << _T(']'); + if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) ) + { + usage << _T(']'); + } } namesOptions.push_back(option); @@ -1103,10 +1170,18 @@ wxString wxCmdLineParser::GetUsageString() usage << _T('\n') << stdDesc; len = namesOptions[n].length(); - usage << namesOptions[n] - << wxString(_T(' '), lenMax - len) << _T('\t') - << descOptions[n] - << _T('\n'); + // desc contains text if name is empty + if (len == 0) + { + usage << descOptions[n] << _T('\n'); + } + else + { + usage << namesOptions[n] + << wxString(_T(' '), lenMax - len) << _T('\t') + << descOptions[n] + << _T('\n'); + } } return usage; @@ -1133,6 +1208,10 @@ static wxString GetTypeName(wxCmdLineParamType type) s = _("num"); break; + case wxCMD_LINE_VAL_DOUBLE: + s = _("double"); + break; + case wxCMD_LINE_VAL_DATE: s = _("date"); break; @@ -1210,62 +1289,47 @@ wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxString& cmdline) bool isInsideQuotes = false; + const wxString::const_iterator end = cmdline.end(); wxString::const_iterator p = cmdline.begin(); for ( ;; ) { // skip white space - while ( p != cmdline.end() && (*p == _T(' ') || *p == _T('\t')) ) + while ( p != end && (*p == ' ' || *p == '\t') ) ++p; // anything left? - if ( p == cmdline.end() ) + if ( p == end ) break; // parse this parameter - bool endParam = false; bool lastBS = false; - for ( arg.clear(); !endParam; p++ ) + for ( arg.clear(); p != end; ++p ) { - switch ( (*p).GetValue() ) + const wxChar ch = *p; + if ( ch == '"' ) { - case _T('"'): - if ( !lastBS ) - { - isInsideQuotes = !isInsideQuotes; - - // don't put quote in arg - continue; - } - //else: quote has no special meaning but the backslash - // still remains -- makes no sense but this is what - // Windows does - break; - - case _T(' '): - case _T('\t'): - // backslash does *not* quote the space, only quotes do - if ( isInsideQuotes ) - { - // skip assignment below - break; - } - // fall through - - case _T('\0'): - endParam = true; + if ( !lastBS ) + { + isInsideQuotes = !isInsideQuotes; - break; + // don't put quote in arg + continue; + } + //else: quote has no special meaning but the backslash + // still remains -- makes no sense but this is what + // Windows does } - - if ( endParam ) + // note that backslash does *not* quote the space, only quotes do + else if ( !isInsideQuotes && (ch == ' ' || ch == '\t') ) { + ++p; // skip this space anyhow break; } - lastBS = *p == _T('\\'); + lastBS = ch == '\\'; - arg += *p; + arg += ch; } args.push_back(arg);