#pragma hdrstop
#endif
+#if wxUSE_CMDLINE_PARSER
+
#ifndef WX_PRECOMP
#include "wx/string.h"
#include "wx/log.h"
#include "wx/filefn.h"
#endif //WX_PRECOMP
+#include <ctype.h>
+
#include "wx/datetime.h"
#include "wx/cmdline.h"
wxCmdLineParamType typ,
int fl)
{
+ wxASSERT_MSG( !shrt.empty() || !lng.empty(),
+ _T("option should have at least one name") );
+
kind = k;
shortName = shrt;
// types increases, so always use the accessor functions and don't access
// the fields directly!)
- void Check(wxCmdLineParamType typ) const
+ void Check(wxCmdLineParamType WXUNUSED_UNLESS_DEBUG(typ)) const
{
wxASSERT_MSG( type == typ, _T("type mismatch in wxCmdLineOption") );
}
void SetDateVal(const wxDateTime val)
{ Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = TRUE; }
- void SetHasValue() { m_hasVal = TRUE; }
+ void SetHasValue(bool hasValue = TRUE) { m_hasVal = hasValue; }
bool HasValue() const { return m_hasVal; }
public:
// methods
wxCmdLineParserData();
- void SetArguments(int argc, char **argv);
+ void SetArguments(int argc, wxChar **argv);
void SetArguments(const wxString& cmdline);
int FindOption(const wxString& name);
#endif
}
-void wxCmdLineParserData::SetArguments(int argc, char **argv)
+void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
{
m_arguments.Empty();
}
}
-void wxCmdLineParserData::SetArguments(const wxString& cmdline)
+void wxCmdLineParserData::SetArguments(const wxString& cmdLine)
{
- // either use wxMSW wxApp::ConvertToStandardCommandArgs() or move its logic
- // here and use this method from it - but don't duplicate the code
+ m_arguments.Empty();
+
+ m_arguments.Add(wxTheApp->GetAppName());
+
+ // Break up string
+ // Treat strings enclosed in double-quotes as single arguments
+ int i = 0;
+ int len = cmdLine.Length();
+ while (i < len)
+ {
+ // Skip whitespace
+ while ((i < len) && wxIsspace(cmdLine.GetChar(i)))
+ i ++;
- wxFAIL_MSG(_T("TODO"));
+ if (i < len)
+ {
+ if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string
+ {
+ i ++;
+ int first = i;
+ while ((i < len) && (cmdLine.GetChar(i) != wxT('"')))
+ i ++;
+
+ wxString arg(cmdLine.Mid(first, (i - first)));
+
+ m_arguments.Add(arg);
+
+ if (i < len)
+ i ++; // Skip past 2nd quote
+ }
+ else // Unquoted argument
+ {
+ int first = i;
+ while ((i < len) && !wxIsspace(cmdLine.GetChar(i)))
+ i ++;
+
+ wxString arg(cmdLine.Mid(first, (i - first)));
+
+ m_arguments.Add(arg);
+ }
+ }
+ }
}
int wxCmdLineParserData::FindOption(const wxString& name)
{
- size_t count = m_options.GetCount();
- for ( size_t n = 0; n < count; n++ )
+ if ( !name.empty() )
{
- if ( m_options[n].shortName == name )
+ size_t count = m_options.GetCount();
+ for ( size_t n = 0; n < count; n++ )
{
- // found
- return n;
+ if ( m_options[n].shortName == name )
+ {
+ // found
+ return n;
+ }
}
}
m_data = new wxCmdLineParserData;
}
-void wxCmdLineParser::SetCmdLine(int argc, char **argv)
+void wxCmdLineParser::SetCmdLine(int argc, wxChar **argv)
{
m_data->SetArguments(argc, argv);
}
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") );
+ _T("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") );
+ _T("a required parameter can't follow an optional one") );
}
}
#endif // Debug
bool wxCmdLineParser::Found(const wxString& name) const
{
int i = m_data->FindOption(name);
+ if ( i == wxNOT_FOUND )
+ i = m_data->FindOptionByLongName(name);
+
wxCHECK_MSG( i != wxNOT_FOUND, FALSE, _T("unknown switch") );
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
bool wxCmdLineParser::Found(const wxString& name, wxString *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];
bool wxCmdLineParser::Found(const wxString& name, long *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];
bool wxCmdLineParser::Found(const wxString& name, wxDateTime *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];
return m_data->m_parameters[n];
}
+// Resets switches and options
+void wxCmdLineParser::Reset()
+{
+ for ( size_t i = 0; i < m_data->m_options.Count(); i++ )
+ {
+ wxCmdLineOption& opt = m_data->m_options[i];
+ opt.SetHasValue(FALSE);
+ }
+}
+
+
// ----------------------------------------------------------------------------
// the real work is done here
// ----------------------------------------------------------------------------
size_t countParam = m_data->m_paramDesc.GetCount();
+ Reset();
+
// parse everything
wxString arg;
size_t count = m_data->m_arguments.GetCount();
isLong = TRUE;
const wxChar *p = arg.c_str() + 2;
- while ( wxIsalpha(*p) || (*p == _T('-')) )
+ while ( wxIsalnum(*p) || (*p == _T('_')) || (*p == _T('-')) )
{
name += *p++;
}
// a short one: as they can be cumulated, we try to find the
// longest substring which is a valid option
const wxChar *p = arg.c_str() + 1;
- while ( wxIsalpha(*p) )
+ while ( wxIsalnum(*p) || (*p == _T('_')) )
{
name += *p++;
}
if ( *p++ != _T('=') )
{
- wxLogError(_("Option '%s' requires a value, '=' "
- "expected."), name.c_str());
+ wxLogError(_("Option '%s' requires a value, '=' expected."), name.c_str());
ok = FALSE;
}
{
switch ( *p )
{
+ case _T('='):
case _T(':'):
// the value follows
p++;
break;
default:
- // the value is right here
- ;
+ // the value is right here: this may be legal or
+ // not depending on the option style
+ if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
+ {
+ wxLogError(_("Separator expected after the option '%s'."),
+ name.c_str());
+
+ ok = FALSE;
+ }
}
}
}
else
{
- wxLogError(_("'%s' is not a correct "
- "numeric value for option "
- "'%s'."),
+ wxLogError(_("'%s' is not a correct numeric value for option '%s'."),
value.c_str(), name.c_str());
ok = FALSE;
const wxChar *res = dt.ParseDate(value);
if ( !res || *res )
{
- wxLogError(_("Option '%s': '%s' cannot "
- "be converted to a date."),
+ wxLogError(_("Option '%s': '%s' cannot be converted to a date."),
name.c_str(), value.c_str());
ok = FALSE;
else
{
wxASSERT_MSG( currentParam == countParam - 1,
- _T("all parameters after the one with "
- "wxCMD_LINE_PARAM_MULTIPLE style "
- "are ignored") );
+ _T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
// remember that we did have this last repeatable parameter
hadRepeatableParam = TRUE;
wxStripExtension(appname);
}
- wxString brief, detailed;
+ // we construct the brief cmd line desc on the fly, but not the detailed
+ // help message below because we want to align the options descriptions
+ // and for this we must first know the longest one of them
+ wxString brief;
+ wxArrayString namesOptions, descOptions;
brief.Printf(_("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('-')
+ : m_data->m_switchChars[0u];
+
size_t n, count = m_data->m_options.GetCount();
for ( n = 0; n < count; n++ )
{
brief << _T('[');
}
- brief << _T('-') << opt.shortName;
- detailed << _T(" -") << opt.shortName;
+ brief << chSwitch << opt.shortName;
+
+ wxString option;
+ option << _T(" ") << chSwitch << opt.shortName;
if ( !!opt.longName )
{
- detailed << _T(" --") << opt.longName;
+ option << _T(" --") << opt.longName;
}
if ( opt.kind != wxCMD_LINE_SWITCH )
wxString val;
val << _T('<') << GetTypeName(opt.type) << _T('>');
brief << _T(' ') << val;
- detailed << (!opt.longName ? _T(':') : _T('=')) << val;
+ option << (!opt.longName ? _T(':') : _T('=')) << val;
}
if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
brief << _T(']');
}
- detailed << _T('\t') << opt.description << _T('\n');
+ namesOptions.Add(option);
+ descOptions.Add(opt.description);
}
count = m_data->m_paramDesc.GetCount();
}
wxLogMessage(brief);
+
+ // now construct the detailed help message
+ size_t len, lenMax = 0;
+ count = namesOptions.GetCount();
+ for ( n = 0; n < count; n++ )
+ {
+ len = namesOptions[n].length();
+ if ( len > lenMax )
+ lenMax = len;
+ }
+
+ wxString detailed;
+ for ( n = 0; n < count; n++ )
+ {
+ len = namesOptions[n].length();
+ detailed << namesOptions[n]
+ << wxString(_T(' '), lenMax - len) << _T('\t')
+ << descOptions[n]
+ << _T('\n');
+ }
+
wxLogMessage(detailed);
}
return s;
}
+
+#endif // wxUSE_CMDLINE_PARSER
projects / wxWidgets.git / blobdiff