Skip to content

Commit

Permalink
fix SWIG naming convention
Browse files Browse the repository at this point in the history
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11663 626c5289-ae23-0410-ae9c-e8d60b6d4f22
  • Loading branch information
wsfulton committed Aug 21, 2009
1 parent 1be8bd5 commit 3932d02
Show file tree
Hide file tree
Showing 23 changed files with 43 additions and 43 deletions.
4 changes: 2 additions & 2 deletions Doc/Manual/Allegrocl.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <H1><a name="Allegrocl_nn1"></a>17 SWIG and Allegro Common Lisp</H1>
<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>
Expand Down Expand Up @@ -138,7 +138,7 @@ <H1><a name="Allegrocl_nn1"></a>17 SWIG and Allegro Common Lisp</H1>
<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>
Expand Down
2 changes: 1 addition & 1 deletion Doc/Manual/CSharp.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <H2><a name="csharp_introduction"></a>18.1 Introduction</H2>
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>

Expand Down
2 changes: 1 addition & 1 deletion Doc/Manual/Contents.html
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ <h3><a href="Allegrocl.html#Allegrocl">17 SWIG and Allegro Common Lisp</a></h3>
<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>
Expand Down
4 changes: 2 additions & 2 deletions Doc/Manual/Guile.html
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ <H3><a name="Guile_nn21"></a>20.10.2 Linking</H3>
<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>
Expand Down Expand Up @@ -848,7 +848,7 @@ <H3><a name="Guile_nn21"></a>20.10.2 Linking</H3>
</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>

Expand Down
2 changes: 1 addition & 1 deletion Doc/Manual/Perl5.html
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ <H2><a name="Perl5_nn3"></a>28.2 Preliminaries</H2>


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

Expand Down
2 changes: 1 addition & 1 deletion Doc/Manual/Php.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ <H2><a name="Php_nn1"></a>29.1 Generating PHP Extensions</H2>
</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>
Expand Down
6 changes: 3 additions & 3 deletions Doc/Manual/Python.html
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ <H3><a name="Python_nn18"></a>31.3.5 Pointers</H3>

<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>
Expand All @@ -1147,7 +1147,7 @@ <H3><a name="Python_nn18"></a>31.3.5 Pointers</H3>
</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:
Expand All @@ -1171,7 +1171,7 @@ <H3><a name="Python_nn18"></a>31.3.5 Pointers</H3>

<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>
Expand Down
4 changes: 2 additions & 2 deletions Doc/Manual/Ruby.html
Original file line number Diff line number Diff line change
Expand Up @@ -7097,7 +7097,7 @@ <H3><a name="Ruby_nn41"></a>32.7.8 Useful Functions</H3>
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
Expand All @@ -7123,7 +7123,7 @@ <H4><a name="Ruby_nn42"></a>32.7.8.1 C Datatypes to Ruby Objects</H4>
<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>
Expand Down
2 changes: 1 addition & 1 deletion Doc/Manual/SWIGPlus.html
Original file line number Diff line number Diff line change
Expand Up @@ -3471,7 +3471,7 @@ <H2><a name="SWIGPlus_nn30"></a>6.18 Templates</H2>

<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>
Expand Down
2 changes: 1 addition & 1 deletion Examples/java/pointer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ <h2>Example</h2>

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

Expand Down
2 changes: 1 addition & 1 deletion Examples/perl5/pointer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ <h2>Example</h2>

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

Expand Down
2 changes: 1 addition & 1 deletion Examples/python/pointer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ <h2>Example</h2>

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

Expand Down
2 changes: 1 addition & 1 deletion Examples/ruby/pointer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ <h2>Example</h2>

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

Expand Down
2 changes: 1 addition & 1 deletion Examples/tcl/pointer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ <h2>Example</h2>

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

Expand Down
2 changes: 1 addition & 1 deletion Lib/lua/luarun.swg
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Lib/php/director.swg
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
}

Expand All @@ -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)
{
}

Expand Down
10 changes: 5 additions & 5 deletions Lib/python/director.swg
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
{
}

Expand All @@ -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)
{
}

Expand All @@ -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)
{
}

Expand Down
10 changes: 5 additions & 5 deletions Lib/ruby/director.swg
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
{
}

Expand All @@ -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)
Expand All @@ -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)
{
}

Expand Down
4 changes: 2 additions & 2 deletions Lib/tcl/typemaps.i
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions Lib/typemaps/fragments.swg
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions Lib/typemaps/swigmacros.swg
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -173,7 +173,7 @@ nocppval
#endif /* __cplusplus */

/* -----------------------------------------------------------------------------
* Swig names and mangling
* SWIG names and mangling
* ----------------------------------------------------------------------------- */

#define %mangle(Type...) #@Type
Expand Down Expand Up @@ -210,7 +210,7 @@ nocppval
%define %formacro_2(macro,...)%_formacro_2(macro, __VA_ARGS__, __fordone__)%enddef

/* -----------------------------------------------------------------------------
* Swig flags
* SWIG flags
* ----------------------------------------------------------------------------- */

/*
Expand Down
2 changes: 1 addition & 1 deletion Source/Modules/modula3.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Source/Preprocessor/cpp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1648,7 +1648,7 @@ String *Preprocessor_parse(String *s) {
state = 0;
break;

/* Swig directives */
/* SWIG directives */
case 100:
/* %{,%} block */
if (c == '{') {
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 3932d02

Please sign in to comment.