diff options
author | William S Fulton <wsf@fultondesigns.co.uk> | 2021-11-24 18:41:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-24 18:41:26 +0000 |
commit | a39c2695f27dd5bef06fe583dc89bb9b8f4a8170 (patch) | |
tree | 3fa5b4ef297dc57a0bcf447ae1a9e6c54002b3b6 | |
parent | 335434525594e7759556cc23c5e4b2fb0282dbf1 (diff) | |
parent | f586d920f72aeedd8d4c9504415f4251005ef4bf (diff) | |
download | swig-a39c2695f27dd5bef06fe583dc89bb9b8f4a8170.tar.gz |
Merge pull request #2100 from rex4539/typos
Fix typos
-rw-r--r-- | CCache/README.swig | 2 | ||||
-rw-r--r-- | CCache/execute.c | 2 | ||||
-rw-r--r-- | CCache/snprintf.c | 4 | ||||
-rw-r--r-- | CCache/web/index.html | 2 | ||||
-rw-r--r-- | Doc/Manual/Doxygen.html | 2 | ||||
-rw-r--r-- | Doc/Manual/Java.html | 2 | ||||
-rw-r--r-- | Doc/Manual/R.html | 4 | ||||
-rw-r--r-- | Examples/test-suite/cpp11_template_double_brackets.i | 2 | ||||
-rw-r--r-- | Examples/test-suite/d/li_std_vector_runme.2.d | 2 | ||||
-rw-r--r-- | Examples/test-suite/scilab/preproc_constants_runme.sci | 2 | ||||
-rw-r--r-- | Examples/test-suite/scilab_identifier_name.i | 2 | ||||
-rw-r--r-- | Examples/test-suite/tcl/imports_runme.tcl | 4 | ||||
-rw-r--r-- | Lib/d/doperators.swg | 6 | ||||
-rw-r--r-- | Lib/octave/octcomplex.swg | 2 | ||||
-rw-r--r-- | Lib/ruby/rubyautodoc.swg | 4 | ||||
-rw-r--r-- | Lib/tcl/mactkinit.c | 2 | ||||
-rw-r--r-- | Source/Doxygen/doxytranslator.h | 4 | ||||
-rw-r--r-- | Source/Doxygen/pydoc.h | 2 | ||||
-rw-r--r-- | Source/Modules/javascript.cxx | 2 | ||||
-rw-r--r-- | Source/Swig/cwrap.c | 2 | ||||
-rw-r--r-- | Source/Swig/naming.c | 2 | ||||
-rw-r--r-- | Tools/config/ax_boost_base.m4 | 2 | ||||
-rwxr-xr-x | Tools/travis-linux-install.sh | 2 | ||||
-rwxr-xr-x | Tools/travis-osx-install.sh | 2 |
24 files changed, 31 insertions, 31 deletions
diff --git a/CCache/README.swig b/CCache/README.swig index aea0f3d82..82055d146 100644 --- a/CCache/README.swig +++ b/CCache/README.swig @@ -2,7 +2,7 @@ This directory contains a version of ccache. The initial version was based on cc debian patches 01-02, 04-14, see the debian/patches subdirectory. The ccache-win32-2.4 modifications to ccache-2.4 have also been merged in. -Changes have been made to support cacheing the output from SWIG. The ability to cache c/c++ compiler +Changes have been made to support caching the output from SWIG. The ability to cache c/c++ compiler output has been retained. Additional features added are the CCACHE_VERBOSE and CCACHE_SWIG environment variables, see docs. diff --git a/CCache/execute.c b/CCache/execute.c index 6df025e95..8c65e0ce0 100644 --- a/CCache/execute.c +++ b/CCache/execute.c @@ -137,7 +137,7 @@ int execute(char **argv, _dup2(fd, 2); _close(fd); - /* Spawn process (_exec* familly doesn't return) */ + /* Spawn process (_exec* family doesn't return) */ status = _spawnv(_P_WAIT, argv[0], (const char **)argv); /* Restore descriptors */ diff --git a/CCache/snprintf.c b/CCache/snprintf.c index 9bf8a817b..1a76c7d1b 100644 --- a/CCache/snprintf.c +++ b/CCache/snprintf.c @@ -16,7 +16,7 @@ * for string length. This covers a nasty loophole. * * The other functions are there to prevent NULL pointers from - * causing nast effects. + * causing nasty effects. * * More Recently: * Brandon Long <blong@fiction.net> 9/15/96 for mutt 0.43 @@ -30,7 +30,7 @@ * probably requires libm on most operating systems. Don't yet * support the exponent (e,E) and sigfig (g,G). Also, fmtint() * was pretty badly broken, it just wasn't being exercised in ways - * which showed it, so that's been fixed. Also, formated the code + * which showed it, so that's been fixed. Also, formatted the code * to mutt conventions, and removed dead code left over from the * original. Also, there is now a builtin-test, just compile with: * gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm diff --git a/CCache/web/index.html b/CCache/web/index.html index 4af839135..bc46916d2 100644 --- a/CCache/web/index.html +++ b/CCache/web/index.html @@ -34,7 +34,7 @@ on the new options.<p> You can get this release from the <a href="http://ccache.samba.org/ftp/ccache/">download directory</a> -<p>NOTE! This release changes the hash input slighly, so you will +<p>NOTE! This release changes the hash input slightly, so you will probably find that you will not get any hits against your existing cache when you upgrade. diff --git a/Doc/Manual/Doxygen.html b/Doc/Manual/Doxygen.html index 53238c24d..e7fd4c359 100644 --- a/Doc/Manual/Doxygen.html +++ b/Doc/Manual/Doxygen.html @@ -1354,7 +1354,7 @@ Here is the list of all Doxygen tags and the description of how they are transla </tr> <tr> <td>\throws</td> -<td>replaced wih ':raises:'</td> +<td>replaced with ':raises:'</td> </tr> <tr> <td>\todo</td> diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html index dc403a98c..2591b27b5 100644 --- a/Doc/Manual/Java.html +++ b/Doc/Manual/Java.html @@ -9095,7 +9095,7 @@ This method normally calls the C++ destructor or <tt>free()</tt> for C code. <p> The generated code can be debugged using both a Java debugger and a C++ debugger using the usual debugging techniques. Breakpoints can be set in either Java or C++ code and so both can be debugged simultaneously. -Most debuggers do not understand both Java and C++, with one noteable exception of Sun Studio, +Most debuggers do not understand both Java and C++, with one notable exception of Sun Studio, where it is possible to step from Java code into a JNI method within one environment. </p> diff --git a/Doc/Manual/R.html b/Doc/Manual/R.html index e44fe432c..9b05922fd 100644 --- a/Doc/Manual/R.html +++ b/Doc/Manual/R.html @@ -196,7 +196,7 @@ slices) <p> Wrapping of C++ classes for R works quite well. R has a special type, known as an external reference, that can be used as a pointer -to arbitary things, including C++ classes. The proxy layers generated +to arbitrary things, including C++ classes. The proxy layers generated for other classes are not required. </p> @@ -265,7 +265,7 @@ v2$Axles [1] 4 v1$Available [1] FALSE -# Set availabilty +# Set availability v1$Available <- TRUE v1$Available [1] TRUE diff --git a/Examples/test-suite/cpp11_template_double_brackets.i b/Examples/test-suite/cpp11_template_double_brackets.i index ba5caa5c5..d7522c9f0 100644 --- a/Examples/test-suite/cpp11_template_double_brackets.i +++ b/Examples/test-suite/cpp11_template_double_brackets.i @@ -1,5 +1,5 @@ /* This interface checks whether SWIG supports the new double angled brackets - in the template syntax without having a space inbetween. This feature was + in the template syntax without having a space in between. This feature was introduced in new C++11 standard. */ %module cpp11_template_double_brackets diff --git a/Examples/test-suite/d/li_std_vector_runme.2.d b/Examples/test-suite/d/li_std_vector_runme.2.d index f4a666716..3f97062f1 100644 --- a/Examples/test-suite/d/li_std_vector_runme.2.d +++ b/Examples/test-suite/d/li_std_vector_runme.2.d @@ -47,7 +47,7 @@ void main() { enforce(countUntil(vector[], i * 10) == i, "indexOf test failed, i: " ~ to!string(i)); } - enforce(countUntil(vector[], 42) == -1, "non-existant item indexOf test failed"); + enforce(countUntil(vector[], 42) == -1, "non-existent item indexOf test failed"); vector.clear(); enforce(vector.length == 0, "clear test failed"); diff --git a/Examples/test-suite/scilab/preproc_constants_runme.sci b/Examples/test-suite/scilab/preproc_constants_runme.sci index d3d0a4b56..3dc1433af 100644 --- a/Examples/test-suite/scilab/preproc_constants_runme.sci +++ b/Examples/test-suite/scilab/preproc_constants_runme.sci @@ -24,7 +24,7 @@ endfunction test_global(); -// Test assignement in enums +// Test assignment in enums checkequal(kValue_get(), 4, "kValue"); exec("swigtest.quit", -1); diff --git a/Examples/test-suite/scilab_identifier_name.i b/Examples/test-suite/scilab_identifier_name.i index 94dde47e0..4e5a574e9 100644 --- a/Examples/test-suite/scilab_identifier_name.i +++ b/Examples/test-suite/scilab_identifier_name.i @@ -7,7 +7,7 @@ // Test truncating variables, constants, functions identifier names %inline %{ -// these identifier names wont be truncated +// these identifier names won't be truncated int gvar_identifier_name = -1; #define CONS_IDENTIFIER_NAME -11 int function_identifier_name() { return -21; }; diff --git a/Examples/test-suite/tcl/imports_runme.tcl b/Examples/test-suite/tcl/imports_runme.tcl index 6b2e77bde..bf2fc8cba 100644 --- a/Examples/test-suite/tcl/imports_runme.tcl +++ b/Examples/test-suite/tcl/imports_runme.tcl @@ -15,8 +15,8 @@ import set x [new_B] A_hello $x -if [ catch { $x nonexistant } ] { +if [ catch { $x nonexistent } ] { } else { - puts stderr "nonexistant method did not throw exception\n" + puts stderr "nonexistent method did not throw exception\n" exit 1 } diff --git a/Lib/d/doperators.swg b/Lib/d/doperators.swg index 0cb63533c..0a82a6cb4 100644 --- a/Lib/d/doperators.swg +++ b/Lib/d/doperators.swg @@ -58,7 +58,7 @@ template SwigOperatorDefinitions() { %rename(opCall) *::operator(); -// !a is not overrideable in D1. +// !a is not overridable in D1. %ignoreoperator(LNOT) operator!; // opCmp is used in D. @@ -71,7 +71,7 @@ template SwigOperatorDefinitions() { // a != b is rewritten as !a.opEquals(b) in D. %ignoreoperator(NOTEQUAL) operator!=; -// The logic operators are not overrideable in D. +// The logic operators are not overridable in D. %ignoreoperator(LAND) operator&&; %ignoreoperator(LOR) operator||; @@ -198,7 +198,7 @@ mixin template SwigOperatorDefinitions() { // a != b is rewritten as !a.opEquals(b) in D. %ignoreoperator(NOTEQUAL) operator!=; -// The logic operators are not overrideable in D. +// The logic operators are not overridable in D. %ignoreoperator(LAND) operator&&; %ignoreoperator(LOR) operator||; diff --git a/Lib/octave/octcomplex.swg b/Lib/octave/octcomplex.swg index 87e77a62e..553c25a3d 100644 --- a/Lib/octave/octcomplex.swg +++ b/Lib/octave/octcomplex.swg @@ -2,7 +2,7 @@ Defines the As/From conversors for double/float complex, you need to provide complex Type, the Name you want to use in the conversors, the complex Constructor method, and the Real and Imag complex - accesor methods. + accessor methods. See the std_complex.i and ccomplex.i for concrete examples. */ diff --git a/Lib/ruby/rubyautodoc.swg b/Lib/ruby/rubyautodoc.swg index 1e6b0d9dc..6b0472ce8 100644 --- a/Lib/ruby/rubyautodoc.swg +++ b/Lib/ruby/rubyautodoc.swg @@ -77,7 +77,7 @@ AUTODOC(operator>, "Higher than comparison operator"); AUTODOC(operator<<, "Left shifting or appending operator"); AUTODOC(operator>>, "Right shifting operator or extracting operator"); AUTODOC(operator+, "Add operator"); -AUTODOC(operator-, "Substraction operator"); +AUTODOC(operator-, "Subtraction operator"); AUTODOC(operator+(), "Positive operator"); AUTODOC(operator-(), "Negation operator"); AUTODOC(operator&, "AND operator"); @@ -93,7 +93,7 @@ AUTODOC(__gt__, "Higher than comparison operator"); AUTODOC(__lshift__, "Left shifting or appending operator"); AUTODOC(__rshift__, "Right shifting operator or extracting operator"); AUTODOC(__add___, "Add operator"); -AUTODOC(__sub__, "Substraction operator"); +AUTODOC(__sub__, "Subtraction operator"); AUTODOC(__pos__, "Positive operator"); AUTODOC(__neg__, "Negation operator"); AUTODOC(__and__, "AND operator"); diff --git a/Lib/tcl/mactkinit.c b/Lib/tcl/mactkinit.c index 8d1420088..18f1f0203 100644 --- a/Lib/tcl/mactkinit.c +++ b/Lib/tcl/mactkinit.c @@ -126,7 +126,7 @@ MacintoshInit() * * This procedure calls initialization routines require a Tcl * interp as an argument. This call effectively makes the passed - * iterpreter the "main" interpreter for the application. + * interpreter the "main" interpreter for the application. * * Results: * Returns TCL_OK if everything went fine. If it didn't the diff --git a/Source/Doxygen/doxytranslator.h b/Source/Doxygen/doxytranslator.h index f07b632a2..a72a31df6 100644 --- a/Source/Doxygen/doxytranslator.h +++ b/Source/Doxygen/doxytranslator.h @@ -53,13 +53,13 @@ public: virtual ~DoxygenTranslator(); /* - * Return the documentation for a given node formated for the correct + * Return the documentation for a given node formatted for the correct * documentation system. */ String *getDocumentation(Node *node, const_String_or_char_ptr indentationString); /* - * Returns truem is the specified node has comment attached. + * Returns true if the specified node has comment attached. */ bool hasDocumentation(Node *node); diff --git a/Source/Doxygen/pydoc.h b/Source/Doxygen/pydoc.h index 07c5ce51e..19885276f 100644 --- a/Source/Doxygen/pydoc.h +++ b/Source/Doxygen/pydoc.h @@ -195,7 +195,7 @@ private: typedef std::map<std::string, std::pair<tagHandler, std::string> >TagHandlersMap; static TagHandlersMap tagHandlers; - // this contains the sections tittles, like 'Arguments:' or 'Notes:', that are printed only once + // this contains the sections titles, like 'Arguments:' or 'Notes:', that are printed only once static std::map<std::string, std::string> sectionTitles; // Helper functions for fillStaticTables(): make a new tag handler object. diff --git a/Source/Modules/javascript.cxx b/Source/Modules/javascript.cxx index d3ae3ce64..431dd4744 100644 --- a/Source/Modules/javascript.cxx +++ b/Source/Modules/javascript.cxx @@ -1255,7 +1255,7 @@ int JSEmitter::emitFunctionDispatcher(Node *n, bool /*is_member */ ) { // Note: this dispatcher function gets called after the last overloaded function has been created. // At this time, n.wrap:name contains the name of the last wrapper function. // To get a valid function name for the dispatcher function we take the last wrapper name and - // substract the extension "sym:overname", + // subtract the extension "sym:overname", String *wrap_name = NewString(Getattr(n, "wrap:name")); String *overname = Getattr(n, "sym:overname"); diff --git a/Source/Swig/cwrap.c b/Source/Swig/cwrap.c index d6e5e0cdc..7bf6641c8 100644 --- a/Source/Swig/cwrap.c +++ b/Source/Swig/cwrap.c @@ -632,7 +632,7 @@ String *Swig_cppconstructor_director_call(const_String_or_char_ptr name, ParmLis * If you define SWIG_FAST_REC_SEARCH, the method will set the found * 'attr' in the target class 'n'. If not, the method will set the * 'noattr' one. This prevents of having to navigate the entire - * hierarchy tree everytime, so, it is an O(1) method... or something + * hierarchy tree every time, so, it is an O(1) method... or something * like that. However, it populates all the parsed classes with the * 'attr' and/or 'noattr' attributes. * diff --git a/Source/Swig/naming.c b/Source/Swig/naming.c index 1d78e7a47..871a9e5bb 100644 --- a/Source/Swig/naming.c +++ b/Source/Swig/naming.c @@ -1514,7 +1514,7 @@ String *Swig_name_make(Node *n, String *prefix, const_String_or_char_ptr cname, if (n) { /* Parameter renaming is not fully implemented. Mainly because there is no C/C++ syntax to * for %rename to fully qualify a function's parameter name from outside the function. Hence it - * is not possible to implemented targetted warning suppression on one parameter in one function. */ + * is not possible to implemented targeted warning suppression on one parameter in one function. */ int suppress_parameter_rename_warning = Equal(nodeType(n), "parm"); if (!suppress_parameter_rename_warning) { SWIG_WARN_NODE_BEGIN(n); diff --git a/Tools/config/ax_boost_base.m4 b/Tools/config/ax_boost_base.m4 index f5a935cd6..94fb2a0d4 100644 --- a/Tools/config/ax_boost_base.m4 +++ b/Tools/config/ax_boost_base.m4 @@ -10,7 +10,7 @@ # # Test for the Boost C++ libraries of a particular version (or newer) # -# If no path to the installed boost library is given the macro searchs +# If no path to the installed boost library is given the macro searches # under /usr, /usr/local, /opt and /opt/local and evaluates the # $BOOST_ROOT environment variable. Further documentation is available at # <http://randspringer.de/boost/index.html>. diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh index cda834112..cb64d57d2 100755 --- a/Tools/travis-linux-install.sh +++ b/Tools/travis-linux-install.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Install Linux packages where the version has been overidden in .travis.yml +# Install Linux packages where the version has been overridden in .travis.yml lsb_release -a # find location of current script (only works in bash) diff --git a/Tools/travis-osx-install.sh b/Tools/travis-osx-install.sh index 71545ad5c..fc69c6654 100755 --- a/Tools/travis-osx-install.sh +++ b/Tools/travis-osx-install.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Install MacOS packages where the version has been overidden in .travis.yml +# Install MacOS packages where the version has been overridden in .travis.yml set -e # exit on failure (same as -o errexit) |