From c7e4c2d41884254d1a9e2ce8f288420e7f3419d5 Mon Sep 17 00:00:00 2001 From: Vladimir Kalinin Date: Wed, 22 Jul 2015 15:40:13 +0300 Subject: [PATCH] refactoring: 2 ways of ignoring symbol in add_symbols() merged for clarity --- Source/CParse/parser.y | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index aa8ab789c..26e6549c5 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -463,20 +463,18 @@ static void add_symbols(Node *n) { SetFlag(n,"feature:ignore"); } } - if (only_csymbol || GetFlag(n,"feature:ignore")) { + if (only_csymbol || GetFlag(n,"feature:ignore") || strncmp(Char(symname),"$ignore",7) == 0) { /* Only add to C symbol table and continue */ Swig_symbol_add(0, n); - if (strncmp(Char(symname),"$ignore",7) == 0) - SetFlag(n,"feature:ignore"); - } else if (strncmp(Char(symname),"$ignore",7) == 0) { - char *c = Char(symname)+7; - SetFlag(n,"feature:ignore"); - if (strlen(c)) { - SWIG_WARN_NODE_BEGIN(n); - Swig_warning(0,Getfile(n), Getline(n), "%s\n",c+1); - SWIG_WARN_NODE_END(n); + if (strncmp(Char(symname),"$ignore",7) == 0) { + char *c = Char(symname) + 7; + SetFlag(n, "feature:ignore"); + if (strlen(c)) { + SWIG_WARN_NODE_BEGIN(n); + Swig_warning(0,Getfile(n), Getline(n), "%s\n",c+1); + SWIG_WARN_NODE_END(n); + } } - Swig_symbol_add(0, n); } else { Node *c; if ((wrn) && (Len(wrn))) {