better support for the %throws directive

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8350 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-01-10 17:19:22 +00:00
commit b044703d0d
5 changed files with 71 additions and 32 deletions

View file

@ -51,6 +51,7 @@ extern int SWIG_cparse_template_reduce(int treduce);
extern void Swig_cparse_replace_descriptor(String *s);
extern void cparse_normalize_void(Node *);
extern Parm *Swig_cparse_parm(String *s);
extern ParmList *Swig_cparse_parms(String *s);
/* templ.c */

View file

@ -1344,7 +1344,7 @@ static void default_arguments(Node *n) {
%token <ivalue> TEMPLATE
%token <str> OPERATOR
%token <str> COPERATOR
%token PARSETYPE PARSEPARM
%token PARSETYPE PARSEPARM PARSEPARMS
%left CAST
%left LOR
@ -1446,6 +1446,12 @@ program : interface {
| PARSEPARM error {
top = 0;
}
| PARSEPARMS LPAREN parms RPAREN SEMI {
top = $3;
}
| PARSEPARMS error SEMI {
top = 0;
}
;
interface : interface declaration {
@ -5744,6 +5750,23 @@ Parm *Swig_cparse_parm(String *s) {
}
ParmList *Swig_cparse_parms(String *s) {
String *ns;
char *cs = Char(s);
if (cs && cs[0] != '(') {
ns = NewStringf("(%s);",s);
} else {
ns = NewStringf("%s;",s);
}
Seek(ns,0,SEEK_SET);
scanner_file(ns);
top = 0;
scanner_next_token(PARSEPARMS);
yyparse();
/* Printf(stdout,"typeparse: '%s' ---> '%s'\n", s, top); */
return top;
}