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

Allow templates to be instantiated using negative numbers and constant

Browse source 
expressions (which fixes SF bug #956282 and several others).


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9309 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2006-09-20 11:20:52 +00:00
commit ea75f3a1c3
3 changed files with 47 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SWIG/CHANGES.current
View file

@ -1,6 +1,14 @@
Version 1.3.30 (in progress) Version 1.3.30 (in progress)
============================ ============================
09/20/2006: olly
[ALL] Templates can now be instantiated using negative numbers and
constant expressions, e.g.:
template<int q> class x {};
%template(x_minus1) x<-1>;
%template(x_1plus2) x<1+2>;
09/20/2006: olly 09/20/2006: olly
[ALL] Treat a nested class definition as a forward declaration rather [ALL] Treat a nested class definition as a forward declaration rather
than ignoring it completely, so that we generate correct code for than ignoring it completely, so that we generate correct code for

3
SWIG/Examples/test-suite/template_expr.i
View file

@ -23,7 +23,8 @@ class X {};
%template(X_1) X<1>; %template(X_1) X<1>;
%template(X_m1) X<-1>; %template(X_m1) X<-1>;
%template(X_1plus2) X<1+2>;
%template(X_1024div8) X<1024/8>;
// bug 1338527 // bug 1338527

79
SWIG/Source/CParse/parser.y
View file

@ -336,10 +336,10 @@ static void add_symbols(Node *n) {
} else { } else {
/* private are needed only when they are pure virtuals */ /* private are needed only when they are pure virtuals */
Setattr(n,k_access, "private"); Setattr(n,k_access, "private");
if ((Cmp(Getattr(n,k_storage),"virtual") == 0) if ((Cmp(Getattr(n,k_storage),"virtual") == 0)
&& (Cmp(Getattr(n,k_value),"0") == 0)) { && (Cmp(Getattr(n,k_value),"0") == 0)) {
only_csymbol = !Swig_need_protected(n); only_csymbol = !Swig_need_protected(n);
} }
} }
if (only_csymbol) { if (only_csymbol) {
/* Only add to C symbol table and continue */ /* Only add to C symbol table and continue */
@ -1440,7 +1440,7 @@ static void default_arguments(Node *n) {
%type <type> type rawtype type_right ; %type <type> type rawtype type_right ;
%type <bases> base_list inherit raw_inherit; %type <bases> base_list inherit raw_inherit;
%type <dtype> definetype def_args etype; %type <dtype> definetype def_args etype;
%type <dtype> expr exprnum exprcompound ; %type <dtype> expr exprnum exprcompound valexpr;
%type <id> ename ; %type <id> ename ;
%type <id> template_decl; %type <id> template_decl;
%type <str> type_qualifier ; %type <str> type_qualifier ;
@ -4432,24 +4432,16 @@ valparm : parm {
} }
} }
} }
} }
| exprnum { | valexpr {
$$ = NewParm(0,0); $$ = NewParm(0,0);
Setfile($$,cparse_file); Setfile($$,cparse_file);
Setline($$,cparse_line); Setline($$,cparse_line);
Setattr($$,k_value,$1.val); Setattr($$,k_value,$1.val);
} }
| STRING {
String *v = NewString($1);
$$ = NewParm(0,0);
Setfile($$,cparse_file);
Setline($$,cparse_line);
Setattr($$,k_value,v);
Delete(v);
}
; ;
def_args : EQUAL definetype { def_args : EQUAL definetype {
$$ = $2; $$ = $2;
if ($2.type == T_ERROR) { if ($2.type == T_ERROR) {
@ -5272,29 +5264,7 @@ etype : expr {
this does allow us to parse many constant declarations. this does allow us to parse many constant declarations.
*/ */
expr : exprnum { $$ = $1; } expr : valexpr { $$ = $1; }
| string {
$$.val = NewString($1);
$$.type = T_STRING;
}
| SIZEOF LPAREN type parameter_declarator RPAREN {
SwigType_push($3,$4.type);
$$.val = NewStringf("sizeof(%s)",SwigType_str($3,0));
$$.type = T_ULONG;
}
| exprcompound { $$ = $1; }
| CHARCONST {
$$.val = NewString($1);
if (Len($$.val)) {
$$.rawval = NewStringf("\'%(escape)s\'", $$.val);
} else {
$$.rawval = NewString("\'\\0'");
}
$$.type = T_CHAR;
$$.bitfield = 0;
$$.throws = 0;
$$.throwf = 0;
}
| type { | type {
Node *n; Node *n;
$$.val = $1; $$.val = $1;
@ -5312,6 +5282,31 @@ expr : exprnum { $$ = $1; }
} }
} }
} }
;
valexpr : exprnum { $$ = $1; }
| string {
$$.val = NewString($1);
$$.type = T_STRING;
}
| SIZEOF LPAREN type parameter_declarator RPAREN {
SwigType_push($3,$4.type);
$$.val = NewStringf("sizeof(%s)",SwigType_str($3,0));
$$.type = T_ULONG;
}
| exprcompound { $$ = $1; }
| CHARCONST {
$$.val = NewString($1);
if (Len($$.val)) {
$$.rawval = NewStringf("\'%(escape)s\'", $$.val);
} else {
$$.rawval = NewString("\'\\0'");
}
$$.type = T_CHAR;
$$.bitfield = 0;
$$.throws = 0;
$$.throwf = 0;
}
/* grouping */ /* grouping */
| LPAREN expr RPAREN %prec CAST { | LPAREN expr RPAREN %prec CAST {
@ -5412,14 +5407,14 @@ exprcompound : expr PLUS expr {
$$.val = NewStringf("%s||%s",$1.val,$3.val); $$.val = NewStringf("%s||%s",$1.val,$3.val);
$$.type = T_INT; $$.type = T_INT;
} }
| MINUS expr %prec UMINUS { | MINUS expr %prec UMINUS {
$$.val = NewStringf("-%s",$2.val); $$.val = NewStringf("-%s",$2.val);
$$.type = $2.type; $$.type = $2.type;
} }
| PLUS expr %prec UMINUS { | PLUS expr %prec UMINUS {
$$.val = NewStringf("+%s",$2.val); $$.val = NewStringf("+%s",$2.val);
$$.type = $2.type; $$.type = $2.type;
} }
| NOT expr { | NOT expr {
$$.val = NewStringf("~%s",$2.val); $$.val = NewStringf("~%s",$2.val);
$$.type = $2.type; $$.type = $2.type;