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
+ 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")
+ );
+ }
kind = k;
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
{ 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)
private:
bool m_hasVal;
+ double m_doubleVal;
long m_longVal;
wxString m_strVal;
#if wxUSE_DATETIME
m_data->m_enableLongOptions = enable;
}
-bool wxCmdLineParser::AreLongOptionsEnabled()
+bool wxCmdLineParser::AreLongOptionsEnabled() const
{
return m_data->m_enableLongOptions;
}
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
{
// do some consistency checks: a required parameter can't follow an
// optional one and nothing should follow a parameter with MULTIPLE flag
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL
if ( !m_data->m_paramDesc.IsEmpty() )
{
wxCmdLineParam& param = m_data->m_paramDesc.Last();
_T("a required parameter can't follow an optional one") );
}
}
-#endif // Debug
+#endif // wxDEBUG_LEVEL
wxCmdLineParam *param = new wxCmdLineParam(desc, type, flags);
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
// ----------------------------------------------------------------------------
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
{
}
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 )
{
}
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());
- if ( !res || *res )
+ wxString::const_iterator end;
+ if ( !dt.ParseDate(value) || end != value.end() )
{
errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
name.c_str(), value.c_str())
// give the usage message
// ----------------------------------------------------------------------------
-void wxCmdLineParser::Usage()
+void wxCmdLineParser::Usage() const
{
wxMessageOutput* msgOut = wxMessageOutput::Get();
if ( msgOut )
}
}
-wxString wxCmdLineParser::GetUsageString()
+wxString wxCmdLineParser::GetUsageString() const
{
wxString appname;
if ( m_data->m_arguments.empty() )
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);
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;
s = _("num");
break;
+ case wxCMD_LINE_VAL_DOUBLE:
+ s = _("double");
+ break;
+
case wxCMD_LINE_VAL_DATE:
s = _("date");
break;
*/
/* static */
-wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxString& cmdline)
+wxArrayString
+wxCmdLineParser::ConvertStringToArgs(const wxString& cmdline,
+ wxCmdLineSplitType type)
{
wxArrayString args;
wxString arg;
arg.reserve(1024);
- 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++ )
+ bool lastBS = false,
+ isInsideQuotes = false;
+ wxChar chDelim = '\0';
+ for ( arg.clear(); p != end; ++p )
{
- switch ( (*p).GetValue() )
+ const wxChar ch = *p;
+
+ if ( type == wxCMD_LINE_SPLIT_DOS )
{
- case _T('"'):
+ if ( ch == '"' )
+ {
if ( !lastBS )
{
isInsideQuotes = !isInsideQuotes;
//else: quote has no special meaning but the backslash
// still remains -- makes no sense but this is what
// Windows does
+ }
+ // note that backslash does *not* quote the space, only quotes do
+ else if ( !isInsideQuotes && (ch == ' ' || ch == '\t') )
+ {
+ ++p; // skip this space anyhow
break;
+ }
- case _T(' '):
- case _T('\t'):
- // backslash does *not* quote the space, only quotes do
+ lastBS = !lastBS && ch == '\\';
+ }
+ else // type == wxCMD_LINE_SPLIT_UNIX
+ {
+ if ( !lastBS )
+ {
if ( isInsideQuotes )
{
- // skip assignment below
- break;
+ if ( ch == chDelim )
+ {
+ isInsideQuotes = false;
+
+ continue; // don't use the quote itself
+ }
}
- // fall through
+ else // not in quotes and not escaped
+ {
+ if ( ch == '\'' || ch == '"' )
+ {
+ isInsideQuotes = true;
+ chDelim = ch;
- case _T('\0'):
- endParam = true;
+ continue; // don't use the quote itself
+ }
- break;
- }
+ if ( ch == ' ' || ch == '\t' )
+ {
+ ++p; // skip this space anyhow
+ break;
+ }
+ }
- if ( endParam )
- {
- break;
+ lastBS = ch == '\\';
+ if ( lastBS )
+ continue;
+ }
+ else // escaped by backslash, just use as is
+ {
+ lastBS = false;
+ }
}
- lastBS = *p == _T('\\');
-
- arg += *p;
+ arg += ch;
}
args.push_back(arg);
projects / wxWidgets.git / blobdiff