Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge trunk at commit '8728a97dc60417e4c5599349d06cd1c408f14a7d' into…

… travis-osx

* commit '8728a97dc60417e4c5599349d06cd1c408f14a7d':
  Bump version to 3.0.3
  Fix function naming conflict with class overloads.
  • Loading branch information...
commit eb0c404eaae0068f10bf3f481b0e0b9cce184713 2 parents 3449b39 + 8728a97
@wsfulton wsfulton authored
View
8 ANNOUNCE
@@ -1,8 +1,8 @@
-*** ANNOUNCE: SWIG 3.0.2 (4 Jun 2014) ***
+*** ANNOUNCE: SWIG 3.0.3 (in progress) ***
http://www.swig.org
-We're pleased to announce SWIG-3.0.2, the latest SWIG release.
+We're pleased to announce SWIG-3.0.3, the latest SWIG release.
What is SWIG?
=============
@@ -21,11 +21,11 @@ Availability
============
The release is available for download on Sourceforge at
- http://prdownloads.sourceforge.net/swig/swig-3.0.2.tar.gz
+ http://prdownloads.sourceforge.net/swig/swig-3.0.3.tar.gz
A Windows version is also available at
- http://prdownloads.sourceforge.net/swig/swigwin-3.0.2.zip
+ http://prdownloads.sourceforge.net/swig/swigwin-3.0.3.zip
Please report problems with this release to the swig-devel mailing list,
details at http://www.swig.org/mail.html.
View
20 CHANGES
@@ -3,6 +3,26 @@ SWIG (Simplified Wrapper and Interface Generator)
See the CHANGES.current file for changes in the current version.
See the RELEASENOTES file for a summary of changes in each release.
+Version 3.0.2 (4 Jun 2014)
+==========================
+
+2014-06-02: v-for-vandal
+ [Lua] Pull request #176:
+ If class has no __eq implemented, then default __eq is generated.
+ Default __eq compares actual pointers stored inside Lua userdata.
+
+2014-06-02: vkalinin
+ Fix #183 - %extend and unnamed nested structs
+
+2014-05-28: kwwette
+ Fix install failure when using an 'out of source' build using the shipped
+ tarball - regression introduced in swig-3.0.1.
+
+2014-05-24: kwwette
+ [Octave] Remove deprecated -global/-noglobal command-line arguments
+
+ *** POTENTIAL INCOMPATIBILITY ***
+
Version 3.0.1 (27 May 2014)
===========================
View
18 CHANGES.current
@@ -2,22 +2,6 @@ Below are the changes for the current release.
See the CHANGES file for changes in older releases.
See the RELEASENOTES file for a summary of changes in each release.
-Version 3.0.2 (4 Jun 2014)
+Version 3.0.3 (in progress)
===========================
-2014-06-02: v-for-vandal
- [Lua] Pull request #176:
- If class has no __eq implemented, then default __eq is generated.
- Default __eq compares actual pointers stored inside Lua userdata.
-
-2014-06-02: vkalinin
- Fix #183 - %extend and unnamed nested structs
-
-2014-05-28: kwwette
- Fix install failure when using an 'out of source' build using the shipped
- tarball - regression introduced in swig-3.0.1.
-
-2014-05-24: kwwette
- [Octave] Remove deprecated -global/-noglobal command-line arguments
-
- *** POTENTIAL INCOMPATIBILITY ***
View
2  Doc/Manual/Sections.html
@@ -6,7 +6,7 @@
<body bgcolor="#ffffff">
<H1><a name="Sections"></a>SWIG-3.0 Documentation</H1>
-Last update : SWIG-3.0.2 (4 Jun 2014)
+Last update : SWIG-3.0.3 (in progress)
<H2>Sections</H2>
View
2  README
@@ -1,6 +1,6 @@
SWIG (Simplified Wrapper and Interface Generator)
-Version: 3.0.2 (4 Jun 2014)
+Version: 3.0.3 (in progress)
Tagline: SWIG is a compiler that integrates C and C++ with languages
including Perl, Python, Tcl, Ruby, PHP, Java, C#, D, Go, Lua,
View
15 Source/Modules/javascript.cxx
@@ -1231,18 +1231,27 @@ int JSEmitter::emitFunctionDispatcher(Node *n, bool /*is_member */ ) {
// substract the extension "sym:overname",
String *wrap_name = NewString(Getattr(n, "wrap:name"));
String *overname = Getattr(n, "sym:overname");
+
+ Node *methodclass = Swig_methodclass(n);
+ String *class_name = Getattr(methodclass, "sym:name");
+
int l1 = Len(wrap_name);
int l2 = Len(overname);
Delslice(wrap_name, l1 - l2, l1);
- Setattr(n, "wrap:name", wrap_name);
- state.function(WRAPPER_NAME, wrap_name);
+ String *new_string = NewStringf("%s_%s", class_name, wrap_name);
+ String *final_wrap_name = Swig_name_wrapper(new_string);
+
+ Setattr(n, "wrap:name", final_wrap_name);
+ state.function(WRAPPER_NAME, final_wrap_name);
+
+
t_function.replace("$jslocals", wrapper->locals)
.replace("$jscode", wrapper->code);
// call this here, to replace all variables
- t_function.replace("$jswrapper", wrap_name)
+ t_function.replace("$jswrapper", final_wrap_name)
.replace("$jsname", state.function(NAME))
.pretty_print(f_wrappers);
View
2  configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl The macros which aren't shipped with the autotools are stored in the
dnl Tools/config directory in .m4 files.
-AC_INIT([swig],[3.0.2],[http://www.swig.org])
+AC_INIT([swig],[3.0.3],[http://www.swig.org])
dnl NB: When this requirement is increased to 2.60 or later, AC_PROG_SED
dnl definition below can be removed
Please sign in to comment.
Something went wrong with that request. Please try again.