jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression in 3.0.0 where legal code following an operator<< definition might give a syntax error.

Browse source 
SF Bug #1365.
This commit is contained in:
William S Fulton 2014-04-04 08:31:59 +01:00
commit 1d857beb9d
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 3.0.1 (in progress) Version 3.0.1 (in progress)
=========================== ===========================
2014-04-04: wsfulton
Fix regression in 3.0.0 where legal code following an operator<< definition might
give a syntax error. SF Bug #1365.
2014-04-03: olly 2014-04-03: olly
[PHP] Fix wrapping director constructors with default parameters [PHP] Fix wrapping director constructors with default parameters
with a ZTS-enabled build of PHP. with a ZTS-enabled build of PHP.

8
Examples/test-suite/cpp11_template_double_brackets.i
View file

@ -24,6 +24,14 @@ public:
int operator<<(ABC &) { return 0; } int operator<<(ABC &) { return 0; }
}; };
class DEF {
public:
int a;
int operator<<(DEF &) { return 0; }
int operator>>(DEF &) { return 0; }
};
template<class T> template<class T>
class ABC2 { class ABC2 {
public: public:

4
Source/Swig/scanner.c
View file

@ -543,8 +543,10 @@ static int look(Scanner * s) {
state = 220; state = 220;
else if (c == '}') else if (c == '}')
return SWIG_TOKEN_RBRACE; return SWIG_TOKEN_RBRACE;
else if (c == '{') else if (c == '{') {
Scanner_clear_brackets(s);
return SWIG_TOKEN_LBRACE; return SWIG_TOKEN_LBRACE;
}
else if (c == '=') else if (c == '=')
state = 33; state = 33;
else if (c == '+') else if (c == '+')