From ea2e615cec87a469850605c6eda4f966ec1450da Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 12 May 2013 13:18:01 +0100 Subject: [PATCH] Fix some typos in directive names --- Doc/Manual/Allegrocl.html | 4 ++-- Doc/Manual/Lua.html | 2 +- Doc/Manual/Varargs.html | 2 +- Lib/typemaps/implicit.swg | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Doc/Manual/Allegrocl.html b/Doc/Manual/Allegrocl.html index 283ff7e2c..12b915ee2 100644 --- a/Doc/Manual/Allegrocl.html +++ b/Doc/Manual/Allegrocl.html @@ -1613,7 +1613,7 @@ opoverload>

Variable length argument lists are not supported, by default. If such a function is encountered, a warning will generated to - stderr. Varargs are supported via the SWIG %vararg + stderr. Varargs are supported via the SWIG %varargs directive. This directive allows you to specify a (finite) argument list which will be inserted into the wrapper in place of the variable length argument indicator. As an example, @@ -1624,7 +1624,7 @@ opoverload>

See the following section on Variable Length arguments - provides examples on how %vararg can be used, along + provides examples on how %varargs can be used, along with other ways such functions can be wrapped.

diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html index 1fd41f907..88d26f385 100644 --- a/Doc/Manual/Lua.html +++ b/Doc/Manual/Lua.html @@ -1359,7 +1359,7 @@ extern void sort_double(double* arr, int len); to create an array in C/C++ then this can be filled within Lua and passed into the function. It works, but it's a bit tedious. More details can be found in the carrays.i documentation.

-

The second and more intuitive way, would be to pass a Lua table directly into the function, and have SWIG automatically convert between Lua-table and C-array. Within the <typemaps.i> file there are typemaps ready written to perform this task. To use them is again a matter of using %appy in the correct manner.

+

The second and more intuitive way, would be to pass a Lua table directly into the function, and have SWIG automatically convert between Lua-table and C-array. Within the <typemaps.i> file there are typemaps ready written to perform this task. To use them is again a matter of using %apply in the correct manner.

The wrapper file below, shows both the use of carrays as well as the use of the typemap to wrap arrays.

diff --git a/Doc/Manual/Varargs.html b/Doc/Manual/Varargs.html index 13abc8cee..a580c83bd 100644 --- a/Doc/Manual/Varargs.html +++ b/Doc/Manual/Varargs.html @@ -398,7 +398,7 @@ int execlp(const char *path, const char *arg, ...);

-Note that str3 is the name of the last argument, as we have used %vargars with 3. +Note that str3 is the name of the last argument, as we have used %varargs with 3. Now execlp("a", "b", "c", "d", "e") will result in an error as one too many arguments has been passed, as now only 2 additional 'str' arguments can be passed with the 3rd one always using the specified default NULL.

diff --git a/Lib/typemaps/implicit.swg b/Lib/typemaps/implicit.swg index 24bb3dcce..702fb52b8 100644 --- a/Lib/typemaps/implicit.swg +++ b/Lib/typemaps/implicit.swg @@ -1,5 +1,5 @@ /* - The %implict macro allows a SwigType (Class) to be accepted + The %implicit macro allows a SwigType (Class) to be accepted as an input parameter and use its implicit constructors when needed. For example: