From f9566ad2df496e3447857962f55cb959dab3ac8a Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Tue, 8 Jan 2013 18:47:40 +1300 Subject: [PATCH] Fix assorted typos. From https://sourceforge.net/p/swig/patches/332/ and some others too. --- CHANGES | 14 +++++++------- Doc/Manual/Allegrocl.html | 2 +- Doc/Manual/Extending.html | 2 +- Examples/test-suite/chicken/README | 4 ++-- Examples/test-suite/perl5/default_args_runme.pl | 2 +- Lib/std/std_pair.i | 2 +- Lib/std/std_vector.i | 2 +- Source/CParse/cscanner.c | 4 ++-- Source/DOH/README | 2 +- Source/Modules/d.cxx | 2 +- Source/Modules/lua.cxx | 2 +- Tools/pyname_patch.py | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CHANGES b/CHANGES index d6006a91a..8b1945ad9 100644 --- a/CHANGES +++ b/CHANGES @@ -15,7 +15,7 @@ Version 2.0.9 (16 December 2012) symbols in Ruby 1.9+ 2012-12-14: kkaempf - [Ruby] Apply patch 3530439 and finally replace all occurences of the STR2CSTR() macro + [Ruby] Apply patch 3530439 and finally replace all occurrences of the STR2CSTR() macro with StringValuePtr(). STR2CSTR was deprecated since years and got removed in Ruby 1.9 2012-12-14: kkaempf @@ -12144,7 +12144,7 @@ Version 1.3.20 (December 17, 2003) 06/25/2003: mrose (Mark Rose) [Python] Director typemap marshalling checks for null pointers when walking the parameter list instead of relying soley on the parameter - count. Cures a segfault that occured for multiple argument inv typemaps. + count. Cures a segfault that occurred for multiple argument inv typemaps. Someone with more Swig experience should probably review this code. 06/24/2003: mkoeppe (Matthias Koeppe) @@ -17619,7 +17619,7 @@ Version 1.3.10 (December 10, 2001) shadow classes. In early implementations, shadow classes were merely Python wrappers around typed pointer objects. However, some users actually wanted to receive the shadow class object in C. - To accomodate this, the dereferencing of the "this" pointer in + To accommodate this, the dereferencing of the "this" pointer in a shadow class was moved to C as described in CHANGES [8/8/99]. However, the process of returning pointers to Python was still somewhat problematic. Specifically, shadow classes never worked @@ -19533,7 +19533,7 @@ Version 1.3.6 (July 9, 2001) [Java] destructor (_delete()) was not aware of %name renaming [Java] extends baseclass did not know about %name renaming [Java] extends baseclass did extend even when the baseclass was not known to swig - [Java] sometimes enum-declarations occured before the Java class declaration + [Java] sometimes enum-declarations occurred before the Java class declaration [Java] unrelated enum initialisations no longer appear in Java class [Java] if module ends in '_' correct JNI names are now produced @@ -20686,7 +20686,7 @@ Version 1.3 Alpha 1 (February 11, 2000) names or use %apply to map typemaps to alternate names. 8/8/99 : Handling of the 'this' pointer has been changed in Python shadow - classes. Previously, dereferencing of '.this' occured in the + classes. Previously, dereferencing of '.this' occurred in the Python shadow class itself. Now, this step occurs in the C wrappers using the following function: @@ -21243,7 +21243,7 @@ Version 1.1 Patch 1 (August 27, 1997) Would generate completely bogus code with garbage replacing the '%d'. Caused by one faulty use of printf (wasn't able to find - any other occurences). + any other occurrences). 7/7/97 : Fixed bug in Python shadow class generation with non-member functions that are returning more than one value. @@ -21359,7 +21359,7 @@ Version 1.1 (June 24, 1997) .... later ... int OldName(int); - Unlike %name, %rename will rename any occurence of the old name. + Unlike %name, %rename will rename any occurrence of the old name. This applies to functions, variables, class members and so forth. There is no way to disable %rename once set, but you can change the name by redeclaring it to something else. diff --git a/Doc/Manual/Allegrocl.html b/Doc/Manual/Allegrocl.html index 5d00c4cd0..283ff7e2c 100644 --- a/Doc/Manual/Allegrocl.html +++ b/Doc/Manual/Allegrocl.html @@ -1118,7 +1118,7 @@ namespace BAR { function that returns an object (or pointer/reference) of C/C++ type X, the wrapping defun (or defmethod) on the Lisp side will automatically wrap the pointer returned in an instance - of the apropriate class. This makes it much easier to write and + of the appropriate class. This makes it much easier to write and debug code than if pointers were passed around as a jumble of integer values.

diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html index ce205abf5..059388717 100644 --- a/Doc/Manual/Extending.html +++ b/Doc/Manual/Extending.html @@ -2975,7 +2975,7 @@ There are a lot of issues to address. 
 virtual int functionWrapper(Node *n) {
-  /* get useful atributes */
+  /* get useful attributes */
   String   *name   = Getattr(n,"sym:name");
   SwigType *type   = Getattr(n,"type");
   ParmList *parms  = Getattr(n,"parms");
diff --git a/Examples/test-suite/chicken/README b/Examples/test-suite/chicken/README
index ba32bb464..aad730ec4 100644
--- a/Examples/test-suite/chicken/README
+++ b/Examples/test-suite/chicken/README
@@ -1,10 +1,10 @@
 See ../README for common README file.
 
 Any testcases which have _runme.ss appended after the testcase name will be detected and run.
-NOTE: I had to use _runme.ss becuase otherwise it would be hard to implement make clean
+NOTE: I had to use _runme.ss because otherwise it would be hard to implement make clean
 Since when SWIG runs it generates an example.scm file for every test, to clean those files
 I needed to add a rm -f *.scm to make clean.  But we don't want the runme scripts to
-dissappear as well!
+disappear as well!
 
 Any testcases which have _runme_proxy.ss appended after the testcase name will be detected
 and run with the -proxy argument passed to SWIG.  SWIG will not be run with the -unhide-primitive
diff --git a/Examples/test-suite/perl5/default_args_runme.pl b/Examples/test-suite/perl5/default_args_runme.pl
index 45f10b37e..20f0c9bc6 100644
--- a/Examples/test-suite/perl5/default_args_runme.pl
+++ b/Examples/test-suite/perl5/default_args_runme.pl
@@ -51,7 +51,7 @@ my $ex = new default_args::Except($false);
 
 my $hit = 0;
 eval { $ex->exspec(); $hit = 1; };
-# a zero was thrown, an exception occured, but $@ is false
+# a zero was thrown, an exception occurred, but $@ is false
 is($hit, 0, "exspec 1");
 eval { $ex->exspec(-1) };
 like($@, qr/^ciao/, "exspec 2");
diff --git a/Lib/std/std_pair.i b/Lib/std/std_pair.i
index 7c8327795..2743430e9 100644
--- a/Lib/std/std_pair.i
+++ b/Lib/std/std_pair.i
@@ -49,7 +49,7 @@ namespace std {
   };
 
   // ***
-  // The following specializations should dissapear or get 
+  // The following specializations should disappear or get
   // simplified when a 'const SWIGTYPE*&' can be defined
   // ***
   template  struct pair {      
diff --git a/Lib/std/std_vector.i b/Lib/std/std_vector.i
index e4f9f140d..baecf8507 100644
--- a/Lib/std/std_vector.i
+++ b/Lib/std/std_vector.i
@@ -95,7 +95,7 @@ namespace std {
   };
 
   // ***
-  // This specialization should dissapear or get simplified when
+  // This specialization should disappear or get simplified when
   // a 'const SWIGTYPE*&' can be defined
   // ***
   template
diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c
index 64875a4d1..b52618606 100644
--- a/Source/CParse/cscanner.c
+++ b/Source/CParse/cscanner.c
@@ -9,7 +9,7 @@
  * scanner.c
  *
  * SWIG tokenizer.  This file is a wrapper around the generic C scanner
- * found in Swig/scanner.c.   Extra logic is added both to accomodate the
+ * found in Swig/scanner.c.   Extra logic is added both to accommodate the
  * bison-based grammar and certain peculiarities of C++ parsing (e.g.,
  * operator overloading, typedef resolution, etc.).  This code also splits
  * C identifiers up into keywords and SWIG directives.
@@ -373,7 +373,7 @@ void scanner_clear_rename() {
   rename_active = 0;
 }
 
-/* Used to push a ficticious token into the scanner */
+/* Used to push a fictitious token into the scanner */
 static int next_token = 0;
 void scanner_next_token(int tok) {
   next_token = tok;
diff --git a/Source/DOH/README b/Source/DOH/README
index 9a42e8b8b..9baaabc8a 100644
--- a/Source/DOH/README
+++ b/Source/DOH/README
@@ -69,7 +69,7 @@ Close(obj)                      Close
 
 String Operations
 -----------------
-Replace(obj, orig, rep, flags)  Replace occurences of orig with rep.
+Replace(obj, orig, rep, flags)  Replace occurrences of orig with rep.
 Chop(obj)                       Remove trailing whitespace
 
 flags is one of the following:
diff --git a/Source/Modules/d.cxx b/Source/Modules/d.cxx
index b8e30d50c..560835751 100644
--- a/Source/Modules/d.cxx
+++ b/Source/Modules/d.cxx
@@ -3625,7 +3625,7 @@ private:
       // If the import statement has been found in the target string, we have to
       // check if the previous import was static, which would lead to problems
       // if this import is not.
-      // Thus, we check if the seven characters in front of the occurence are
+      // Thus, we check if the seven characters in front of the occurrence are
       // »static «. If the import string passed is also static, the checks fail
       // even if the found statement is also static because the last seven
       // characters would be part of the previous import statement then.
diff --git a/Source/Modules/lua.cxx b/Source/Modules/lua.cxx
index ef2fa96de..34763290f 100644
--- a/Source/Modules/lua.cxx
+++ b/Source/Modules/lua.cxx
@@ -113,7 +113,7 @@ private:
   String *s_var_tab;		// table of global variables
   String *s_const_tab;		// table of global constants
   String *s_methods_tab;	// table of class methods
-  String *s_attr_tab;		// table of class atributes
+  String *s_attr_tab;		// table of class attributes
   String *s_luacode;		// luacode to be called during init
   String *s_dot_get;            // table of variable 'get' functions
   String *s_dot_set;            // table of variable 'set' functions
diff --git a/Tools/pyname_patch.py b/Tools/pyname_patch.py
index 5931269f9..f8f436c38 100644
--- a/Tools/pyname_patch.py
+++ b/Tools/pyname_patch.py
@@ -109,7 +109,7 @@ def main(fns):
             if patch_file(fn):
                 print "Patched file", fn
         except IOError:
-            print "Error occured during patching", fn
+            print "Error occurred during patching", fn
     return
 
 if __name__=="__main__":