Rework the wxCusor ctor taking wx stock number to provide as many cursors as

[wxWidgets.git] / src / common / cmdline.cpp

diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp
index 1ca7d85a4fd7d5eb7c012be192ed90a3ee3cd351..88d22ca1848ced79f051eec0e2a943cc288cac1f 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,23 +24,24 @@
     #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 "wx/msgout.h"
 #include "wx/filename.h"
 #include <ctype.h>
 
 #include "wx/datetime.h"
 #include "wx/msgout.h"
 #include "wx/filename.h"

+#include "wx/apptrait.h"

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions


@@ -48,11 +49,15 @@
 
 static wxString GetTypeName(wxCmdLineParamType type);
 
 
 static wxString GetTypeName(wxCmdLineParamType type);
 

-static wxString GetOptionName(const wxChar *p, const wxChar *allowedChars);
+static wxString GetOptionName(wxString::const_iterator p,
+                              wxString::const_iterator end,
+                              const wxChar *allowedChars);

 
 

-static wxString GetShortOptionName(const wxChar *p);
+static wxString GetShortOptionName(wxString::const_iterator p,
+                                   wxString::const_iterator end);

 
 

-static wxString GetLongOptionName(const wxChar *p);
+static wxString GetLongOptionName(wxString::const_iterator p,
+                                  wxString::const_iterator end);

 
 // ----------------------------------------------------------------------------
 // private structs
 
 // ----------------------------------------------------------------------------
 // private structs


@@ -72,16 +77,16 @@ struct wxCmdLineOption
                       _T("option should have at least one name") );
 
         wxASSERT_MSG
                       _T("option should have at least one name") );
 
         wxASSERT_MSG

-            (
-                GetShortOptionName(shrt).Len() == shrt.Len(),
-                wxT("Short option contains invalid characters")
-            );
+        (
+            GetShortOptionName(shrt.begin(), shrt.end()).Len() == shrt.Len(),
+            wxT("Short option contains invalid characters")
+        );

 
         wxASSERT_MSG
 
         wxASSERT_MSG

-            (
-                GetLongOptionName(lng).Len() == lng.Len(),
-                wxT("Long option contains invalid characters")
-            );
+        (
+            GetLongOptionName(lng.begin(), lng.end()).Len() == lng.Len(),
+            wxT("Long option contains invalid characters")
+        );

 
 
         kind = k;
 
 
         kind = k;


@@ -179,7 +184,7 @@ struct wxCmdLineParserData
 
     // cmd line data
     wxArrayString m_arguments;  // == argv, argc == m_arguments.GetCount()
 
     // cmd line data
     wxArrayString m_arguments;  // == argv, argc == m_arguments.GetCount()

-    wxArrayOptions m_options;   // all possible options and switchrs
+    wxArrayOptions m_options;   // all possible options and switches

     wxArrayParams m_paramDesc;  // description of all possible params
     wxArrayString m_parameters; // all params found
 
     wxArrayParams m_paramDesc;  // description of all possible params
     wxArrayString m_parameters; // all params found
 


