projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made all bitmaps 16x16
[wxWidgets.git]
/
src
/
common
/
cmdline.cpp
diff --git
a/src/common/cmdline.cpp
b/src/common/cmdline.cpp
index 5372eb26cd538c5cd33f42f941ed638fd36df016..6a07dfb1a7b13362f33aa6e480f20b8bc8e05ca1 100644
(file)
--- a/
src/common/cmdline.cpp
+++ b/
src/common/cmdline.cpp
@@
-1,5
+1,5
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name: common/cmdline.cpp
+// Name:
src/
common/cmdline.cpp
// Purpose: wxCmdLineParser implementation
// Author: Vadim Zeitlin
// Modified by:
// Purpose: wxCmdLineParser implementation
// Author: Vadim Zeitlin
// Modified by:
@@
-24,18
+24,18
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#include "wx/cmdline.h"
-
-#if wxUSE_CMDLINE_PARSER
-
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
+ #include "wx/dynarray.h"
#include "wx/string.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/app.h"
#include "wx/string.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/app.h"
- #include "wx/dynarray.h"
#endif //WX_PRECOMP
#endif //WX_PRECOMP
+#include "wx/cmdline.h"
+
+#if wxUSE_CMDLINE_PARSER
+
#include <ctype.h>
#include "wx/datetime.h"
#include <ctype.h>
#include "wx/datetime.h"
@@
-120,7
+120,7
@@
struct wxCmdLineOption
void SetStrVal(const wxString& val)
{ Check(wxCMD_LINE_VAL_STRING); m_strVal = val; m_hasVal = true; }
#if wxUSE_DATETIME
void SetStrVal(const wxString& val)
{ Check(wxCMD_LINE_VAL_STRING); m_strVal = val; m_hasVal = true; }
#if wxUSE_DATETIME
- void SetDateVal(const wxDateTime val)
+ void SetDateVal(const wxDateTime
&
val)
{ Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = true; }
#endif // wxUSE_DATETIME
{ Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = true; }
#endif // wxUSE_DATETIME
@@
-166,8
+166,8
@@
WX_DECLARE_OBJARRAY(wxCmdLineParam, wxArrayParams);
#include "wx/arrimpl.cpp"
#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxArrayOptions)
;
-WX_DEFINE_OBJARRAY(wxArrayParams)
;
+WX_DEFINE_OBJARRAY(wxArrayOptions)
+WX_DEFINE_OBJARRAY(wxArrayParams)
// the parser internal state
struct wxCmdLineParserData
// the parser internal state
struct wxCmdLineParserData
@@
-241,7
+241,10
@@
void wxCmdLineParserData::SetArguments(const wxString& cmdLine)
{
m_arguments.clear();
{
m_arguments.clear();
- m_arguments.push_back(wxTheApp ? wxTheApp->argv[0] : _T(""));
+ if(wxTheApp && wxTheApp->argc > 0)
+ m_arguments.push_back(wxTheApp->argv[0]);
+ else
+ m_arguments.push_back(wxEmptyString);
wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
@@
-592,7
+595,8
@@
int wxCmdLineParser::Parse(bool showUsage)
optInd = m_data->FindOptionByLongName(name);
if ( optInd == wxNOT_FOUND )
{
optInd = m_data->FindOptionByLongName(name);
if ( optInd == wxNOT_FOUND )
{
- errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str()) << wxT("\n");
+ errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str())
+ << _T('\n');
}
}
else
}
}
else
@@
-601,11
+605,12
@@
int wxCmdLineParser::Parse(bool showUsage)
// Print the argument including leading "--"
name.Prepend( wxT("--") );
// Print the argument including leading "--"
name.Prepend( wxT("--") );
- errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str()) << wxT("\n");
+ errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
+ << _T('\n');
}
}
}
}
- else
+ else
// not a long option
{
isLong = false;
{
isLong = false;
@@
-622,7
+627,8
@@
int wxCmdLineParser::Parse(bool showUsage)
{
// we couldn't find a valid option name in the
// beginning of this string
{
// we couldn't find a valid option name in the
// beginning of this string
- errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str()) << wxT("\n");
+ errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
+ << _T('\n');
break;
}
break;
}
@@
-669,38
+675,51
@@
int wxCmdLineParser::Parse(bool showUsage)
continue; // will break, in fact
}
continue; // will break, in fact
}
+ // look at what follows:
+
+ // +1 for leading '-'
+ const wxChar *p = arg.c_str() + 1 + name.length();
+ if ( isLong )
+ p++; // for another leading '-'
+
wxCmdLineOption& opt = m_data->m_options[(size_t)optInd];
if ( opt.kind == wxCMD_LINE_SWITCH )
{
wxCmdLineOption& opt = m_data->m_options[(size_t)optInd];
if ( opt.kind == wxCMD_LINE_SWITCH )
{
- // nothing more to do
- opt.SetHasValue();
-
- if ( opt.flags & wxCMD_LINE_OPTION_HELP )
+ // we must check that there is no value following the switch
+ if ( *p != _T('\0') )
{
{
- helpRequested = true;
-
- // it's not an error, but we still stop here
+ errorMsg << wxString::Format(_("Unexpected characters following option '%s'."), name.c_str())
+ << _T('\n');
ok = false;
}
ok = false;
}
+ else // no value, as expected
+ {
+ // nothing more to do
+ opt.SetHasValue();
+
+ if ( opt.flags & wxCMD_LINE_OPTION_HELP )
+ {
+ helpRequested = true;
+
+ // it's not an error, but we still stop here
+ ok = false;
+ }
+ }
}
}
- else
+ else
// it's an option. not a switch
{
// get the value
{
// get the value
-
- // +1 for leading '-'
- const wxChar *p = arg.c_str() + 1 + name.length();
if ( isLong )
{
if ( isLong )
{
- p++; // for another leading '-'
-
if ( *p++ != _T('=') )
{
if ( *p++ != _T('=') )
{
- errorMsg << wxString::Format(_("Option '%s' requires a value, '=' expected."), name.c_str()) << wxT("\n");
+ errorMsg << wxString::Format(_("Option '%s' requires a value, '=' expected."), name.c_str())
+ << _T('\n');
ok = false;
}
}
ok = false;
}
}
- else
+ else
// short option
{
switch ( *p )
{
{
switch ( *p )
{
@@
-716,7
+735,8
@@
int wxCmdLineParser::Parse(bool showUsage)
{
// ... but there is none
errorMsg << wxString::Format(_("Option '%s' requires a value."),
{
// ... but there is none
errorMsg << wxString::Format(_("Option '%s' requires a value."),
- name.c_str()) << wxT("\n");
+ name.c_str())
+ << _T('\n');
ok = false;
}
ok = false;
}
@@
-733,7
+753,8
@@
int wxCmdLineParser::Parse(bool showUsage)
if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
{
errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
{
errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
- name.c_str()) << wxT("\n");
+ name.c_str())
+ << _T('\n');
ok = false;
}
ok = false;
}
@@
-763,7
+784,8
@@
int wxCmdLineParser::Parse(bool showUsage)
else
{
errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
else
{
errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
- value.c_str(), name.c_str()) << wxT("\n");
+ value.c_str(), name.c_str())
+ << _T('\n');
ok = false;
}
ok = false;
}
@@
-778,7
+800,8
@@
int wxCmdLineParser::Parse(bool showUsage)
if ( !res || *res )
{
errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
if ( !res || *res )
{
errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
- name.c_str(), value.c_str()) << wxT("\n");
+ name.c_str(), value.c_str())
+ << _T('\n');
ok = false;
}
ok = false;
}
@@
-793,9
+816,8
@@
int wxCmdLineParser::Parse(bool showUsage)
}
}
}
}
}
}
- else
+ else
// not an option, must be a parameter
{
{
- // a parameter
if ( currentParam < countParam )
{
wxCmdLineParam& param = m_data->m_paramDesc[currentParam];
if ( currentParam < countParam )
{
wxCmdLineParam& param = m_data->m_paramDesc[currentParam];
@@
-819,7
+841,8
@@
int wxCmdLineParser::Parse(bool showUsage)
}
else
{
}
else
{
- errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str()) << wxT("\n");
+ errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str())
+ << _T('\n');
ok = false;
}
ok = false;
}
@@
-856,7
+879,8
@@
int wxCmdLineParser::Parse(bool showUsage)
}
errorMsg << wxString::Format(_("The value for the option '%s' must be specified."),
}
errorMsg << wxString::Format(_("The value for the option '%s' must be specified."),
- optName.c_str()) << wxT("\n");
+ optName.c_str())
+ << _T('\n');
ok = false;
}
ok = false;
}
@@
-877,7
+901,8
@@
int wxCmdLineParser::Parse(bool showUsage)
if ( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL) )
{
errorMsg << wxString::Format(_("The required parameter '%s' was not specified."),
if ( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL) )
{
errorMsg << wxString::Format(_("The required parameter '%s' was not specified."),
- param.description.c_str()) << wxT("\n");
+ param.description.c_str())
+ << _T('\n');
ok = false;
}
ok = false;
}
@@
-979,7
+1004,7
@@
wxString wxCmdLineParser::GetUsageString()
if (!opt.longName.empty())
{
wxFAIL_MSG( wxT("option with only a long name while long ")
if (!opt.longName.empty())
{
wxFAIL_MSG( wxT("option with only a long name while long ")
- wxT("options are disabled") );
+
wxT("options are disabled") );
}
else
{
}
else
{
@@
-1220,4
+1245,3
@@
wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxChar *p)
return args;
}
return args;
}
-