int fl)
{
// wxCMD_LINE_USAGE_TEXT uses only description, shortName and longName is empty
- #ifdef __WXDEBUG__
if ( k != wxCMD_LINE_USAGE_TEXT )
{
wxASSERT_MSG
wxT("Long option contains invalid characters")
);
}
- #endif // __WXDEBUG__
-
kind = k;
void Check(wxCmdLineParamType WXUNUSED_UNLESS_DEBUG(typ)) const
{
- wxASSERT_MSG( type == typ, _T("type mismatch in wxCmdLineOption") );
+ wxASSERT_MSG( type == typ, wxT("type mismatch in wxCmdLineOption") );
}
double GetDoubleVal() const
{
m_enableLongOptions = true;
#ifdef __UNIX_LIKE__
- m_switchChars = _T("-");
+ m_switchChars = wxT("-");
#else // !Unix
- m_switchChars = _T("/-");
+ m_switchChars = wxT("/-");
#endif
}
break;
default:
- wxFAIL_MSG( _T("unknown command line entry type") );
+ wxFAIL_MSG( wxT("unknown command line entry type") );
// still fall through
case wxCMD_LINE_NONE:
int flags)
{
wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND,
- _T("duplicate switch") );
+ wxT("duplicate switch") );
wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_SWITCH,
shortName, longName, desc,
int flags)
{
wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND,
- _T("duplicate option") );
+ wxT("duplicate option") );
wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_OPTION,
shortName, longName, desc,
{
// 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();
wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE),
- _T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style will be ignored") );
+ wxT("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style will be ignored") );
if ( !(flags & wxCMD_LINE_PARAM_OPTIONAL) )
{
wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL),
- _T("a required parameter can't follow an optional one") );
+ wxT("a required parameter can't follow an optional one") );
}
}
-#endif // Debug
+#endif // wxDEBUG_LEVEL
wxCmdLineParam *param = new wxCmdLineParam(desc, type, flags);
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown switch") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false, wxT("unknown switch") );
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false, wxT("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") );
+ wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") );
*value = opt.GetStrVal();
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false, wxT("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") );
+ wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") );
*value = opt.GetLongVal();
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false, wxT("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") );
+ wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") );
*value = opt.GetDoubleVal();
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false, wxT("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") );
+ wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") );
*value = opt.GetDateVal();
wxString wxCmdLineParser::GetParam(size_t n) const
{
- wxCHECK_MSG( n < GetParamCount(), wxEmptyString, _T("invalid param index") );
+ wxCHECK_MSG( n < GetParamCount(), wxEmptyString, wxT("invalid param index") );
return m_data->m_parameters[n];
}
// special case: "--" should be discarded and all following arguments
// should be considered as parameters, even if they start with '-' and
// not like options (this is POSIX-like)
- if ( arg == _T("--") )
+ if ( arg == wxT("--") )
{
maybeOption = false;
int optInd = wxNOT_FOUND; // init to suppress warnings
// an option or a switch: find whether it's a long or a short one
- if ( arg.length() >= 3 && arg[0u] == _T('-') && arg[1u] == _T('-') )
+ if ( arg.length() >= 3 && arg[0u] == wxT('-') && arg[1u] == wxT('-') )
{
// a long one
isLong = true;
if ( optInd == wxNOT_FOUND )
{
errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str())
- << _T('\n');
+ << wxT('\n');
}
}
else
// Print the argument including leading "--"
name.Prepend( wxT("--") );
errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
- << _T('\n');
+ << wxT('\n');
}
}
// we couldn't find a valid option name in the
// beginning of this string
errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
- << _T('\n');
+ << wxT('\n');
break;
}
m_data->m_arguments.insert
(m_data->m_arguments.begin() + n + 1, arg2);
count++;
+
+ // only leave the part which wasn't extracted into the
+ // next argument in this one
+ arg = arg.Left(len + 1);
}
//else: it's our value, we'll deal with it below
}
if ( p != arg.end() )
{
errorMsg << wxString::Format(_("Unexpected characters following option '%s'."), name.c_str())
- << _T('\n');
+ << wxT('\n');
ok = false;
}
else // no value, as expected
// ... but there is none
errorMsg << wxString::Format(_("Option '%s' requires a value."),
name.c_str())
- << _T('\n');
+ << wxT('\n');
ok = false;
}
{
errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
name.c_str())
- << _T('\n');
+ << wxT('\n');
ok = false;
}
switch ( opt.type )
{
default:
- wxFAIL_MSG( _T("unknown option type") );
+ wxFAIL_MSG( wxT("unknown option type") );
// still fall through
case wxCMD_LINE_VAL_STRING:
{
errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
value.c_str(), name.c_str())
- << _T('\n');
+ << wxT('\n');
ok = false;
}
{
errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
value.c_str(), name.c_str())
- << _T('\n');
+ << wxT('\n');
ok = false;
}
case wxCMD_LINE_VAL_DATE:
{
wxDateTime dt;
- const char *res = dt.ParseDate(value);
- if ( !res || *res )
+ wxString::const_iterator end;
+ if ( !dt.ParseDate(value, &end) || end != value.end() )
{
errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
name.c_str(), value.c_str())
- << _T('\n');
+ << wxT('\n');
ok = false;
}
else
{
wxASSERT_MSG( currentParam == countParam - 1,
- _T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
+ wxT("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
// remember that we did have this last repeatable parameter
hadRepeatableParam = true;
else
{
errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str())
- << _T('\n');
+ << wxT('\n');
ok = false;
}
errorMsg << wxString::Format(_("The value for the option '%s' must be specified."),
optName.c_str())
- << _T('\n');
+ << wxT('\n');
ok = false;
}
{
errorMsg << wxString::Format(_("The required parameter '%s' was not specified."),
param.description.c_str())
- << _T('\n');
+ << wxT('\n');
ok = false;
}
}
else
{
- wxFAIL_MSG( _T("no wxMessageOutput object?") );
+ wxFAIL_MSG( wxT("no wxMessageOutput object?") );
}
}
}
else
{
- wxFAIL_MSG( _T("no wxMessageOutput object?") );
+ wxFAIL_MSG( wxT("no wxMessageOutput object?") );
}
}
if ( !m_data->m_logo.empty() )
{
- usage << m_data->m_logo << _T('\n');
+ usage << m_data->m_logo << wxT('\n');
}
usage << wxString::Format(_("Usage: %s"), appname.c_str());
// the switch char is usually '-' but this can be changed with
// SetSwitchChars() and then the first one of possible chars is used
- wxChar chSwitch = !m_data->m_switchChars ? _T('-')
+ wxChar chSwitch = !m_data->m_switchChars ? wxT('-')
: m_data->m_switchChars[0u];
bool areLongOptionsEnabled = AreLongOptionsEnabled();
if ( opt.kind != wxCMD_LINE_USAGE_TEXT )
{
- usage << _T(' ');
+ usage << wxT(' ');
if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
{
- usage << _T('[');
+ usage << wxT('[');
}
if ( !opt.shortName.empty() )
}
else if ( areLongOptionsEnabled && !opt.longName.empty() )
{
- usage << _T("--") << opt.longName;
+ usage << wxT("--") << opt.longName;
}
else
{
}
else
{
- wxFAIL_MSG( _T("option without neither short nor long name") );
+ wxFAIL_MSG( wxT("option without neither short nor long name") );
}
}
if ( !opt.shortName.empty() )
{
- option << _T(" ") << chSwitch << opt.shortName;
+ option << wxT(" ") << chSwitch << opt.shortName;
}
if ( areLongOptionsEnabled && !opt.longName.empty() )
{
- option << (option.empty() ? _T(" ") : _T(", "))
- << _T("--") << opt.longName;
+ option << (option.empty() ? wxT(" ") : wxT(", "))
+ << wxT("--") << 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;
+ val << wxT('<') << GetTypeName(opt.type) << wxT('>');
+ usage << wxT(' ') << val;
+ option << (!opt.longName ? wxT(':') : wxT('=')) << val;
}
if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
{
- usage << _T(']');
+ usage << wxT(']');
}
}
{
wxCmdLineParam& param = m_data->m_paramDesc[n];
- usage << _T(' ');
+ usage << wxT(' ');
if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
{
- usage << _T('[');
+ usage << wxT('[');
}
usage << param.description;
if ( param.flags & wxCMD_LINE_PARAM_MULTIPLE )
{
- usage << _T("...");
+ usage << wxT("...");
}
if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
{
- usage << _T(']');
+ usage << wxT(']');
}
}
- usage << _T('\n');
+ usage << wxT('\n');
// set to number of our own options, not counting the standard ones
count = namesOptions.size();
for ( n = 0; n < namesOptions.size(); n++ )
{
if ( n == count )
- usage << _T('\n') << stdDesc;
+ usage << wxT('\n') << stdDesc;
len = namesOptions[n].length();
// desc contains text if name is empty
if (len == 0)
{
- usage << descOptions[n] << _T('\n');
+ usage << descOptions[n] << wxT('\n');
}
else
{
usage << namesOptions[n]
- << wxString(_T(' '), lenMax - len) << _T('\t')
+ << wxString(wxT(' '), lenMax - len) << wxT('\t')
<< descOptions[n]
- << _T('\n');
+ << wxT('\n');
}
}
switch ( type )
{
default:
- wxFAIL_MSG( _T("unknown option type") );
+ wxFAIL_MSG( wxT("unknown option type") );
// still fall through
case wxCMD_LINE_VAL_STRING:
break;
}
- lastBS = ch == '\\';
+ lastBS = !lastBS && ch == '\\';
}
else // type == wxCMD_LINE_SPLIT_UNIX
{
projects / wxWidgets.git / blobdiff