From 3932d02a2a74984ac016692cd34efbf7952060ea Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Fri, 21 Aug 2009 00:25:11 +0000
Subject: [PATCH] fix SWIG naming convention

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11663 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Allegrocl.html          |  4 ++--
 Doc/Manual/CSharp.html             |  2 +-
 Doc/Manual/Contents.html           |  2 +-
 Doc/Manual/Guile.html              |  4 ++--
 Doc/Manual/Perl5.html              |  2 +-
 Doc/Manual/Php.html                |  2 +-
 Doc/Manual/Python.html             |  6 +++---
 Doc/Manual/Ruby.html               |  4 ++--
 Doc/Manual/SWIGPlus.html           |  2 +-
 Examples/java/pointer/index.html   |  2 +-
 Examples/perl5/pointer/index.html  |  2 +-
 Examples/python/pointer/index.html |  2 +-
 Examples/ruby/pointer/index.html   |  2 +-
 Examples/tcl/pointer/index.html    |  2 +-
 Lib/lua/luarun.swg                 |  2 +-
 Lib/php/director.swg               |  4 ++--
 Lib/python/director.swg            | 10 +++++-----
 Lib/ruby/director.swg              | 10 +++++-----
 Lib/tcl/typemaps.i                 |  4 ++--
 Lib/typemaps/fragments.swg         |  6 +++---
 Lib/typemaps/swigmacros.swg        |  6 +++---
 Source/Modules/modula3.cxx         |  2 +-
 Source/Preprocessor/cpp.c          |  4 ++--
 23 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/Doc/Manual/Allegrocl.html b/Doc/Manual/Allegrocl.html
index cc950db7c..cf70f6c27 100644
--- a/Doc/Manual/Allegrocl.html
+++ b/Doc/Manual/Allegrocl.html
@@ -14,7 +14,7 @@
 <ul>
 <li><a href="#Allegrocl_nn2">Basics</a>
 <ul>
-<li><a href="#Allegrocl_nn3">Running Swig</a>
+<li><a href="#Allegrocl_nn3">Running SWIG</a>
 <li><a href="#Allegrocl_nn4">Command Line Options</a>
 <li><a href="#Allegrocl_nn5">Inserting user code into generated files</a>
 </ul>
@@ -138,7 +138,7 @@ to it.
 <H2><a name="Allegrocl_nn2"></a>17.1 Basics</H2>
 
 
-<H3><a name="Allegrocl_nn3"></a>17.1.1 Running Swig</H3>
+<H3><a name="Allegrocl_nn3"></a>17.1.1 Running SWIG</H3>
 
 
 <p>
diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html
index f747fc213..f092d188a 100644
--- a/Doc/Manual/CSharp.html
+++ b/Doc/Manual/CSharp.html
@@ -55,7 +55,7 @@ The PInvoke interface has been chosen over Microsoft's Managed C++ interface as
 PInvoke is part of the ECMA/ISO C# specification.
 It is also better suited for robust production environments due to the Managed C++ flaw called the
 <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dv_vstechart/html/vcconMixedDLLLoadingProblem.asp">Mixed DLL Loading Problem</a>.
-Swig C# works equally well on non-Microsoft operating systems such as Linux, Solaris and Apple Mac using
+SWIG C# works equally well on non-Microsoft operating systems such as Linux, Solaris and Apple Mac using
 <a href="http://www.mono-project.com/">Mono</a> and <a href="http://www.dotgnu.org/pnet.html">Portable.NET</a>.
 </p>
 
diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index 0e7ebf464..85b1ab5f5 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -537,7 +537,7 @@
 <ul>
 <li><a href="Allegrocl.html#Allegrocl_nn2">Basics</a>
 <ul>
-<li><a href="Allegrocl.html#Allegrocl_nn3">Running Swig</a>
+<li><a href="Allegrocl.html#Allegrocl_nn3">Running SWIG</a>
 <li><a href="Allegrocl.html#Allegrocl_nn4">Command Line Options</a>
 <li><a href="Allegrocl.html#Allegrocl_nn5">Inserting user code into generated files</a>
 </ul>
diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html
index cf7e8da2c..61b5ba7d6 100644
--- a/Doc/Manual/Guile.html
+++ b/Doc/Manual/Guile.html
@@ -814,7 +814,7 @@ Produces the following code at the top of the generated GOOPS guile-module
 <code>Module-primitive.scm</code> (with <i>primitive</i> replaced with whatever is given with the <code>-primsuffix</code>
 argument.  The code to load the <code>.so</code> library should be located in the <code>%scheme</code> directive, 
 which will then be added to the scmstub file.
-Swig will automatically generate the line <code>(use-modules (<i>Package</i> <i>Module-primitive</i>))</code>
+SWIG will automatically generate the line <code>(use-modules (<i>Package</i> <i>Module-primitive</i>))</code>
 into the GOOPS guile-module.  So if <i>Module-primitive.scm</i> is on the autoload path for guile, the
 <code>%goops</code> directive can be empty.  Otherwise, the <code>%goops</code> directive should contain 
 whatever code is needed to load the <i>Module-primitive.scm</i> file into guile.</p>
@@ -848,7 +848,7 @@ Produces the following code at the top of the generated GOOPS guile-module
 </li>
 
 <li><p><b>Module Linkage</b>: This is very similar to passive linkage with a scmstub file.
-Swig will also automatically generate the line <code>(use-modules 
+SWIG will also automatically generate the line <code>(use-modules 
 (<i>Package</i> <i>Module-primitive</i>))</code> into the GOOPS guile-module.  Again the <code>%goops</code>
 directive should contain whatever code is needed to get that module loaded into guile.</p>
 
diff --git a/Doc/Manual/Perl5.html b/Doc/Manual/Perl5.html
index 8f74bd1de..40500dc5a 100644
--- a/Doc/Manual/Perl5.html
+++ b/Doc/Manual/Perl5.html
@@ -112,7 +112,7 @@ options are found near the end of the chapter.
 
 
 <p>
-To build a Perl5 module, run Swig using the <tt>-perl</tt> option as
+To build a Perl5 module, run SWIG using the <tt>-perl</tt> option as
 follows :
 </p>
 
diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html
index de745e135..b9dcb83c5 100644
--- a/Doc/Manual/Php.html
+++ b/Doc/Manual/Php.html
@@ -101,7 +101,7 @@ also contain PHP5 class wrappers.
 </p>
 
 <p>
-Swig can generate PHP extensions from C++ libraries as well when
+SWIG can generate PHP extensions from C++ libraries as well when
 given the <tt>-c++</tt> option.  The support for C++ is discussed in
 more detail in <a href="#Php_nn2_6">section 27.2.6</a>.
 </p>
diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
index 8b359bda9..a739543df 100644
--- a/Doc/Manual/Python.html
+++ b/Doc/Manual/Python.html
@@ -1137,7 +1137,7 @@ simply represented as opaque values using an especial python container object:
 
 <div class="targetlang"><pre>
 &gt;&gt;&gt; print f
-&lt;Swig Object at _08a71808_p_FILE&gt;
+&lt;Swig Object of type 'FILE *' at 0xb7d6f470&gt;
 </pre></div>
 
 <p>
@@ -1147,7 +1147,7 @@ dereference the pointer from Python. Of course, that isn't much of a concern in
 </p>
 
 <p>
-In older versions of Swig (1.3.22 or older), pointers were represented
+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 retrieve it by casting the pointer object to a string:
@@ -1171,7 +1171,7 @@ integer:
 
 <p>
 However, the inverse operation is not possible, i.e., you can't build
-a Swig pointer object from a raw integer value.
+a SWIG pointer object from a raw integer value.
 </p>
 
 <p>
diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html
index 98fa315d0..643a6daec 100644
--- a/Doc/Manual/Ruby.html
+++ b/Doc/Manual/Ruby.html
@@ -7097,7 +7097,7 @@ being created. </div>
 with Ruby objects. The following functions may prove to be useful.
 (These functions plus many more can be found in <a href="http://www.rubycentral.com/book"><em>Programming
 Ruby</em></a>, by David Thomas and Andrew Hunt.)&nbsp;</p>
-<p>In addition, we list equivalent functions that Swig defines, which
+<p>In addition, we list equivalent functions that SWIG defines, which
 provide a language neutral conversion (these functions are defined for
 each swig language supported). &nbsp;If you are trying to create a swig
 file that will work under multiple languages, it is recommended you
@@ -7123,7 +7123,7 @@ across multiple languages.</p>
   <tbody>
     <tr>
       <th style="font-weight: bold;">RUBY</th>
-      <th style="font-weight: bold;">Swig</th>
+      <th style="font-weight: bold;">SWIG</th>
       <td></td>
     </tr>
     <tr>
diff --git a/Doc/Manual/SWIGPlus.html b/Doc/Manual/SWIGPlus.html
index ef7487ff8..f3befa54b 100644
--- a/Doc/Manual/SWIGPlus.html
+++ b/Doc/Manual/SWIGPlus.html
@@ -3471,7 +3471,7 @@ instead:
 
 <p>
 In this case, the default and conversion constructors have the same
-name. Hence, Swig will overload them and define an unique visible
+name. Hence, SWIG will overload them and define an unique visible
 constructor, that will dispatch the proper call depending on the argument
 type.
 </p>
diff --git a/Examples/java/pointer/index.html b/Examples/java/pointer/index.html
index e20fe3328..5c93d4d58 100644
--- a/Examples/java/pointer/index.html
+++ b/Examples/java/pointer/index.html
@@ -143,7 +143,7 @@ extraction.
 
 <ul>
 <li> <a href="example.c">example.c</a>  (C Source)
-<li> <a href="example.i">example.i</a>  (Swig interface)
+<li> <a href="example.i">example.i</a>  (SWIG interface)
 <li> <a href="runme.java">runme.java</a>  (Java program)
 </ul>
 
diff --git a/Examples/perl5/pointer/index.html b/Examples/perl5/pointer/index.html
index 6f9fd397d..94467bc36 100644
--- a/Examples/perl5/pointer/index.html
+++ b/Examples/perl5/pointer/index.html
@@ -144,7 +144,7 @@ extraction.
 
 <ul>
 <li> <a href="example.c">example.c</a>  (C Source)
-<li> <a href="example.i">example.i</a>  (Swig interface)
+<li> <a href="example.i">example.i</a>  (SWIG interface)
 <li> <a href="runme.pl">runme.pl</a> (Perl Script)
 </ul>
 
diff --git a/Examples/python/pointer/index.html b/Examples/python/pointer/index.html
index ceef30566..b99c8fe4c 100644
--- a/Examples/python/pointer/index.html
+++ b/Examples/python/pointer/index.html
@@ -144,7 +144,7 @@ extraction.
 
 <ul>
 <li> <a href="example.c">example.c</a>  (C Source)
-<li> <a href="example.i">example.i</a>  (Swig interface)
+<li> <a href="example.i">example.i</a>  (SWIG interface)
 <li> <a href="example.py">example.py</a> (Python Script)
 </ul>
 
diff --git a/Examples/ruby/pointer/index.html b/Examples/ruby/pointer/index.html
index 2b9c40b35..c9d5b9c32 100644
--- a/Examples/ruby/pointer/index.html
+++ b/Examples/ruby/pointer/index.html
@@ -144,7 +144,7 @@ extraction.
 
 <ul>
 <li> <a href="example.c">example.c</a>  (C Source)
-<li> <a href="example.i">example.i</a>  (Swig interface)
+<li> <a href="example.i">example.i</a>  (SWIG interface)
 <li> <a href="runme.rb">runme.rb</a> (Ruby Script)
 </ul>
 
diff --git a/Examples/tcl/pointer/index.html b/Examples/tcl/pointer/index.html
index 874088a72..407380240 100644
--- a/Examples/tcl/pointer/index.html
+++ b/Examples/tcl/pointer/index.html
@@ -144,7 +144,7 @@ extraction.
 
 <ul>
 <li> <a href="example.c">example.c</a>  (C Source)
-<li> <a href="example.i">example.i</a>  (Swig interface)
+<li> <a href="example.i">example.i</a>  (SWIG interface)
 <li> <a href="runme.tcl">runme.tcl</a> (Tcl Script)
 </ul>
 
diff --git a/Lib/lua/luarun.swg b/Lib/lua/luarun.swg
index 32e1b1617..9bb45d577 100644
--- a/Lib/lua/luarun.swg
+++ b/Lib/lua/luarun.swg
@@ -79,7 +79,7 @@ typedef struct {
 /* this is the struct for wrapping arbitary packed binary data
 (currently it is only used for member function pointers)
 the data ordering is similar to swig_lua_userdata, but it is currently not possible
-to tell the two structures apart within Swig, other than by looking at the type
+to tell the two structures apart within SWIG, other than by looking at the type
 */
 typedef struct {
   swig_type_info   *type;
diff --git a/Lib/php/director.swg b/Lib/php/director.swg
index 6a9d4df3c..b28f6dbd9 100644
--- a/Lib/php/director.swg
+++ b/Lib/php/director.swg
@@ -168,7 +168,7 @@ namespace Swig {
   {
   public:
     DirectorPureVirtualException(const char* msg) 
-      : DirectorException(E_ERROR, "Swig director pure virtual method called", msg)
+      : DirectorException(E_ERROR, "SWIG director pure virtual method called", msg)
     { 
     }
 
@@ -182,7 +182,7 @@ namespace Swig {
   {
   public:
     DirectorMethodException(const char* msg = "") 
-      : DirectorException(E_ERROR, "Swig director method error", msg)
+      : DirectorException(E_ERROR, "SWIG director method error", msg)
     { 
     }
 
diff --git a/Lib/python/director.swg b/Lib/python/director.swg
index ba9144539..f3855babe 100644
--- a/Lib/python/director.swg
+++ b/Lib/python/director.swg
@@ -237,7 +237,7 @@ namespace Swig {
       try {
         throw;
       } catch (DirectorException& e) {
-        std::cerr << "Swig Director exception caught:" << std::endl
+        std::cerr << "SWIG Director exception caught:" << std::endl
                   << e.getMessage() << std::endl;
       } catch (std::exception& e) {
         std::cerr << "std::exception caught: "<< e.what() << std::endl;
@@ -276,12 +276,12 @@ namespace Swig {
   class DirectorTypeMismatchException : public Swig::DirectorException {
   public:
     DirectorTypeMismatchException(PyObject *error, const char* msg="") 
-      : Swig::DirectorException(error, "Swig director type mismatch", msg)
+      : Swig::DirectorException(error, "SWIG director type mismatch", msg)
     {
     }
 
     DirectorTypeMismatchException(const char* msg="") 
-      : Swig::DirectorException(PyExc_TypeError, "Swig director type mismatch", msg)
+      : Swig::DirectorException(PyExc_TypeError, "SWIG director type mismatch", msg)
     {
     }
 
@@ -300,7 +300,7 @@ namespace Swig {
   class DirectorMethodException : public Swig::DirectorException {
   public:
     DirectorMethodException(const char* msg = "") 
-      : DirectorException(PyExc_RuntimeError, "Swig director method error.", msg)
+      : DirectorException(PyExc_RuntimeError, "SWIG director method error.", msg)
     {
     }    
 
@@ -315,7 +315,7 @@ namespace Swig {
   {
   public:
     DirectorPureVirtualException(const char* msg = "") 
-      : DirectorException(PyExc_RuntimeError, "Swig director pure virtual method called", msg)
+      : DirectorException(PyExc_RuntimeError, "SWIG director pure virtual method called", msg)
     { 
     }
 
diff --git a/Lib/ruby/director.swg b/Lib/ruby/director.swg
index 9a6371ad9..76969cadc 100644
--- a/Lib/ruby/director.swg
+++ b/Lib/ruby/director.swg
@@ -176,7 +176,7 @@ namespace Swig {
       try {
 	throw;
       } catch (DirectorException& e) {
-	std::cerr << "Swig Director exception caught:" << std::endl
+	std::cerr << "SWIG Director exception caught:" << std::endl
 		  << e.getMessage() << std::endl;
       } catch (std::exception& e) {
 	std::cerr << "std::exception caught: "<< e.what() << std::endl;
@@ -212,12 +212,12 @@ namespace Swig {
   class DirectorTypeMismatchException : public Swig::DirectorException {
   public:
     DirectorTypeMismatchException(VALUE error, const char *msg="")
-      : Swig::DirectorException(error, "Swig director type mismatch", msg) 
+      : Swig::DirectorException(error, "SWIG director type mismatch", msg) 
     {
     }
 
     DirectorTypeMismatchException(const char *msg="")
-      : Swig::DirectorException(rb_eTypeError, "Swig director type mismatch", msg) 
+      : Swig::DirectorException(rb_eTypeError, "SWIG director type mismatch", msg) 
     {
     }
 
@@ -238,7 +238,7 @@ namespace Swig {
     }
 
     DirectorMethodException(const char* msg = "") 
-      : Swig::DirectorException(rb_eRuntimeError, "Swig director method error.", msg) {
+      : Swig::DirectorException(rb_eRuntimeError, "SWIG director method error.", msg) {
     }
     
     static void raise(VALUE error)
@@ -252,7 +252,7 @@ namespace Swig {
   {
   public:
     DirectorPureVirtualException(const char* msg = "") 
-      : DirectorException(rb_eRuntimeError, "Swig director pure virtual method called", msg)
+      : DirectorException(rb_eRuntimeError, "SWIG director pure virtual method called", msg)
     { 
     }
 
diff --git a/Lib/tcl/typemaps.i b/Lib/tcl/typemaps.i
index 7c9e04a8b..2a8f1064a 100644
--- a/Lib/tcl/typemaps.i
+++ b/Lib/tcl/typemaps.i
@@ -4,8 +4,8 @@
  *
  * typemaps.i
  *
- * Swig typemap library for Tcl8.  This file contains various sorts
- * of typemaps for modifying Swig's code generation.
+ * SWIG typemap library for Tcl8.  This file contains various sorts
+ * of typemaps for modifying SWIG's code generation.
  * ----------------------------------------------------------------------------- */
 
 #if !defined(SWIG_USE_OLD_TYPEMAPS)
diff --git a/Lib/typemaps/fragments.swg b/Lib/typemaps/fragments.swg
index 6d3e20223..ef6a346cc 100644
--- a/Lib/typemaps/fragments.swg
+++ b/Lib/typemaps/fragments.swg
@@ -444,15 +444,15 @@ SWIG_AsVal_dec(Type)(SWIG_Object obj, Type *val)
 
 %define %ensure_fragment(Fragment)
 %fragment(`Fragment`,"header") {
-%#error "Swig language implementation must provide the Fragment fragment"
+%#error "SWIG language implementation must provide the Fragment fragment"
 }
 %enddef
 
 %define %ensure_type_fragments(Type)
 %fragment(SWIG_From_frag(Type),"header") {
-%#error "Swig language implementation must provide a SWIG_From_frag(Type) fragment"
+%#error "SWIG language implementation must provide a SWIG_From_frag(Type) fragment"
 }
 %fragment(SWIG_AsVal_frag(Type),"header") {
-%#error "Swig language implementation must provide a SWIG_AsVal_frag(Type) fragment"
+%#error "SWIG language implementation must provide a SWIG_AsVal_frag(Type) fragment"
 }
 %enddef
diff --git a/Lib/typemaps/swigmacros.swg b/Lib/typemaps/swigmacros.swg
index 928f4ec0c..e95e7af92 100644
--- a/Lib/typemaps/swigmacros.swg
+++ b/Lib/typemaps/swigmacros.swg
@@ -20,7 +20,7 @@
   Casting Operations:
   -------------------
   
-  Swig provides the following casting macros, which implement the
+  SWIG provides the following casting macros, which implement the
   corresponding C++ casting operations:
 
     %const_cast(a, Type)         const_cast<Type >(a)			       
@@ -173,7 +173,7 @@ nocppval
 #endif /* __cplusplus */
 
 /* -----------------------------------------------------------------------------
- * Swig names and mangling
+ * SWIG names and mangling
  * ----------------------------------------------------------------------------- */
 
 #define %mangle(Type...)                  #@Type
@@ -210,7 +210,7 @@ nocppval
 %define %formacro_2(macro,...)%_formacro_2(macro, __VA_ARGS__, __fordone__)%enddef
 
 /* -----------------------------------------------------------------------------
- * Swig flags
+ * SWIG flags
  * ----------------------------------------------------------------------------- */
 
 /* 
diff --git a/Source/Modules/modula3.cxx b/Source/Modules/modula3.cxx
index b14dddd22..7440d906a 100644
--- a/Source/Modules/modula3.cxx
+++ b/Source/Modules/modula3.cxx
@@ -81,7 +81,7 @@ char cvsroot_modula3_cxx[] = "$Id$";
      that assign special purposes to the array types.
    - Can one interpret $n_basetype as the identifier matched with SWIGTYPE ?
 
-  Swig's odds:
+  SWIG's odds:
    - arguments of type (Node *) for SWIG functions
      should be most often better (const Node *):
      Swig_symbol_qualified, Getattr, nodeType, parentNode
diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c
index 81646171a..7958b4e09 100644
--- a/Source/Preprocessor/cpp.c
+++ b/Source/Preprocessor/cpp.c
@@ -1648,7 +1648,7 @@ String *Preprocessor_parse(String *s) {
       state = 0;
       break;
 
-      /* Swig directives  */
+      /* SWIG directives  */
     case 100:
       /* %{,%} block  */
       if (c == '{') {
@@ -1713,7 +1713,7 @@ String *Preprocessor_parse(String *s) {
     case 110:
       if (!isidchar(c)) {
 	Ungetc(c, s);
-	/* Look for common Swig directives  */
+	/* Look for common SWIG directives  */
 	if (Equal(decl, kpp_dinclude) || Equal(decl, kpp_dimport) || Equal(decl, kpp_dextern)) {
 	  /* Got some kind of file inclusion directive  */
 	  if (allow) {