mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default argument patch from Fabien Constantini.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2207 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-05-12 01:02:17 +00:00
parent e2084610ad
commit a04c2e28e7
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
CHANGES IN FLTK 1.1.0rc2
- Portability fixes.
- FLUID now properly handles default argument parameters
properly.
- Fixed WM_PAINT handling under WIN32 - didn't validate
the correct region that was drawn.
- Fl_Multiline_Output would insert the enter key.

28
fluid/Fl_Function_Type.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.4 2002/05/04 05:28:11 easysw Exp $"
// "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.5 2002/05/12 01:02:17 easysw Exp $"
//
// C function type code for the Fast Light Tool Kit (FLTK).
//
@ -257,7 +257,29 @@ void Fl_Function_Type::write_code1() {
*sptr = '\0';
write_h("%s;\n", s);
write_c("%s::%s {\n", k, name());
// skip all function default param. init in body:
int skips=0;
int nc=0,level=0;
for (sptr=s,nptr=(char*)name(); *nptr; nc++,nptr++) {
if (!skips && *nptr=='(') level++;
else if (!skips && *nptr==')') level--;
if ( *nptr=='"' && !(nc && *(nptr-1)=='\\') )
skips = skips ? 0 : 1;
if(!skips && level==1 && *nptr =='=' &&
!(nc && *(nptr-1)=='\'') ) // ignore '=' case
while(*++nptr && (skips || *(nptr-1)=='\'' ||
(*nptr!=',' && (*nptr!=')' || level!=1) ))) {
if ( *nptr=='"' && *(nptr-1)!='\\' )
skips = skips ? 0 : 1;
if (!skips && *nptr=='(') level++;
else if (!skips && *nptr==')') level--;
}
*sptr++ = *nptr;
}
*sptr = '\0';
write_c("%s::%s {\n", k, s);
} else {
if (public_) {
if (cdecl_)
@ -680,5 +702,5 @@ void Fl_Class_Type::write_code2() {
}
//
// End of "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.4 2002/05/04 05:28:11 easysw Exp $".
// End of "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.5 2002/05/12 01:02:17 easysw Exp $".
//