fix SWIG naming convention

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11663 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2009-08-21 00:25:11 +00:00
commit 3932d02a2a
23 changed files with 43 additions and 43 deletions

View file

@ -14,7 +14,7 @@
<ul> <ul>
<li><a href="#Allegrocl_nn2">Basics</a> <li><a href="#Allegrocl_nn2">Basics</a>
<ul> <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_nn4">Command Line Options</a>
<li><a href="#Allegrocl_nn5">Inserting user code into generated files</a> <li><a href="#Allegrocl_nn5">Inserting user code into generated files</a>
</ul> </ul>
@ -138,7 +138,7 @@ to it.
<H2><a name="Allegrocl_nn2"></a>17.1 Basics</H2> <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> <p>

View file

@ -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. 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 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>. <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>. <a href="http://www.mono-project.com/">Mono</a> and <a href="http://www.dotgnu.org/pnet.html">Portable.NET</a>.
</p> </p>

View file

@ -537,7 +537,7 @@
<ul> <ul>
<li><a href="Allegrocl.html#Allegrocl_nn2">Basics</a> <li><a href="Allegrocl.html#Allegrocl_nn2">Basics</a>
<ul> <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_nn4">Command Line Options</a>
<li><a href="Allegrocl.html#Allegrocl_nn5">Inserting user code into generated files</a> <li><a href="Allegrocl.html#Allegrocl_nn5">Inserting user code into generated files</a>
</ul> </ul>

View file

@ -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> <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, 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. 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 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 <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> 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>
<li><p><b>Module Linkage</b>: This is very similar to passive linkage with a scmstub file. <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> (<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> directive should contain whatever code is needed to get that module loaded into guile.</p>

View file

@ -112,7 +112,7 @@ options are found near the end of the chapter.
<p> <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 : follows :
</p> </p>

View file

@ -101,7 +101,7 @@ also contain PHP5 class wrappers.
</p> </p>
<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 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>. more detail in <a href="#Php_nn2_6">section 27.2.6</a>.
</p> </p>

View file

@ -1137,7 +1137,7 @@ simply represented as opaque values using an especial python container object:
<div class="targetlang"><pre> <div class="targetlang"><pre>
&gt;&gt;&gt; print f &gt;&gt;&gt; print f
&lt;Swig Object at _08a71808_p_FILE&gt; &lt;Swig Object of type 'FILE *' at 0xb7d6f470&gt;
</pre></div> </pre></div>
<p> <p>
@ -1147,7 +1147,7 @@ dereference the pointer from Python. Of course, that isn't much of a concern in
</p> </p>
<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 using a plain string object. If you have an old package that still
requires that representation, or you just feel nostalgic, you can requires that representation, or you just feel nostalgic, you can
always retrieve it by casting the pointer object to a string: always retrieve it by casting the pointer object to a string:
@ -1171,7 +1171,7 @@ integer:
<p> <p>
However, the inverse operation is not possible, i.e., you can't build 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>
<p> <p>

View file

@ -7097,7 +7097,7 @@ being created. </div>
with Ruby objects. The following functions may prove to be useful. 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 (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> 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 provide a language neutral conversion (these functions are defined for
each swig language supported). &nbsp;If you are trying to create a swig each swig language supported). &nbsp;If you are trying to create a swig
file that will work under multiple languages, it is recommended you file that will work under multiple languages, it is recommended you
@ -7123,7 +7123,7 @@ across multiple languages.</p>
<tbody> <tbody>
<tr> <tr>
<th style="font-weight: bold;">RUBY</th> <th style="font-weight: bold;">RUBY</th>
<th style="font-weight: bold;">Swig</th> <th style="font-weight: bold;">SWIG</th>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>

View file

@ -3471,7 +3471,7 @@ instead:
<p> <p>
In this case, the default and conversion constructors have the same 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 constructor, that will dispatch the proper call depending on the argument
type. type.
</p> </p>

View file

@ -143,7 +143,7 @@ extraction.
<ul> <ul>
<li> <a href="example.c">example.c</a> (C Source) <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) <li> <a href="runme.java">runme.java</a> (Java program)
</ul> </ul>

