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

Improve typemap method and attribute checking

Browse source 
Specifying a value on the typemap method now gives an error, e.g.:

%typemap(argout=123) char * ""

The old way of specifying a language name in the typemap attributes
is no longer supported (it has been deprecated for 16 years).

Closes #891
This commit is contained in:
Olly Betts 2022-03-03 18:42:20 +13:00
commit 9eb75a0c07
6 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Source/CParse/parser.y
View file

@ -2725,27 +2725,17 @@ typemap_directive : TYPEMAP LPAREN typemap_type RPAREN tm_list stringbrace {
typemap_type : kwargs {
String *name = Getattr($1, "name");
Hash *p = nextSibling($1);
if (p && (!Getattr(p,"value"))) {
/* this is the deprecated two argument typemap form */
Swig_warning(WARN_DEPRECATED_TYPEMAP_LANG,cparse_file, cparse_line,
"Specifying the language name in %%typemap is deprecated - use #ifdef SWIG<LANG> instead.\n");
/* two argument typemap form */
if (!name || (Strcmp(name,typemap_lang))) {
name = 0;
p = 0;
} else {
name = Getattr(p,"name");
p = nextSibling(p);
}
} else {
/* one-argument typemap-form */
}
$$.method = name;
$$.kwargs = p;
if (Getattr($1, "value")) {
Swig_error(cparse_file, cparse_line,
"%%typemap method shouldn't have a value specified.\n");
}
while (p) {
if (!Getattr(p, "value")) {
Swig_error(cparse_file, cparse_line,
"%%typemap argument '%s' is missing value\n", Getattr(p, "name"));
"%%typemap attribute '%s' is missing its value. If this is specifying the target language, that's no longer supported: use #ifdef SWIG<LANG> instead.\n",
Getattr(p, "name"));
/* Set to empty value to avoid segfaults later. */
Setattr(p, "value", NewStringEmpty());
}

2
Source/Include/swigwarn.h
View file

@ -52,7 +52,7 @@
#define WARN_DEPRECATED_NAME 121
#define WARN_DEPRECATED_NOEXTERN 122
#define WARN_DEPRECATED_NODEFAULT 123
#define WARN_DEPRECATED_TYPEMAP_LANG 124
/* Unused since 4.1.0: #define WARN_DEPRECATED_TYPEMAP_LANG 124 */
#define WARN_DEPRECATED_INPUT_FILE 125
#define WARN_DEPRECATED_NESTED_WORKAROUND 126