XS-MLVP
/
swig
mirror of https://github.com/swig/swig
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't treat `restrict' as a reserved identifier in C++ mode. 

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9674 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2007-04-16 16:42:00 +00:00
parent e6611209f6
commit 07ae5a2aca
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.current
View File

@ -1,6 +1,9 @@
Version 1.3.32 (in progress) Version 1.3.32 (in progress)
============================ ============================
04/16/2007: olly
Don't treat `restrict' as a reserved identifier in C++ mode.
04/16/2007: olly 04/16/2007: olly
[PHP5] Fix how zend_throw_exception() is called (bug #1700785). [PHP5] Fix how zend_throw_exception() is called (bug #1700785).

1
Examples/test-suite/common.mk
View File

@ -220,6 +220,7 @@ CPP_TEST_CASES += \
reference_global_vars \ reference_global_vars \
register_par \ register_par \
rename_scope \ rename_scope \
restrict_cplusplus \
return_const_value \ return_const_value \
return_value_scope \ return_value_scope \
rname \ rname \

7
Examples/test-suite/restrict_cplusplus.i Normal file
View File

@ -0,0 +1,7 @@
%module restrict_cplusplus
%inline %{
struct foo {
int restrict;
};
%}

6
Source/CParse/cscanner.c
View File

@ -751,8 +751,6 @@ int yylex(void) {
return (yylex()); return (yylex());
if (strcmp(yytext, "mutable") == 0) if (strcmp(yytext, "mutable") == 0)
return (yylex()); return (yylex());
if (strcmp(yytext, "restrict") == 0)
return (yylex());
if (strcmp(yytext, "explicit") == 0) if (strcmp(yytext, "explicit") == 0)
return (EXPLICIT); return (EXPLICIT);
if (strcmp(yytext, "export") == 0) if (strcmp(yytext, "export") == 0)
@ -780,6 +778,8 @@ int yylex(void) {
yylval.type = NewSwigType(T_COMPLEX); yylval.type = NewSwigType(T_COMPLEX);
return (TYPE_COMPLEX); return (TYPE_COMPLEX);
} }
if (strcmp(yytext, "restrict") == 0)
return (yylex());
} }
/* Misc keywords */ /* Misc keywords */
@ -812,8 +812,6 @@ int yylex(void) {
return (REGISTER); return (REGISTER);
if (strcmp(yytext, "inline") == 0) if (strcmp(yytext, "inline") == 0)
return (yylex()); return (yylex());
if (strcmp(yytext, "restrict") == 0)
return (yylex());
/* SWIG directives */ /* SWIG directives */
} else { } else {