diff options
| -rw-r--r-- | CHANGES.current | 3 | ||||
| -rw-r--r-- | Source/CParse/parser.y | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES.current b/CHANGES.current index 897ff53c4..50f3decd1 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 3.0.0 (in progress) ============================ +2014-02-21: wsfulton + [PHP] Fix warning suppression using %warnfilter for PHP reserved class names. + 2014-02-19: olly [Lua] Add keyword warnings for Lua keywords and Basic Functions. diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index dd8de45ff..1bd351560 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -3488,6 +3488,7 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE { Setattr($<node>$, "nested:outer", currentOuterClass); set_access_mode($<node>$); } + Swig_features_get(Swig_cparse_features(), Namespaceprefix, Getattr($<node>$, "name"), 0, $<node>$); /* save yyrename to the class attribute, to be used later in add_symbols()*/ Setattr($<node>$, "class_rename", make_name($<node>$, $3, 0)); Setattr($<node>$, "Classprefix", $3); @@ -3631,7 +3632,6 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE { Delattr($<node>$, "Classprefix"); Delete(Namespaceprefix); Namespaceprefix = Swig_symbol_qualifiedscopename(0); - Swig_features_get(Swig_cparse_features(), Namespaceprefix, Getattr($$, "name"), 0, $$); if (cplus_mode == CPLUS_PRIVATE) { $$ = 0; /* skip private nested classes */ } else if (cparse_cplusplus && currentOuterClass && ignore_nested_classes && !GetFlag($$, "feature:flatnested")) { @@ -3712,6 +3712,8 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE { Setattr($<node>$, "nested:outer", currentOuterClass); set_access_mode($<node>$); } + Swig_features_get(Swig_cparse_features(), Namespaceprefix, 0, 0, $<node>$); + /* save yyrename to the class attribute, to be used later in add_symbols()*/ Setattr($<node>$, "class_rename", make_name($<node>$,0,0)); if (strcmp($2,"class") == 0) { cplus_mode = CPLUS_PRIVATE; @@ -3745,7 +3747,6 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE { /* Check for pure-abstract class */ Setattr($$,"abstracts", pure_abstracts($6)); n = $8; - Swig_features_get(Swig_cparse_features(), Namespaceprefix, 0, 0, $$); if (cparse_cplusplus && currentOuterClass && ignore_nested_classes && !GetFlag($$, "feature:flatnested")) { String *name = n ? Copy(Getattr(n, "name")) : 0; $$ = nested_forward_declaration($1, $2, 0, name, n); |