From: Martin Q. <mqu...@us...> - 2011-11-04 14:55:47
|
Update of /cvsroot/flexml/flexml In directory vz-cvs-3.sog:/tmp/cvs-serv22049 Modified Files: ChangeLog Makefile.defs flexml.pl Log Message: Integrate a patch from Arnaud Giersch fixing my recent changes -- release v1.9.2 Index: Makefile.defs =================================================================== RCS file: /cvsroot/flexml/flexml/Makefile.defs,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Makefile.defs 1 Nov 2011 20:48:32 -0000 1.21 +++ Makefile.defs 4 Nov 2011 14:55:44 -0000 1.22 @@ -6,7 +6,7 @@ #SUFF ?=-$(VER) SUFF ?= -VER = 1.9.1 +VER = 1.9.2 # SETUP. Index: flexml.pl =================================================================== RCS file: /cvsroot/flexml/flexml/flexml.pl,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- flexml.pl 1 Nov 2011 20:49:21 -0000 1.67 +++ flexml.pl 4 Nov 2011 14:55:44 -0000 1.68 @@ -239,7 +239,6 @@ for (keys %atttype) { if (m.($Nmtoken)[/]($Nmtoken).xo) { my ($tag,$attribute) = ($1,$2); - print "short int ${tagprefix}$ctag{$tag}_$catt{$attribute}_isset;\n"; print "typedef $typeof{$_} AT_${tagprefix}$ctag{$tag}_$catt{$attribute};\n"; print "#define AU_${tagprefix}$ctag{$tag}_$catt{$attribute} NULL\n" if not $enumtype{$_}; @@ -265,6 +264,7 @@ else { print "(${tagprefix}bufferstack + AX_${tagprefix}$ctag{$1}_$catt{$2})\n"; } + print $pre . "short int ${tagprefix}$ctag{$1}_$catt{$2}_isset;\n"; } } } Index: ChangeLog =================================================================== RCS file: /cvsroot/flexml/flexml/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ChangeLog 28 Oct 2011 19:53:23 -0000 1.3 +++ ChangeLog 4 Nov 2011 14:55:44 -0000 1.4 @@ -1,3 +1,10 @@ +2011-11-04 Martin Quinson <Mar...@lo...> + + * Integrate a patch from Arnaud Giersch to ensure that the + variable defined to check multiply defined attributes are + correctly added to the header. Thanks Arnaud. + * Release v1.9.2 with this fix. + 2011-10-28 Martin Quinson <Mar...@lo...> * Ensure that the generated parsers are robust to multiply |