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

Another merge with master.

Browse source 
Change Doxygen error codes to start at 740 instead of at 720 as the latter was
taken by Scilab in the meanwhile.

Resolve conflicts in autodoc_runme.py once again.
This commit is contained in:
Vadim Zeitlin 2015-02-16 23:46:39 +01:00
commit 300ccce46c
419 changed files with 18675 additions and 1315 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Swig/cwrap.c
View file

@ -1614,7 +1614,14 @@ int Swig_VargetToFunction(Node *n, int flags) {
Delete(mangled);
Delete(sname);
} else {
String *nname = SwigType_namestr(name);
String *nname = 0;
if (Equal(nodeType(n), "constant")) {
String *rawval = Getattr(n, "rawval");
String *value = rawval ? rawval : Getattr(n, "value");
nname = NewStringf("(%s)", value);
} else {
nname = SwigType_namestr(name);
}
call = Swig_wrapped_var_assign(type, nname, varcref);
cres = Swig_cresult(ty, Swig_cresult_name(), call);
Setattr(n, "wrap:action", cres);

3
Source/Swig/scanner.c
View file

@ -824,6 +824,9 @@ static int look(Scanner *s) {
state = 7;
} else if (c == '=') {
return SWIG_TOKEN_MODEQUAL;
} else if (c == '}') {
Swig_error(cparse_file, cparse_line, "Syntax error. Extraneous '%%}'\n");
exit(1);
} else {
retract(s, 1);
return SWIG_TOKEN_PERCENT;

12
Source/Swig/symbol.c
View file

@ -1875,15 +1875,15 @@ ParmList *Swig_symbol_template_defargs(Parm *parms, Parm *targs, Symtab *tscope,
Delete(ntq);
ntq = ty;
}
/* Printf(stderr,"value %s %s %s\n",value,ntr,ntq); */
cp = NewParmWithoutFileLineInfo(ntq, 0);
if (lp)
set_nextSibling(lp, cp);
else
expandedparms = CopyParm(cp);
if (lp) {
set_nextSibling(lp, cp);
Delete(cp);
} else {
expandedparms = cp;
}
lp = cp;
tp = nextSibling(tp);
Delete(cp);
Delete(nt);
Delete(ntq);
} else {