From: Olly B. <ol...@su...> - 2006-04-05 23:36:40
|
I've been collecting these as I noticed them while reading the docs and code over the past few months, and thought it was about time I sent a patch! Cheers, Olly Index: Doc/Manual/Modules.html =================================================================== RCS file: /cvsroot/swig/SWIG/Doc/Manual/Modules.html,v retrieving revision 1.11 diff -p -u -r1.11 Modules.html --- Doc/Manual/Modules.html 3 Jun 2005 23:06:53 -0000 1.11 +++ Doc/Manual/Modules.html 5 Apr 2006 23:24:51 -0000 @@ -169,7 +169,7 @@ a <tt>Derived</tt> instance and call the <p> <b>%feature("compactdefaultargs")</b><br> -This feature can reduce the number of wrapper methods when wrapping methods with default arguments. The section on <a href="SWIGPlus.html#SWIGPlus_default_args">default arguments</a> discusses the feature and it's limitations. +This feature can reduce the number of wrapper methods when wrapping methods with default arguments. The section on <a href="SWIGPlus.html#SWIGPlus_default_args">default arguments</a> discusses the feature and its limitations. </p> </body> Index: Doc/Manual/Python.html =================================================================== RCS file: /cvsroot/swig/SWIG/Doc/Manual/Python.html,v retrieving revision 1.40 diff -p -u -r1.40 Python.html --- Doc/Manual/Python.html 16 Mar 2006 01:44:26 -0000 1.40 +++ Doc/Manual/Python.html 5 Apr 2006 23:24:53 -0000 @@ -1021,7 +1021,7 @@ dereference the pointer from Python. Of In older versions of Swig (1.3.22 or older), pointers were represented using a plain string object. If you have an old package that still requires that representation, or you just feel nostalgic, you can -always retreive it by casting the pointer object to a string: +always retrieve it by casting the pointer object to a string: </p> <div class="targetlang"><pre> @@ -4583,7 +4583,7 @@ class object (if applicable). <p> Using docstrings in Python code is becoming more and more important and more tools are coming on the scene that take advantage of them, -everything from full-blown documentaiton generators to class browsers +everything from full-blown documentation generators to class browsers and popup call-tips in Python-aware IDEs. Given the way that SWIG generates the proxy code by default, your users will normally get something like <tt>"function_name(*args)"</tt> in the popup calltip of Index: Doc/Manual/SWIGPlus.html =================================================================== RCS file: /cvsroot/swig/SWIG/Doc/Manual/SWIGPlus.html,v retrieving revision 1.39 diff -p -u -r1.39 SWIGPlus.html --- Doc/Manual/SWIGPlus.html 11 Feb 2006 18:54:34 -0000 1.39 +++ Doc/Manual/SWIGPlus.html 5 Apr 2006 23:24:55 -0000 @@ -822,7 +822,7 @@ public: <p> SWIG handles default arguments by generating an extra overloaded method for each defaulted argument. -SWIG is effectively handling methods with default arguments as if it had wrapped the equivalent overloaded methods. +SWIG is effectively handling methods with default arguments as if it was wrapping the equivalent overloaded methods. Thus for the example above, it is as if we had instead given the following to SWIG: </p> @@ -839,7 +839,7 @@ public: <p> The wrappers produced are exactly the same as if the above code was instead fed into SWIG. -Details of this is covered later in the <a href="#SWIGPlus_overloaded_methods">Wrapping Overloaded Functions and Methods</a> section. +Details of this are covered later in the <a href="#SWIGPlus_overloaded_methods">Wrapping Overloaded Functions and Methods</a> section. This approach allows SWIG to wrap all possible default arguments, but can be verbose. For example if a method has ten default arguments, then eleven wrapper methods are generated. </p> Index: Examples/test-suite/argout.i =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/test-suite/argout.i,v retrieving revision 1.2 diff -p -u -r1.2 argout.i --- Examples/test-suite/argout.i 30 Nov 2002 21:59:41 -0000 1.2 +++ Examples/test-suite/argout.i 5 Apr 2006 23:24:57 -0000 @@ -1,6 +1,6 @@ /* This interface file checks how well SWIG handles passing data back - through arguments WITHOUT returning it seperatly; for the cases where - maybe multiple values are passed by refernce and all want changing */ + through arguments WITHOUT returning it separately; for the cases where + maybe multiple values are passed by reference and all want changing */ %module argout Index: Lib/perl5/perlfragments.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/perl5/perlfragments.swg,v retrieving revision 1.1 diff -p -u -r1.1 perlfragments.swg --- Lib/perl5/perlfragments.swg 24 Oct 2005 14:59:04 -0000 1.1 +++ Lib/perl5/perlfragments.swg 5 Apr 2006 23:24:59 -0000 @@ -14,7 +14,7 @@ } } - this will replace the code used to retreive an integer value for all + this will replace the code used to retrieve an integer value for all the typemaps that need it, including: int, std::vector<int>, std::list<std::pair<int,int> >, etc. Index: Lib/php4/php4run.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/php4/php4run.swg,v retrieving revision 1.14 diff -p -u -r1.14 php4run.swg --- Lib/php4/php4run.swg 7 Mar 2006 00:14:09 -0000 1.14 +++ Lib/php4/php4run.swg 5 Apr 2006 23:24:59 -0000 @@ -93,7 +93,7 @@ SWIG_ZTS_SetPointerZval(zval *z, void *p /* This is a new pointer conversion routine Taking the native pointer p (which would have been converted from the old - string pointer) and it's php type id, and it's type name (which also would + string pointer) and its php type id, and its type name (which also would have come from the old string pointer) it converts it to ptr calling appropriate casting functions according to ty Sadly PHP has no API to find a type name from a type id, only from an instance Index: Lib/python/director_h.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/python/director_h.swg,v retrieving revision 1.19 diff -p -u -r1.19 director_h.swg --- Lib/python/director_h.swg 27 Mar 2006 21:39:49 -0000 1.19 +++ Lib/python/director_h.swg 5 Apr 2006 23:24:59 -0000 @@ -22,7 +22,7 @@ /* Use -DSWIG_PYTHON_DIRECTOR_NO_VTABLE if you don't want to generate a 'virtual - table', and avoid multiple GetAttr calls to retreive the python + table', and avoid multiple GetAttr calls to retrieve the python methods. */ Index: Lib/python/pyfragments.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/python/pyfragments.swg,v retrieving revision 1.3 diff -p -u -r1.3 pyfragments.swg --- Lib/python/pyfragments.swg 24 Feb 2005 23:48:19 -0000 1.3 +++ Lib/python/pyfragments.swg 5 Apr 2006 23:24:59 -0000 @@ -14,7 +14,7 @@ } } - this will replace the code used to retreive an integer value for all + this will replace the code used to retrieve an integer value for all the typemaps that need it, including: int, std::vector<int>, std::list<std::pair<int,int> >, etc. Index: Lib/ruby/rubyfragments.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/ruby/rubyfragments.swg,v retrieving revision 1.1 diff -p -u -r1.1 rubyfragments.swg --- Lib/ruby/rubyfragments.swg 18 Oct 2005 13:24:15 -0000 1.1 +++ Lib/ruby/rubyfragments.swg 5 Apr 2006 23:24:59 -0000 @@ -14,7 +14,7 @@ } } - this will replace the code used to retreive an integer value for all + this will replace the code used to retrieve an integer value for all the typemaps that need it, including: int, std::vector<int>, std::list<std::pair<int,int> >, etc. Index: Lib/tcl/tclfragments.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/tcl/tclfragments.swg,v retrieving revision 1.2 diff -p -u -r1.2 tclfragments.swg --- Lib/tcl/tclfragments.swg 7 Mar 2006 00:14:10 -0000 1.2 +++ Lib/tcl/tclfragments.swg 5 Apr 2006 23:25:00 -0000 @@ -20,7 +20,7 @@ } } - this will replace the code used to retreive an integer value for all + this will replace the code used to retrieve an integer value for all the typemaps that need it, including: int, std::vector<int>, std::list<std::pair<int,int> >, etc. Index: Lib/typemaps/swigmacros.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/typemaps/swigmacros.swg,v retrieving revision 1.17 diff -p -u -r1.17 swigmacros.swg --- Lib/typemaps/swigmacros.swg 23 Feb 2006 23:43:03 -0000 1.17 +++ Lib/typemaps/swigmacros.swg 5 Apr 2006 23:25:00 -0000 @@ -49,8 +49,8 @@ %delete_array(cptr) Delete an array - Auxiliar loop macros: - --------------------- + Auxiliary loop macros: + ---------------------- %formacro(Macro, Args...) or %formacro_1(Macro, Args...) for i in Args Index: Source/Modules/php4.cxx =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Modules/php4.cxx,v retrieving revision 1.34 diff -p -u -r1.34 php4.cxx --- Source/Modules/php4.cxx 20 Mar 2006 00:24:39 -0000 1.34 +++ Source/Modules/php4.cxx 5 Apr 2006 23:25:01 -0000 @@ -1048,13 +1048,13 @@ public: } /* Now convert from php to C variables */ - // At this point, argcount if used is the number of deliberatly passed args + // At this point, argcount if used is the number of deliberately passed args // not including this_ptr even if it is used. // It means error messages may be out by argbase with error // reports. We can either take argbase into account when raising // errors, or find a better way of dealing with _thisptr // I would like, if objects are wrapped, to assume _thisptr is always - // _this and the and not the first argument + // _this and not the first argument // This may mean looking at Lang::memberfunctionhandler for (i = 0, p = l; i < num_arguments; i++) { Index: Source/Modules/python.cxx =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Modules/python.cxx,v retrieving revision 1.203 diff -p -u -r1.203 python.cxx --- Source/Modules/python.cxx 16 Mar 2006 01:46:50 -0000 1.203 +++ Source/Modules/python.cxx 5 Apr 2006 23:25:03 -0000 @@ -3603,7 +3603,7 @@ int PYTHON::classDirectorMethod(Node *n, Append(w->code, "if (!swig_get_self()) {\n"); - Printf(w->code, " Swig::DirectorException::raise(\"'self' unitialized, maybe you forgot to call %s.__init__.\");\n", classname); + Printf(w->code, " Swig::DirectorException::raise(\"'self' uninitialized, maybe you forgot to call %s.__init__.\");\n", classname); Append(w->code, "}\n"); Append(w->code,"#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)\n"); Printf(w->code, "const size_t swig_method_index = %d;\n", director_method_index++); Index: Source/Swig/misc.c =================================================================== RCS file: /cvsroot/swig/SWIG/Source/Swig/misc.c,v retrieving revision 1.57 diff -p -u -r1.57 misc.c --- Source/Swig/misc.c 6 Mar 2006 22:51:00 -0000 1.57 +++ Source/Swig/misc.c 5 Apr 2006 23:25:03 -0000 @@ -153,8 +155,8 @@ String *Swig_string_title(String *s) { /* ----------------------------------------------------------------------------- * Swig_string_ccase() * - * Takes a string object and returns a copy that is lowercase with thefirst letter - * capitalized and the one following '_', which are removed. + * Takes a string object and returns a copy that is lowercase with the first + * letter capitalized and the one following '_', which are removed. * * camel_case -> CamelCase * camelCase -> CamelCase |