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

Modify fix for << in array size

Browse source 
The previous fix broke testcase arrays for Go.
This commit is contained in:
Olly Betts 2022-07-27 12:25:27 +12:00
commit 0ff9a0959a
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/swiglabels.swg
View file

@ -121,3 +121,8 @@
#ifdef __INTEL_COMPILER
# pragma warning disable 592
#endif
/* We replace `<<` with `SWIG_LSHIFT` in constant expressions to avoid
* confusing SWIG's type system into thinking there's a template.
*/
#define SWIG_LSHIFT <<

6
Source/CParse/parser.y
View file

@ -6803,7 +6803,11 @@ exprcompound : expr PLUS expr {
$$.type = promote($1.type,$3.type);
}
| expr LSHIFT expr {
$$.val = NewStringf("%s << %s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
/* To avoid confusing SWIG's type system, we replace `<<` with
* `SWIG_LSHIFT` here, then define the latter as a macro in
* the generated wrapper file.
*/
$$.val = NewStringf("%s SWIG_LSHIFT %s",COMPOUND_EXPR_VAL($1),COMPOUND_EXPR_VAL($3));
$$.type = promote_type($1.type);
}
| expr RSHIFT expr {

4
Source/Swig/typesys.c
View file

@ -1702,9 +1702,7 @@ void SwigType_remember_clientdata(const SwigType *t, const_String_or_char_ptr cl
if (t) {
char *ct = Char(t);
const char *lt = strchr(ct, '<');
/* Allow for `<<` operator in constant expression for array size. */
if (lt && lt[1] != '(' && lt[1] != '<') {
if (strchr(ct, '<') && !(strstr(ct, "<("))) {
Printf(stdout, "Bad template type passed to SwigType_remember: %s\n", t);
assert(0);
}