@@ -241,8 +246,10 @@ void wxCmdLineParserData::SetArguments(const wxString& cmdLine)
 {
     m_arguments.clear();
 
 {
     m_arguments.clear();
 

-    m_arguments.push_back(
-        (wxTheApp && wxTheApp->argc > 0) ? wxTheApp->argv[0] : wxEmptyString);
+    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);
 


@@ -524,7 +531,7 @@ wxString wxCmdLineParser::GetParam(size_t n) const
 // Resets switches and options
 void wxCmdLineParser::Reset()
 {
 // Resets switches and options
 void wxCmdLineParser::Reset()
 {

-    for ( size_t i = 0; i < m_data->m_options.Count(); i++ )
+    for ( size_t i = 0; i < m_data->m_options.GetCount(); i++ )

     {
         wxCmdLineOption& opt = m_data->m_options[i];
         opt.SetHasValue(false);
     {
         wxCmdLineOption& opt = m_data->m_options[i];
         opt.SetHasValue(false);


@@ -569,31 +576,33 @@ int wxCmdLineParser::Parse(bool showUsage)
 
         // empty argument or just '-' is not an option but a parameter
         if ( maybeOption && arg.length() > 1 &&
 
         // empty argument or just '-' is not an option but a parameter
         if ( maybeOption && arg.length() > 1 &&

-                wxStrchr(m_data->m_switchChars, arg[0u]) )
+                // FIXME-UTF8: use wc_str() after removing ANSI build
+                wxStrchr(m_data->m_switchChars.c_str(), arg[0u]) )

         {
             bool isLong;
             wxString name;
             int optInd = wxNOT_FOUND;   // init to suppress warnings
 
             // an option or a switch: find whether it's a long or a short one
         {
             bool isLong;
             wxString name;
             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[0u] == _T('-') && arg[1u] == _T('-') )
+            if ( arg.length() >= 3 && arg[0u] == _T('-') && arg[1u] == _T('-') )

             {
                 // a long one
                 isLong = true;
 
                 // Skip leading "--"
             {
                 // a long one
                 isLong = true;
 
                 // Skip leading "--"

-                const wxChar *p = arg.c_str() + 2;
+                wxString::const_iterator p = arg.begin() + 2;

 
                 bool longOptionsEnabled = AreLongOptionsEnabled();
 
 
                 bool longOptionsEnabled = AreLongOptionsEnabled();
 

-                name = GetLongOptionName(p);
+                name = GetLongOptionName(p, arg.end());

 
                 if (longOptionsEnabled)
                 {
                     optInd = m_data->FindOptionByLongName(name);
                     if ( optInd == wxNOT_FOUND )
                     {
 
                 if (longOptionsEnabled)
                 {
                     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


@@ -602,19 +611,20 @@ 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;
 
                 // a short one: as they can be cumulated, we try to find the
                 // longest substring which is a valid option
             {
                 isLong = false;
 
                 // 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;
+                wxString::const_iterator p = arg.begin() + 1;

 
 

-                name = GetShortOptionName(p);
+                name = GetShortOptionName(p, arg.end());

 
                 size_t len = name.length();
                 do
 
                 size_t len = name.length();
                 do


@@ -623,7 +633,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;
                     }


@@ -670,45 +681,60 @@ int wxCmdLineParser::Parse(bool showUsage)
                 continue;   // will break, in fact
             }
 
                 continue;   // will break, in fact
             }
 

+            // look at what follows:
+
+            // +1 for leading '-'
+            wxString::const_iterator p = arg.begin() + 1 + name.length();
+            wxString::const_iterator end = arg.end();
+
+            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 != arg.end() )

                 {
                 {

-                    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).GetValue() )

                     {
                         case _T('='):
                         case _T(':'):
                             // the value follows
                     {
                         case _T('='):
                         case _T(':'):
                             // the value follows

-                            p++;
+                            ++p;

                             break;
 
                         case 0:
                             break;
 
                         case 0:


@@ -717,14 +743,16 @@ 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;
                             }
                             else
                             {
                                 // ... take it from there
 
                                 ok = false;
                             }
                             else
                             {
                                 // ... take it from there

-                                p = m_data->m_arguments[n].c_str();
+                                p = m_data->m_arguments[n].begin();
+                                end = m_data->m_arguments[n].end();

                             }
                             break;
 
                             }
                             break;
 


@@ -734,7 +762,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;
                             }


@@ -743,7 +772,7 @@ int wxCmdLineParser::Parse(bool showUsage)
 
                 if ( ok )
                 {
 
                 if ( ok )
                 {

-                    wxString value = p;
+                    wxString value(p, end);

                     switch ( opt.type )
                     {
                         default:
                     switch ( opt.type )
                     {
                         default:


@@ -764,7 +793,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;
                                 }


@@ -775,11 +805,13 @@ int wxCmdLineParser::Parse(bool showUsage)
                         case wxCMD_LINE_VAL_DATE:
                             {
                                 wxDateTime dt;
                         case wxCMD_LINE_VAL_DATE:
                             {
                                 wxDateTime dt;

-                                const wxChar *res = dt.ParseDate(value);
+                                // FIXME-UTF8: ParseDate API will need changes
+                                const wxChar *res = dt.ParseDate(value.c_str());

                                 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;
                                 }


@@ -794,9 +826,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];


@@ -820,7 +851,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;
             }


@@ -857,7 +889,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;
             }


@@ -878,7 +911,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;
             }


@@ -980,7 +1014,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
             {


@@ -1044,18 +1078,29 @@ wxString wxCmdLineParser::GetUsageString()
 
     usage << _T('\n');
 
 
     usage << _T('\n');
 

+    // set to number of our own options, not counting the standard ones
+    count = namesOptions.size();
+
+    // get option names & descriptions for standard options, if any:
+    wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    wxString stdDesc;
+    if ( traits )
+        stdDesc = traits->GetStandardCmdLineOptions(namesOptions, descOptions);
+

     // now construct the detailed help message
     size_t len, lenMax = 0;
     // now construct the detailed help message
     size_t len, lenMax = 0;

-    count = namesOptions.size();
-    for ( n = 0; n < count; n++ )
+    for ( n = 0; n < namesOptions.size(); n++ )

     {
         len = namesOptions[n].length();
         if ( len > lenMax )
             lenMax = len;
     }
 
     {
         len = namesOptions[n].length();
         if ( len > lenMax )
             lenMax = len;
     }
 

-    for ( n = 0; n < count; n++ )
+    for ( n = 0; n < namesOptions.size(); n++ )

     {
     {

+        if ( n == count )
+            usage << _T('\n') << stdDesc;
+

         len = namesOptions[n].length();
         usage << namesOptions[n]
               << wxString(_T(' '), lenMax - len) << _T('\t')
         len = namesOptions[n].length();
         usage << namesOptions[n]
               << wxString(_T(' '), lenMax - len) << _T('\t')


@@ -1104,12 +1149,13 @@ the parameter allowedChars.
 For example, if p points to "abcde-@-_", and allowedChars is "-_",
 this function returns "abcde-".
 */
 For example, if p points to "abcde-@-_", and allowedChars is "-_",
 this function returns "abcde-".
 */

-static wxString GetOptionName(const wxChar *p,
-    const wxChar *allowedChars)
+static wxString GetOptionName(wxString::const_iterator p,
+                              wxString::const_iterator end,
+                              const wxChar *allowedChars)

 {
     wxString argName;
 
 {
     wxString argName;
 

-    while ( *p && (wxIsalnum(*p) || wxStrchr(allowedChars, *p)) )
+    while ( p != end && (wxIsalnum(*p) || wxStrchr(allowedChars, *p)) )

     {
         argName += *p++;
     }
     {
         argName += *p++;
     }


@@ -1127,14 +1173,16 @@ static wxString GetOptionName(const wxChar *p,
 #define wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION \
     wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("-")
 
 #define wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION \
     wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("-")
 

-static wxString GetShortOptionName(const wxChar *p)
+static wxString GetShortOptionName(wxString::const_iterator p,
+                                  wxString::const_iterator end)

 {
 {

-    return GetOptionName(p, wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION);
+    return GetOptionName(p, end, wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION);

 }
 
 }
 

-static wxString GetLongOptionName(const wxChar *p)
+static wxString GetLongOptionName(wxString::const_iterator p,
+                                  wxString::const_iterator end)

 {
 {

-    return GetOptionName(p, wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION);
+    return GetOptionName(p, end, wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION);

 }
 
 #endif // wxUSE_CMDLINE_PARSER
 }
 
 #endif // wxUSE_CMDLINE_PARSER


@@ -1152,7 +1200,7 @@ static wxString GetLongOptionName(const wxChar *p)
  */
 
 /* static */
  */
 
 /* static */

-wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxChar *p)
+wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxString& cmdline)

 {
     wxArrayString args;
 
 {
     wxArrayString args;
 


@@ -1160,14 +1208,17 @@ wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxChar *p)
     arg.reserve(1024);
 
     bool isInsideQuotes = false;
     arg.reserve(1024);
 
     bool isInsideQuotes = false;

+
+    wxString::const_iterator p = cmdline.begin();
+

     for ( ;; )
     {
         // skip white space
     for ( ;; )
     {
         // skip white space

-        while ( *p == _T(' ') || *p == _T('\t') )
-            p++;
+        while ( p != cmdline.end() && (*p == _T(' ') || *p == _T('\t')) )
+            ++p;

 
         // anything left?
 
         // anything left?

-        if ( *p == _T('\0') )
+        if ( p == cmdline.end() )

             break;
 
         // parse this parameter
             break;
 
         // parse this parameter


@@ -1175,7 +1226,7 @@ wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxChar *p)
         bool lastBS = false;
         for ( arg.clear(); !endParam; p++ )
         {
         bool lastBS = false;
         for ( arg.clear(); !endParam; p++ )
         {

-            switch ( *p )
+            switch ( (*p).GetValue() )

             {
                 case _T('"'):
                     if ( !lastBS )
             {
                 case _T('"'):
                     if ( !lastBS )


@@ -1221,4 +1272,3 @@ wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxChar *p)
 
     return args;
 }
 
     return args;
 }

-