View file

@ -144,7 +144,7 @@ extraction.
<ul> <ul>
<li> <a href="example.c">example.c</a> (C Source) <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) <li> <a href="runme.pl">runme.pl</a> (Perl Script)
</ul> </ul>

View file

@ -144,7 +144,7 @@ extraction.
<ul> <ul>
<li> <a href="example.c">example.c</a> (C Source) <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) <li> <a href="example.py">example.py</a> (Python Script)
</ul> </ul>

View file

@ -144,7 +144,7 @@ extraction.
<ul> <ul>
<li> <a href="example.c">example.c</a> (C Source) <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) <li> <a href="runme.rb">runme.rb</a> (Ruby Script)
</ul> </ul>

View file

@ -144,7 +144,7 @@ extraction.
<ul> <ul>
<li> <a href="example.c">example.c</a> (C Source) <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) <li> <a href="runme.tcl">runme.tcl</a> (Tcl Script)
</ul> </ul>

View file

@ -79,7 +79,7 @@ typedef struct {
/* this is the struct for wrapping arbitary packed binary data /* this is the struct for wrapping arbitary packed binary data
(currently it is only used for member function pointers) (currently it is only used for member function pointers)
the data ordering is similar to swig_lua_userdata, but it is currently not possible 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 { typedef struct {
swig_type_info *type; swig_type_info *type;

View file

@ -168,7 +168,7 @@ namespace Swig {
{ {
public: public:
DirectorPureVirtualException(const char* msg) 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: public:
DirectorMethodException(const char* msg = "") DirectorMethodException(const char* msg = "")
: DirectorException(E_ERROR, "Swig director method error", msg) : DirectorException(E_ERROR, "SWIG director method error", msg)
{ {
} }

View file

@ -237,7 +237,7 @@ namespace Swig {
try { try {
throw; throw;
} catch (DirectorException& e) { } catch (DirectorException& e) {
std::cerr << "Swig Director exception caught:" << std::endl std::cerr << "SWIG Director exception caught:" << std::endl
<< e.getMessage() << std::endl; << e.getMessage() << std::endl;
} catch (std::exception& e) { } catch (std::exception& e) {
std::cerr << "std::exception caught: "<< e.what() << std::endl; std::cerr << "std::exception caught: "<< e.what() << std::endl;
@ -276,12 +276,12 @@ namespace Swig {
class DirectorTypeMismatchException : public Swig::DirectorException { class DirectorTypeMismatchException : public Swig::DirectorException {
public: public:
DirectorTypeMismatchException(PyObject *error, const char* msg="") 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="") 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 { class DirectorMethodException : public Swig::DirectorException {
public: public:
DirectorMethodException(const char* msg = "") 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: public:
DirectorPureVirtualException(const char* msg = "") DirectorPureVirtualException(const char* msg = "")
: DirectorException(PyExc_RuntimeError, "Swig director pure virtual method called", msg) : DirectorException(PyExc_RuntimeError, "SWIG director pure virtual method called", msg)
{ {
} }

View file

@ -176,7 +176,7 @@ namespace Swig {
try { try {
throw; throw;
} catch (DirectorException& e) { } catch (DirectorException& e) {
std::cerr << "Swig Director exception caught:" << std::endl std::cerr << "SWIG Director exception caught:" << std::endl
<< e.getMessage() << std::endl; << e.getMessage() << std::endl;
} catch (std::exception& e) { } catch (std::exception& e) {
std::cerr << "std::exception caught: "<< e.what() << std::endl; std::cerr << "std::exception caught: "<< e.what() << std::endl;
@ -212,12 +212,12 @@ namespace Swig {
class DirectorTypeMismatchException : public Swig::DirectorException { class DirectorTypeMismatchException : public Swig::DirectorException {
public: public:
DirectorTypeMismatchException(VALUE error, const char *msg="") 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="") 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 = "") 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) static void raise(VALUE error)
@ -252,7 +252,7 @@ namespace Swig {
{ {
public: public:
DirectorPureVirtualException(const char* msg = "") DirectorPureVirtualException(const char* msg = "")
: DirectorException(rb_eRuntimeError, "Swig director pure virtual method called", msg) : DirectorException(rb_eRuntimeError, "SWIG director pure virtual method called", msg)
{ {
} }

View file

@ -4,8 +4,8 @@
* *
* typemaps.i * typemaps.i
* *
* Swig typemap library for Tcl8. This file contains various sorts * SWIG typemap library for Tcl8. This file contains various sorts
* of typemaps for modifying Swig's code generation. * of typemaps for modifying SWIG's code generation.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
#if !defined(SWIG_USE_OLD_TYPEMAPS) #if !defined(SWIG_USE_OLD_TYPEMAPS)

View file

@ -444,15 +444,15 @@ SWIG_AsVal_dec(Type)(SWIG_Object obj, Type *val)
%define %ensure_fragment(Fragment) %define %ensure_fragment(Fragment)
%fragment(`Fragment`,"header") { %fragment(`Fragment`,"header") {
%#error "Swig language implementation must provide the Fragment fragment" %#error "SWIG language implementation must provide the Fragment fragment"
} }
%enddef %enddef
%define %ensure_type_fragments(Type) %define %ensure_type_fragments(Type)
%fragment(SWIG_From_frag(Type),"header") { %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") { %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 %enddef

View file

@ -20,7 +20,7 @@
Casting Operations: Casting Operations:
------------------- -------------------
Swig provides the following casting macros, which implement the SWIG provides the following casting macros, which implement the
corresponding C++ casting operations: corresponding C++ casting operations:
%const_cast(a, Type) const_cast<Type >(a) %const_cast(a, Type) const_cast<Type >(a)
@ -173,7 +173,7 @@ nocppval
#endif /* __cplusplus */ #endif /* __cplusplus */
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Swig names and mangling * SWIG names and mangling
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
#define %mangle(Type...) #@Type #define %mangle(Type...) #@Type
@ -210,7 +210,7 @@ nocppval
%define %formacro_2(macro,...)%_formacro_2(macro, __VA_ARGS__, __fordone__)%enddef %define %formacro_2(macro,...)%_formacro_2(macro, __VA_ARGS__, __fordone__)%enddef
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* Swig flags * SWIG flags
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
/* /*

View file

@ -81,7 +81,7 @@ char cvsroot_modula3_cxx[] = "$Id$";
that assign special purposes to the array types. that assign special purposes to the array types.
- Can one interpret $n_basetype as the identifier matched with SWIGTYPE ? - Can one interpret $n_basetype as the identifier matched with SWIGTYPE ?
Swig's odds: SWIG's odds:
- arguments of type (Node *) for SWIG functions - arguments of type (Node *) for SWIG functions
should be most often better (const Node *): should be most often better (const Node *):
Swig_symbol_qualified, Getattr, nodeType, parentNode Swig_symbol_qualified, Getattr, nodeType, parentNode

View file

@ -1648,7 +1648,7 @@ String *Preprocessor_parse(String *s) {
state = 0; state = 0;
break; break;
/* Swig directives */ /* SWIG directives */
case 100: case 100:
/* %{,%} block */ /* %{,%} block */
if (c == '{') { if (c == '{') {
@ -1713,7 +1713,7 @@ String *Preprocessor_parse(String *s) {
case 110: case 110:
if (!isidchar(c)) { if (!isidchar(c)) {
Ungetc(c, s); 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)) { if (Equal(decl, kpp_dinclude) || Equal(decl, kpp_dimport) || Equal(decl, kpp_dextern)) {
/* Got some kind of file inclusion directive */ /* Got some kind of file inclusion directive */
if (allow) { if (allow) {