You can subscribe to this list here.
2005 |
Jan
(4) |
Feb
(37) |
Mar
(7) |
Apr
(9) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
|
Feb
|
Mar
(12) |
Apr
(4) |
May
(1) |
Jun
(1) |
Jul
(18) |
Aug
(36) |
Sep
(15) |
Oct
|
Nov
|
Dec
|
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(7) |
Nov
(2) |
Dec
|
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(7) |
Nov
(3) |
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2013 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Martin Q. <mqu...@us...> - 2006-07-18 19:12:42
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20694 Modified Files: Makefile.defs Log Message: Release 1.5.3 Index: Makefile.defs =================================================================== RCS file: /cvsroot/flexml/flexml/Makefile.defs,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile.defs 18 Jul 2006 12:12:06 -0000 1.9 +++ Makefile.defs 18 Jul 2006 19:12:39 -0000 1.10 @@ -6,7 +6,7 @@ #SUFF ?=-$(VER) SUFF ?= -VER = 1.5.2 +VER = 1.5.3 # SETUP. |
From: Martin Q. <mqu...@us...> - 2006-07-18 19:09:03
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15755 Modified Files: flexml.pl Log Message: Add a --sysid to override the name of the dtd expected in the parsed files; kill latin1 chars; update copyrights somehow Index: flexml.pl =================================================================== RCS file: /cvsroot/flexml/flexml/flexml.pl,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- flexml.pl 18 Jul 2006 12:12:06 -0000 1.53 +++ flexml.pl 18 Jul 2006 19:08:58 -0000 1.54 @@ -1,10 +1,11 @@ #!/usr/bin/env perl # Flex(1) XML processor scanner generator. -# Copyright © 1999 Kristoffer Rose. All rights reserved. +# Copyright (C) 1999 Kristoffer Rose. All rights reserved. # # This file is part of the FleXML XML processor generator system. -# Copyright © 1999 Kristoffer Rose. All rights reserved. +# Copyright (C) 1999 Kristoffer Rose. All rights reserved. +# Copyright (C) 2003-2006 Martin Quinson. All rights reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -54,6 +55,7 @@ my $quiet_parser; # -q option flag my $uri; # -u option uri my $pubid; # -p option string +my $sysid; # --sysid option string my $stacksize=100000; # -b option flag my $tagprefix=""; # -P option flag my $actbin="./flexml-act"; # -T option content @@ -175,7 +177,8 @@ my ($pre) = @_; print <<EOT; $pre This program was generated with the FleXML XML processor generator. -$pre FleXML is Copyright © 1999-2005 Kristoffer Rose. All rights reserved. +$pre FleXML is Copyright (C) 1999-2005 Kristoffer Rose. All rights reserved. +$pre FleXML is Copyright (C) 2003-2006 Martin Quinson. All rights reserved. $pre ($Id). $pre $pre There are two, intertwined parts to this program, part A and part B. @@ -184,8 +187,8 @@ $pre ------ $pre $pre Some parts, here collectively called "Part A", are found in the -$pre FleXML package. They are Copyright © 1999-2005 Kristoffer Rose. -$pre All rights reserved. +$pre FleXML package. They are Copyright (C) 1999-2005 Kristoffer Rose +$pre and Copyright (C) 2003-2006 Martin Quinson. All rights reserved. $pre $pre You can redistribute, use, perform, display and/or modify "Part A" $pre provided the following two conditions hold: @@ -496,7 +499,7 @@ # Parse options. -$Use = "Usage: flexml [-ASHDvdqnLXV] [-s skel] [-T actbin] [-p pubid] [-u uri]\n" +$Use = "Usage: flexml [-ASHDvdqnLXV] [-s skel] [-T actbin] [--sysid sysid] [-p pubid] [-u uri]\n" . " [-b stack_size] [-r roottags] [-a actions] [-P prefix] name[.dtd]"; sub show_version { @@ -546,6 +549,7 @@ # Set document type URI and PUBID. "uri|u=s" => \$uri, "pubid|p=s" => \$pubid, + "sysid=s" => \$sysid, # What to generate "header|H:s" => sub { $header = $_[1] || 'true' }, @@ -1067,6 +1071,7 @@ print "uri=$uri\n"; print "pubid=$pubid\n\n"; + print "sysid=$sysid\n\n"; print "header=".($header||'undef')."\n"; print "dummy=".($dummy||'undef')."\n"; @@ -1276,8 +1281,9 @@ } elsif ( /^FLEXML_DOCTYPES$/ ) { - my $sysid = ( $uri ? "(\"'$uri'\"|\"\\\"$uri\\\"\")" - : "(\"'$dtd'\"|\"\\\"$dtd\\\"\")" ); + $sysid = $sysid ? "(\"'$sysid'\"|\"\\\"$sysid\\\"\")" + : ( $uri ? "(\"'$uri'\"|\"\\\"$uri\\\"\")" + : "(\"'$dtd'\"|\"\\\"$dtd\\\"\")" ); for (keys %roottags) { my $c = $ctag{$_}; @@ -1679,7 +1685,7 @@ die "\"$ACTIONS\", line $lineno: Malformed annotation `$&' in <$tag> action.\n" if m|\{[^;\s]+\}|o; } - print STDERR "Action: $_" if $verbose; + print STDERR "Action: $_" if $debug; print $_; } @@ -1814,6 +1820,11 @@ Sets the document type to be C<PUBLIC> with the identifier I<pubid> instead of C<SYSTEM>, the default. +=item B<--sysid>=I<sysid> + +Overrides the C<SYSTEM> id of the accepted DTD. Sometimes usefull when your +dtd is placed in a subdirectory. + =item B<--root-tags> I<roottags>, B<-r> I<roottags> Restricts the XML processor to validate only documents with one of the @@ -2043,7 +2054,7 @@ =head1 AUTHOR -I<Flexml> was written by Kristoffer Høgsbro Rose, +I<Flexml> was written by Kristoffer Rose, E<lt>C<kri...@de...>E<gt>. =head1 COPYRIGHT |
From: Martin Q. <mqu...@us...> - 2006-07-18 18:55:12
|
Update of /cvsroot/flexml/flexml/debian In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23985/debian Modified Files: docs rules Log Message: Flex is large enough Index: rules =================================================================== RCS file: /cvsroot/flexml/flexml/debian/rules,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- rules 13 Jul 2006 19:08:47 -0000 1.6 +++ rules 18 Jul 2006 18:55:08 -0000 1.7 @@ -28,7 +28,6 @@ dh_clean -k dh_installdirs $(MAKE) install DESTDIR=`pwd`/debian/tmp SUFF= - rm debian/tmp/usr/share/doc/flexml/EnlargeFlex.patch touch install-stamp # Build architecture-independent files here. Index: docs =================================================================== RCS file: /cvsroot/flexml/flexml/debian/docs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- docs 12 Feb 2003 02:55:41 -0000 1.3 +++ docs 18 Jul 2006 18:55:08 -0000 1.4 @@ -1,4 +1,3 @@ README -EnlargeFlex.patch NOTES TODO |
From: Martin Q. <mqu...@us...> - 2006-07-18 18:21:19
|
Update of /cvsroot/flexml/flexml/examples In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22123/examples Modified Files: FleXML.xml Makefile Log Message: Kill latin1 chars. I use utf8 and the bother me. They don't bring anything so I don't want to switch them to utf8 Index: FleXML.xml =================================================================== RCS file: /cvsroot/flexml/flexml/examples/FleXML.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- FleXML.xml 18 Mar 2005 22:02:50 -0000 1.1 +++ FleXML.xml 18 Jul 2006 18:21:13 -0000 1.2 @@ -175,7 +175,7 @@ `copyleft'). </p> <hr /> - <address>Copyright © + <address>Copyright (c) <a href="mailto:Kri...@en...">Kristoffer Rose</a>. <!-- Created: Thu Dec 9 08:09:41 CET 1999 --> <!-- hhmts start --> Index: Makefile =================================================================== RCS file: /cvsroot/flexml/flexml/examples/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile 13 Jul 2006 19:57:04 -0000 1.6 +++ Makefile 18 Jul 2006 18:21:13 -0000 1.7 @@ -1,8 +1,8 @@ # Make(1) rules for FleXML XML processor generator system. -# Copyright © 1999 Kristoffer Rose. All rights reserved. +# Copyright (c) 1999 Kristoffer Rose. All rights reserved. # # This file is part of the FleXML XML processor generator system. -# Copyright © 1999 Kristoffer Rose. All rights reserved. +# Copyright (c) 1999 Kristoffer Rose. All rights reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free |
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22123 Modified Files: Makefile NOTES README flexml-act-bootstrap.c flexml-act.dtd flexml.bootstrap paper.html skel skeleton-dummies.c Log Message: Kill latin1 chars. I use utf8 and the bother me. They don't bring anything so I don't want to switch them to utf8 Index: flexml.bootstrap =================================================================== RCS file: /cvsroot/flexml/flexml/flexml.bootstrap,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- flexml.bootstrap 30 Aug 2001 00:36:10 -0000 1.1 +++ flexml.bootstrap 18 Jul 2006 18:21:13 -0000 1.2 @@ -1,10 +1,10 @@ #!/usr/bin/perl # Flex(1) XML processor scanner generator. -# Copyright © 1999 Kristoffer Rose. All rights reserved. +# Copyright (c) 1999 Kristoffer Rose. All rights reserved. # # This file is part of the FleXML XML processor generator system. -# Copyright © 1999 Kristoffer Rose. All rights reserved. +# Copyright (c) 1999 Kristoffer Rose. All rights reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -116,7 +116,7 @@ print <<EOT; $pre This program was generated with the FleXML XML processor generator, $pre ($Id). -$pre Copyright © 1999 Kristoffer Rose. All rights reserved. +$pre Copyright (c) 1999 Kristoffer Rose. All rights reserved. $pre $pre You can redistribute and/or modify this program provided the following $pre two conditions hold: @@ -1578,7 +1578,7 @@ =head1 AUTHOR -I<Flexml> was written by Kristoffer Høgsbro Rose, +I<Flexml> was written by Kristoffer Rose, E<lt>C<kri...@de...>E<gt>. =head1 COPYRIGHT Index: skeleton-dummies.c =================================================================== RCS file: /cvsroot/flexml/flexml/skeleton-dummies.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- skeleton-dummies.c 22 Nov 1999 18:41:48 -0000 1.3 +++ skeleton-dummies.c 18 Jul 2006 18:21:13 -0000 1.4 @@ -1,5 +1,5 @@ /* FleXML: flex(1) based XML scanner generator - * Copyright © 1999 Kristoffer Rose. All rights reserved. + * Copyright (c) 1999 Kristoffer Rose. All rights reserved. * * Description: Dummy handlers for FleXML scanner * Author: Kristoffer Rose Index: NOTES =================================================================== RCS file: /cvsroot/flexml/flexml/NOTES,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- NOTES 22 Nov 1999 18:41:48 -0000 1.2 +++ NOTES 18 Jul 2006 18:21:13 -0000 1.3 @@ -1,5 +1,5 @@ # FleXML fast XML scanner framework -# Copyright © 1999 Kristoffer Rose. All rights reserved. +# Copyright (c) 1999 Kristoffer Rose. All rights reserved. # # Description: Notes for FleXML scanner generator # Author: Kristoffer Rose Index: flexml-act-bootstrap.c =================================================================== RCS file: /cvsroot/flexml/flexml/flexml-act-bootstrap.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- flexml-act-bootstrap.c 5 Jan 2005 18:49:26 -0000 1.7 +++ flexml-act-bootstrap.c 18 Jul 2006 18:21:13 -0000 1.8 @@ -1,8 +1,8 @@ /* Flex(1) XML processor action language application. - * Copyright © 1999 Kristoffer Rose. All rights reserved. + * Copyright (c) 1999 Kristoffer Rose. All rights reserved. * * This file is part of the FleXML XML processor generator system. - * Copyright © 1999 Kristoffer Rose. All rights reserved. + * Copyright (c) 1999 Kristoffer Rose. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free Index: Makefile =================================================================== RCS file: /cvsroot/flexml/flexml/Makefile,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- Makefile 21 Mar 2006 13:16:08 -0000 1.39 +++ Makefile 18 Jul 2006 18:21:13 -0000 1.40 @@ -1,8 +1,8 @@ # Make(1) rules for FleXML XML processor generator system. -# Copyright © 1999 Kristoffer Rose. All rights reserved. +# Copyright (c) 1999 Kristoffer Rose. All rights reserved. # # This file is part of the FleXML XML processor generator system. -# Copyright © 1999 Kristoffer Rose. All rights reserved. +# Copyright (c) 1999 Kristoffer Rose. All rights reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -34,7 +34,7 @@ LIBS = $(FLEXML_ACT) DATA = skel MANS = flexml.1 -DOCS = README NOTES TODO flexml-act.dtd EnlargeFlex.patch +DOCS = README NOTES TODO flexml-act.dtd HTMLS = FleXML.html paper.html SRC = $(STUFF) $(DATA) $(DOCS) $(HTMLS) Index: skel =================================================================== RCS file: /cvsroot/flexml/flexml/skel,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- skel 1 Jun 2006 15:21:44 -0000 1.30 +++ skel 18 Jul 2006 18:21:13 -0000 1.31 @@ -1,8 +1,8 @@ /* Flex(1) XML processor skeleton scanner (in -*-C-*-). - * Copyright © 1999 Kristoffer Rose. All rights reserved. + * Copyright (c) 1999 Kristoffer Rose. All rights reserved. * * This file is part of the FleXML XML processor generator system. - * Copyright © 1999 Kristoffer Rose. All rights reserved. + * Copyright (c) 1999 Kristoffer Rose. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free Index: paper.html =================================================================== RCS file: /cvsroot/flexml/flexml/paper.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- paper.html 6 Apr 2005 10:12:27 -0000 1.12 +++ paper.html 18 Jul 2006 18:21:13 -0000 1.13 @@ -385,7 +385,7 @@ <p> This is useful for XML applications that are meant to process a large number of documents in a fixed format. One such - application is the NTSys µ-payment transaction server which is + application is the NTSys u-payment transaction server which is implemented as an Apache module where performance is of premium importance. Using FleXML permits a highly modular development of modules for the various transaction types based on a common @@ -445,7 +445,7 @@ </dl> <hr> - <address>Copyright © + <address>Copyright (c) <a href="mailto:kri...@de...">Kristoffer Rose</a>. <!-- Created: Thu Dec 9 08:09:41 CET 1999 --> <!-- hhmts start -->Last modified: Tue Feb 11 13:56:40 EST 2003 <!-- hhmts end --> Index: README =================================================================== RCS file: /cvsroot/flexml/flexml/README,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- README 12 Feb 2003 02:55:41 -0000 1.6 +++ README 18 Jul 2006 18:21:13 -0000 1.7 @@ -13,11 +13,8 @@ executable. The toolkit produces scanners for flex(1) which you should thus -install. In order to be able to handle large DTDs (such as XHTML) you -will have to apply `EnlargeFlex.patch' (and use the -Ca option). - -Note: Debian flex has this patch applied since version 2.5.4a-6. +install. Enjoy, - Kristoffer Høgsbro Rose + Kristoffer Rose pgp f-p: A4D3 5BD7 3EC5 7CA2 924E D21D 126B B8E0 <kri...@de...> Index: flexml-act.dtd =================================================================== RCS file: /cvsroot/flexml/flexml/flexml-act.dtd,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- flexml-act.dtd 30 Nov 1999 18:28:23 -0000 1.7 +++ flexml-act.dtd 18 Jul 2006 18:21:13 -0000 1.8 @@ -1,9 +1,9 @@ <!-- Flex(1) XML processor action file DTD. $Id$ - Copyright © 1999 Kristoffer Rose. All rights reserved. + Copyright (c) 1999 Kristoffer Rose. All rights reserved. This file is part of the FleXML XML processor generator system. - Copyright © 1999 Kristoffer Rose. All rights reserved. + Copyright (c) 1999 Kristoffer Rose. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as |
From: Martin Q. <mqu...@us...> - 2006-07-18 18:18:56
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16298 Removed Files: EnlargeFlex.patch Log Message: Kill oldies --- EnlargeFlex.patch DELETED --- |
From: Martin Q. <mqu...@us...> - 2006-07-18 12:12:09
|
Update of /cvsroot/flexml/flexml/debian In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8146/debian Modified Files: changelog Log Message: Version 1.5.2: Bug fix: do find the skeleton file in installed distributions Index: changelog =================================================================== RCS file: /cvsroot/flexml/flexml/debian/changelog,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- changelog 13 Jul 2006 19:57:04 -0000 1.25 +++ changelog 18 Jul 2006 12:12:06 -0000 1.26 @@ -1,3 +1,9 @@ +flexml (1.5.2-1) unstable; urgency=low + + * Bug fix: do find the skeleton file in installed distributions + + -- Martin Quinson <mqu...@de...> Tue, 18 Jul 2006 14:06:50 +0200 + flexml (1.5.1-1) unstable; urgency=low * Tests used to rely on wget to fetch a dtd. Include this in the tarball |
From: Martin Q. <mqu...@us...> - 2006-07-18 12:12:09
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8146 Modified Files: Makefile.defs flexml.pl Log Message: Version 1.5.2: Bug fix: do find the skeleton file in installed distributions Index: Makefile.defs =================================================================== RCS file: /cvsroot/flexml/flexml/Makefile.defs,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.defs 13 Jul 2006 19:57:03 -0000 1.8 +++ Makefile.defs 18 Jul 2006 12:12:06 -0000 1.9 @@ -6,7 +6,7 @@ #SUFF ?=-$(VER) SUFF ?= -VER = 1.5.1 +VER = 1.5.2 # SETUP. Index: flexml.pl =================================================================== RCS file: /cvsroot/flexml/flexml/flexml.pl,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- flexml.pl 13 Jul 2006 19:06:42 -0000 1.52 +++ flexml.pl 18 Jul 2006 12:12:06 -0000 1.53 @@ -41,6 +41,8 @@ use vars qw/ $ACTIONS /; # the actions file use vars qw/ $APPLICATION /; # generated XML application +$SKELETON = "./skel"; # default value + # OPTIONS (and other globals). my $Use; # usage string |
From: Martin Q. <mqu...@us...> - 2006-07-13 19:57:07
|
Update of /cvsroot/flexml/flexml/examples In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10674/examples Modified Files: Makefile Added Files: xhtml1-transitional.dtd Log Message: Release 1.5.1: kill test dependency on wget Index: Makefile =================================================================== RCS file: /cvsroot/flexml/flexml/examples/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 21 Mar 2006 13:11:27 -0000 1.5 +++ Makefile 13 Jul 2006 19:57:04 -0000 1.6 @@ -30,7 +30,7 @@ SAMPS = my.dtd my-show.act my-joke.xml my-joke2.xml my-joke3.xml \ tricky.dtd tricky.act tricky.xml \ - test.html + test.html xhtml1-transitional.dtd SRC = $(SAMPS) ALL = $(SAMPS) @@ -115,9 +115,6 @@ # Complex example: application to print XHTML <a href=...> values. -xhtml1-transitional.dtd: - wget 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd' - xhtml1-transitional.l xhtml1-transitional.h: xhtml1-transitional.dtd $(FLEXML_PROG) -rhtml \ -p "-//IETF//DTD XHTML 1.0 Transitional//EN" \ @@ -138,7 +135,7 @@ if ./xhtml-href <test.html ; then echo "TEST PASSED"; else echo "TEST FAILED"; fi if ./xhtml-href < FleXML.xml ; then echo "TEST PASSED"; else echo "TEST FAILED"; fi -clean::; $(RM) xhtml1-*.dtd xhtml1-*.[lhco] xhtml-href.[co] xhtml-href +clean::; $(RM) xhtml1-*.[lhco] xhtml-href.[co] xhtml-href # END. --- NEW FILE: xhtml1-transitional.dtd --- <!-- Extensible HTML version 1.0 Transitional DTD This is the same as HTML 4 Transitional except for changes due to the differences between XML and SGML. Namespace = http://www.w3.org/1999/xhtml For further information, see: http://www.w3.org/TR/xhtml1 Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio), All Rights Reserved. This DTD module is identified by the PUBLIC and SYSTEM identifiers: PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" $Revision: 1.1 $ [...1162 lines suppressed...] width %Length; #IMPLIED height %Length; #IMPLIED > <!ATTLIST td %attrs; abbr %Text; #IMPLIED axis CDATA #IMPLIED headers IDREFS #IMPLIED scope %Scope; #IMPLIED rowspan %Number; "1" colspan %Number; "1" %cellhalign; %cellvalign; nowrap (nowrap) #IMPLIED bgcolor %Color; #IMPLIED width %Length; #IMPLIED height %Length; #IMPLIED > |
From: Martin Q. <mqu...@us...> - 2006-07-13 19:57:07
|
Update of /cvsroot/flexml/flexml/debian In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10674/debian Modified Files: changelog Log Message: Release 1.5.1: kill test dependency on wget Index: changelog =================================================================== RCS file: /cvsroot/flexml/flexml/debian/changelog,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- changelog 13 Jul 2006 19:11:46 -0000 1.24 +++ changelog 13 Jul 2006 19:57:04 -0000 1.25 @@ -1,3 +1,10 @@ +flexml (1.5.1-1) unstable; urgency=low + + * Tests used to rely on wget to fetch a dtd. Include this in the tarball + instead. + + -- Martin Quinson <mqu...@de...> Thu, 13 Jul 2006 21:47:45 +0200 + flexml (1.5-1) unstable; urgency=low [William Dowling] |
From: Martin Q. <mqu...@us...> - 2006-07-13 19:57:07
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10674 Modified Files: Makefile.defs Log Message: Release 1.5.1: kill test dependency on wget Index: Makefile.defs =================================================================== RCS file: /cvsroot/flexml/flexml/Makefile.defs,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.defs 13 Jul 2006 19:12:18 -0000 1.7 +++ Makefile.defs 13 Jul 2006 19:57:03 -0000 1.8 @@ -6,7 +6,7 @@ #SUFF ?=-$(VER) SUFF ?= -VER = 1.5 +VER = 1.5.1 # SETUP. |
From: Martin Q. <mqu...@us...> - 2006-07-13 19:12:26
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24615 Modified Files: Makefile.defs Log Message: Release 1.5 Index: Makefile.defs =================================================================== RCS file: /cvsroot/flexml/flexml/Makefile.defs,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.defs 21 Apr 2006 23:36:11 -0000 1.6 +++ Makefile.defs 13 Jul 2006 19:12:18 -0000 1.7 @@ -6,7 +6,7 @@ #SUFF ?=-$(VER) SUFF ?= -VER = 1.4.1 +VER = 1.5 # SETUP. |
From: Martin Q. <mqu...@us...> - 2006-07-13 19:11:48
|
Update of /cvsroot/flexml/flexml/debian In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24231 Modified Files: changelog compat Log Message: Switch to debhelper level 5 (at least try to, change seem to be ignored) Index: compat =================================================================== RCS file: /cvsroot/flexml/flexml/debian/compat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- compat 21 Mar 2006 13:33:15 -0000 1.1 +++ compat 13 Jul 2006 19:11:46 -0000 1.2 @@ -1 +1 @@ -4 +5 Index: changelog =================================================================== RCS file: /cvsroot/flexml/flexml/debian/changelog,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- changelog 13 Jul 2006 19:07:34 -0000 1.23 +++ changelog 13 Jul 2006 19:11:46 -0000 1.24 @@ -12,6 +12,7 @@ * Allow to override the scanner, header, application names using an optionnal argument along to -S -H -A options. (debian package) + * Switch to debhelper level 5 (at least try to, change seem to be ignored) * Run the test suite in the process of package building -- Martin Quinson <mqu...@de...> Thu, 13 Jul 2006 20:27:50 +0200 |
From: Martin Q. <mqu...@us...> - 2006-07-13 19:08:51
|
Update of /cvsroot/flexml/flexml/debian In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22838/debian Modified Files: rules Log Message: Do run the tests while building the packages (we don't want to release broken stuffs Index: rules =================================================================== RCS file: /cvsroot/flexml/flexml/debian/rules,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- rules 23 Feb 2005 23:24:13 -0000 1.5 +++ rules 13 Jul 2006 19:08:47 -0000 1.6 @@ -12,6 +12,7 @@ build-stamp: dh_testdir $(MAKE) SUFF= + $(MAKE) test SUFF= touch build-stamp clean: |
From: Martin Q. <mqu...@us...> - 2006-07-13 19:07:43
|
Update of /cvsroot/flexml/flexml/debian In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22409/debian Modified Files: changelog Log Message: Document last changes (also William ones), and fix a mistake in previous entry Index: changelog =================================================================== RCS file: /cvsroot/flexml/flexml/debian/changelog,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- changelog 21 Apr 2006 23:36:11 -0000 1.22 +++ changelog 13 Jul 2006 19:07:34 -0000 1.23 @@ -1,9 +1,27 @@ +flexml (1.5-1) unstable; urgency=low + + [William Dowling] + * Fix bug 1498401 "Parser loops on empty entity expansion" (l. 251); + * Fix bug 1498407 "Cannot have ELEMENT with same name as ATTLIST" (ll. 674-5); + * Fix bug 1498418 "ENTITY attribute type unimplemented." (ll. 842-51). + + [Martin Quinson] + (upstream) + * Switch to Getopt::Long (I hope I didn't break anything) + * Add long version of each command line option + * Allow to override the scanner, header, application names using an + optionnal argument along to -S -H -A options. + (debian package) + * Run the test suite in the process of package building + + -- Martin Quinson <mqu...@de...> Thu, 13 Jul 2006 20:27:50 +0200 + flexml (1.4.1-1) unstable; urgency=low * More fixes to get several parsers in the same C code: - pass bufferstack to static too - prefix the pcdata variable (WARNING: go fix your code using it) - Interesingly enough, this seems to be needed on Mac OSX somehow + This seems to be needed with gcc 4.x -- Martin Quinson <mqu...@de...> Sat, 22 Apr 2006 01:29:23 +0200 |
From: Martin Q. <mqu...@us...> - 2006-07-13 19:06:45
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21989 Modified Files: flexml.pl Log Message: And now, document how to override the output files names Index: flexml.pl =================================================================== RCS file: /cvsroot/flexml/flexml/flexml.pl,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- flexml.pl 13 Jul 2006 18:58:24 -0000 1.51 +++ flexml.pl 13 Jul 2006 19:06:42 -0000 1.52 @@ -548,7 +548,7 @@ # What to generate "header|H:s" => sub { $header = $_[1] || 'true' }, "dummy|D:s" => sub { $dummy = $_[1] || 'true' }, - "stand-alone|A:s" => sub { $standalone = $_[1] || 'true' }, + "stand-alone|A" => \$standalone, "scanner|S:s" => sub { $scanner = $_[1] || 'true' }, "actions|a=s" => \$actions ); @@ -1755,7 +1755,7 @@ =over 4 -=item B<--stand-alone>, B<-A> +=item B<--stand-alone>, B<-A> Generate a I<stand-alone> scanner application. If combined with B<-a>I<actions> then the application will be named as I<actions> with @@ -1769,23 +1769,24 @@ F<.c>. If combined with B<-A> then instead the stand-alone application will include the action functions. -=item B<--dummy>, B<-D> +=item B<--dummy> B<[>I<app_name>B<]>, B<-D> B<[>I<app_name>B<]> -Generate a dummy application I<name>F<-dummy.c> with just empty -functions to be called by the XML processor. If combined with -B<-a>I<actions> then the application will insert the specified -actions and be named as I<actions> with the extension replaced by -F<.c>. Conflicts with B<-A>; implied by B<-a> unless either of -B<-SHD> is specified. +Generate a dummy application with just empty functions to be called by the +XML processor. If I<app_name> is not specified on the command line, it +defaults to I<name>F<-dummy.c>. If combined with B<-a> I<actions> then the +application will insert the specified actions and be named as I<actions> +with the extension replaced by F<.c>. Conflicts with B<-A>; implied by +B<-a> unless either of B<-SHD> is specified. -=item B<--dummy>, B<-d> +=item B<--debug>, B<-d> Turns on debug mode in the flex scanner and also prints out the details of the DTD analysis performed by I<flexml>. -=item B<--header>, B<-H> +=item B<--header> B<[>I<header_name>B<]>, B<-H> B<[>I<header_name>B<]> -Generate the header file I<name>F<.h>. Conflicts with B<-A>; on by +Generate the header file. If the I<header_name> is not specified on the +command line, defaults to I<name>F<.h>. Conflicts with B<-A>; on by default if none of B<-SHD> specified. =item B<--lineno>, B<-L> @@ -1816,10 +1817,11 @@ Restricts the XML processor to validate only documents with one of the root elements listed in the comma-separated I<roottags>. -=item B<--scanner>, B<-S> +=item B<--scanner> B<[>I<scanner_name>B<]>, B<-S> B<[>I<scanner_name>B<]> -Generate the scanner I<name>F<.l>. Conflicts with B<-A>; on by -default if none of B<-SHD> specified. +Generate the scanner. If I<scanner_name> is not given on command line, it +defaults to I<name>F<.l>. Conflicts with B<-A>; on by default if none of +B<-SHD> specified. =item B<--skel> I<skel>, B<-s> I<skel> |
From: Martin Q. <mqu...@us...> - 2006-07-13 18:58:27
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv18441 Modified Files: flexml.pl Log Message: Switch to Getopt::Long; allow to override the scanner, header and application names Index: flexml.pl =================================================================== RCS file: /cvsroot/flexml/flexml/flexml.pl,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- flexml.pl 31 May 2006 20:02:54 -0000 1.50 +++ flexml.pl 13 Jul 2006 18:58:24 -0000 1.51 @@ -27,7 +27,7 @@ # IMPORTS. -use Getopt::Std; +use Getopt::Long; use LWP::UserAgent; use Carp qw/cluck confess/; @@ -44,7 +44,6 @@ # OPTIONS (and other globals). my $Use; # usage string -my %opt = (); # options my $debug; # -d option flag my $verbose; # -v option flag @@ -53,9 +52,17 @@ my $quiet_parser; # -q option flag my $uri; # -u option uri my $pubid; # -p option string -my $stacksize; # -b option flag -my $tagprefix; # -P option flag -my $actbin; # -T option content +my $stacksize=100000; # -b option flag +my $tagprefix=""; # -P option flag +my $actbin="./flexml-act"; # -T option content + +my $header; # -H option flag/content +my $dummy; # -D option flag/content +my $standalone; # -A option flag/content +my $scanner; # -S option flag/content +my $actions; # -a option content + +my $dryrun; # -n option flag my $dtd; # DTD file name (or URI) my $dtdrevision; # DTD version pruned from file @@ -490,46 +497,63 @@ $Use = "Usage: flexml [-ASHDvdqnLXV] [-s skel] [-T actbin] [-p pubid] [-u uri]\n" . " [-b stack_size] [-r roottags] [-a actions] [-P prefix] name[.dtd]"; -getopts('ASHDvdnLXVqp:b:P:s:T:u:r:a:', \%opt); - -# Version! -print "FleXML version $Id.\n" if $opt{V} or $opt{v}; -exit 0 if $opt{V}; - -# Debugging? -$debug = $opt{d}; -$verbose = $opt{v}; - -# Line numbers? -$lineno = $opt{L}; +sub show_version { -# Quiet parser? -$quiet_parser = $opt{q}; + exit 0; +} -# Exit without fail message? -$nofail = $opt{X}; +Getopt::Long::Configure ("bundling"); +GetOptions( + # Debugging and verbosity + "debug|d" => \$debug, + "verbose|v" => \$verbose, + "quiet|q" => \$quiet_parser, + + # Version! + "version|V" => sub { print "FleXML version $Id.\n"; exit 0; }, -# Specific root tags? -if ($opt{r}) { - for (split ',',$opt{r}) { $roottags{$_} = 'true'; } -} + # dry-run ? + "dry-run|n" => \$dryrun, -# Specific stack size? -$stacksize = ($opt{'b'} ? $opt{'b'} : 100000); + # Line numbers? + "lineno|L" => \$lineno, + + # Exit without fail message? + "nofail|X" => \$nofail, -# Specific tagprefix? -$tagprefix = ($opt{'P'} ? $opt{'P'}."_" : ""); + # Specific root tags? + "root-tags|r=s" => sub { + for (split ',',$_[1]) { $roottags{$_} = 'true'; } + }, -# Specific actbin? -$actbin = ($opt{'T'} ? $opt{'T'} : "./flexml-act"); + # Specific stack size? + "stack-size|b=s" => \$stacksize, -# Set skeleton scanner file name and check it is readable (if needed). -$SKELETON = ($opt{'s'} ? $opt{'s'} : './skel'); -die "$0: No skeleton file $SKELETON.\n" if not -r $SKELETON and $opt{S}; + # Specific tagprefix? + "tag-prefix|P=s" => sub { $tagprefix = $_[1]."_" }, + + # Specific actbin? (internal use) + "act-bin|T=s" => \$actbin, + + # Set skeleton scanner file name and check it is readable (if needed). + "skel|s=s" => sub { + $SKELETON = $_[1]; + die "$0: No skeleton file $SKELETON.\n" if not -r $SKELETON and $_[1]; + }, + + # Set document type URI and PUBID. + "uri|u=s" => \$uri, + "pubid|p=s" => \$pubid, -# Set document type URI and PUBID. -$uri = $opt{u} if $opt{u}; -$pubid = $opt{p} if $opt{p}; + # What to generate + "header|H:s" => sub { $header = $_[1] || 'true' }, + "dummy|D:s" => sub { $dummy = $_[1] || 'true' }, + "stand-alone|A:s" => sub { $standalone = $_[1] || 'true' }, + "scanner|S:s" => sub { $scanner = $_[1] || 'true' }, + "actions|a=s" => \$actions + ); + +print "FleXML version $Id.\n" if $verbose; # Set DTD file name...and extract prefix for later my $prefix = $ARGV[0]; @@ -546,30 +570,30 @@ # Selection options: If none of -SHDA specified then default to -SH. # Furthermore -a implies -D. -$opt{S} = $opt{H} = 'true' unless ($opt{S} or $opt{H} or $opt{D} or $opt{A}); -$opt{D} ||= $opt{a} unless $opt{A}; +$scanner = $header = 'true' unless ($scanner or $header or $dummy or $standalone); +$dummy ||= $actions unless $standalone; # Set default (DTD-based) output file names. -$SCANNER = "$prefix.l"; -$HEADER = "$prefix.h"; -$APPLICATION = "$prefix-dummy.c"; +$SCANNER = (!defined($scanner)) || $scanner eq 'true' ? "$prefix.l" : $scanner; +$HEADER = (!defined($header)) || $header eq 'true' ? "$prefix.h" : $header; +$APPLICATION = (!defined($dummy)) || $dummy eq 'true' ? "$prefix-dummy.c" : $dummy; # Set actions=based output file names, if any. -if ($ACTIONS = $opt{a}) { - $opt{a} =~ s/\.[a-z]+$//; - $APPLICATION = "$opt{a}.c"; +if ($ACTIONS = $actions) { + $actions =~ s/\.[a-z]+$//; + $APPLICATION = "$actions.c"; } # Stand-alone applications... -if ($opt{A}) { - die "$0: -A conflicts with -SHD.\n" if ($opt{S} or $opt{H} or $opt{D}); +if ($standalone) { + die "$0: -A conflicts with -SHD.\n" if ($scanner or $header or $dummy); $SCANNER = $APPLICATION; $SCANNER =~ s/\.c$/.l/; } # Dry-run? -if ($opt{n}) { - $opt{A} = $opt{S} = $opt{H} = $opt{D} = undef; +if ($dryrun) { + $standalone = $scanner = $header = $dummy = undef; } @@ -986,7 +1010,7 @@ } # Handling prefix -if($opt{P}) { +if(length($tagprefix)) { my($h,$k); my(@hashlist) = (\%states,\%emptytrans,\%instates,\%startstate, \%endstates,\%exittrans); @@ -1022,8 +1046,32 @@ return $out; } - print '%opt = (' . printhash(\%opt) . ")\n"; + # display the options we got + print "debug=$debug\n"; + print "verbose=$verbose\n"; + print "quiet=$quiet_parser\n"; + + print "dry-run=$dryrun\n"; + print "lineno=$lineno\n"; + + print "nofail=$nofail\n"; + + print "stack-size=$stacksize\n"; + print "tag-prefix=$tagprefix\n"; + + print "act-bin=$actbin\n"; + + print "skel=$SKELETON\n"; + + print "uri=$uri\n"; + print "pubid=$pubid\n\n"; + print "header=".($header||'undef')."\n"; + print "dummy=".($dummy||'undef')."\n"; + print "stand-alone=".($standalone||'undef')."\n"; + print "scanner=".($scanner||'undef')."\n"; + print "actions=".($actions||'undef')."\n\n"; + print '%source = (' . printhash(\%source) . ")\n"; print "\n"; @@ -1071,7 +1119,7 @@ # WRITE API HEADER (if requested). -if ($opt{H}) { +if ($header) { print STDOUT "Generating XML processor header in `$HEADER'.\n" if $verbose; @@ -1118,10 +1166,10 @@ # WRITE XML PROCESSOR (if requested). -if ($opt{S} or $opt{A}) { +if ($scanner or $standalone) { print STDOUT "Writing XML processor" - . ($opt{a} || $opt{A} ? " and application" : "") + . ($actions || $standalone ? " and application" : "") . " onto `$SCANNER'.\n" if $verbose; open SCANNER, "+>$SCANNER"|| die "$0: cannot write $SCANNER: $!\n"; @@ -1164,7 +1212,7 @@ print "#define FLEXML_BUFFERSTACKSIZE $stacksize\n"; print "\n"; - if ($opt{A}) { + if ($standalone) { api_functions('static ',';'); print "\n"; api_types(); @@ -1174,7 +1222,7 @@ else { print "/* XML processor api. */\n"; print "#include \"$HEADER\"\n\n" - if ($opt{H}); + if ($header); api_data(''); } @@ -1517,7 +1565,7 @@ } close SKELETON || die "$0: Cannot close $SKELETON: $!\n"; - unless ($opt{A}) { + unless ($standalone) { close SCANNER || die "$0: Cannot close $SCANNER: $!\n"; } } @@ -1527,10 +1575,10 @@ # WRITE APPLICATION. -if ($opt{D}) { +if ($dummy) { print STDOUT "Writing XML" - . ($opt{a} ? "" : " dummy") + . ($actions ? "" : " dummy") . " application onto `$APPLICATION'.\n" if $verbose; open APPLICATION, "+>$APPLICATION" || die "$0: Cannot write $APPLICATION: $!\n"; @@ -1552,7 +1600,7 @@ } -if ($opt{D} or $opt{A}) { +if ($dummy or $standalone) { # Get requested actions. if ($ACTIONS) { @@ -1629,6 +1677,7 @@ die "\"$ACTIONS\", line $lineno: Malformed annotation `$&' in <$tag> action.\n" if m|\{[^;\s]+\}|o; } + print STDERR "Action: $_" if $verbose; print $_; } @@ -1641,10 +1690,10 @@ } -if ($opt{D}) { +if ($dummy) { close APPLICATION || die "$0: Cannot close $APPLICATION: $!\n"; } -elsif ($opt{A}) { +elsif ($standalone) { close SCANNER || die "$0: Cannot close $SCANNER: $!\n"; } @@ -1706,21 +1755,21 @@ =over 4 -=item B<-A> +=item B<--stand-alone>, B<-A> Generate a I<stand-alone> scanner application. If combined with B<-a>I<actions> then the application will be named as I<actions> with the extension replaced by F<.l>, otherwise it will be in I<name>F<.l>. Conflicts with B<-S>, B<-H>, and B<-D>. -=item B<-a> I<actions> +=item B<--actions> I<actions>, B<-a> I<actions> Uses the I<actions> file to produce an XML application in the file with the same name as I<actions> after replacing the extension with F<.c>. If combined with B<-A> then instead the stand-alone application will include the action functions. -=item B<-D> +=item B<--dummy>, B<-D> Generate a dummy application I<name>F<-dummy.c> with just empty functions to be called by the XML processor. If combined with @@ -1729,79 +1778,79 @@ F<.c>. Conflicts with B<-A>; implied by B<-a> unless either of B<-SHD> is specified. -=item B<-d> +=item B<--dummy>, B<-d> Turns on debug mode in the flex scanner and also prints out the details of the DTD analysis performed by I<flexml>. -=item B<-H> +=item B<--header>, B<-H> Generate the header file I<name>F<.h>. Conflicts with B<-A>; on by default if none of B<-SHD> specified. -=item B<-L> +=item B<--lineno>, B<-L> Makes the XML processor (as produced by I<flex>(1)) count the lines in the input and keep it available to XML application actions in the integer C<yylineno>. (This is off by default as the performance overhead is significant.) -=item B<-q> +=item B<--quiet>, B<-q> Prevents the XML processor (as produced by I<flex>(1)) from reporting the error it runs into on stderr. Instead, users will have to pool for error messages with the parse_err_msg() function. By default, error messages are written on stderr. -=item B<-n> +=item B<--dry-run>, B<-n> "Dry-run": do not produce any of the output files. -=item B<-p> I<pubid> +=item B<--pubid> I<pubid>, B<-p> I<pubid> Sets the document type to be C<PUBLIC> with the identifier I<pubid> instead of C<SYSTEM>, the default. -=item B<-r> I<roottags> +=item B<--root-tags> I<roottags>, B<-r> I<roottags> Restricts the XML processor to validate only documents with one of the root elements listed in the comma-separated I<roottags>. -=item B<-S> +=item B<--scanner>, B<-S> Generate the scanner I<name>F<.l>. Conflicts with B<-A>; on by default if none of B<-SHD> specified. -=item B<-s> I<skel> +=item B<--skel> I<skel>, B<-s> I<skel> Use the skeleton scanner I<skel> instead of the default. -=item B<-T> I<flexml-act> +=item B<--act-bin> I<flexml-act>, B<-T> I<flexml-act> This is an internal option mainly used to test versions of flexml not installed yet. -=item B<-b> I<stack_size> +=item B<--stack-size> I<stack_size>, B<-b> I<stack_size> Sets the FLEXML_BUFFERSTACKSIZE to stack_size (100000 by default). Use this option when you get an error like "Assertion `next<limit' failed". -=item B<-p> I<STRING> +=item B<--tag-prefix> I<STRING>, B<-O> I<STRING> Use STRING to differentiate multiple versions of flexml in the same C -code. +code, just like the -P flex argument. -=item B<-u> I<uri> +=item B<--uri> I<uri>, B<-u> I<uri> Sets the URI of the DTD, used in the C<DOCTYPE> header, to the specified I<uri> (the default is the DTD name). -=item B<-v> +=item B<--verbose>, B<-v> Be verbose: echo each DTD declaration (after parameter expansion). -=item B<-V> +=item B<--version>, B<-V> Print the version of I<flexml> and exit. |
From: William D. <wdo...@us...> - 2006-06-01 15:21:53
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv31030 Modified Files: skel Log Message: pushbuffer() stores and popbuffer() returns a const char* Index: skel =================================================================== RCS file: /cvsroot/flexml/flexml/skel,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- skel 21 Apr 2006 23:34:08 -0000 1.29 +++ skel 1 Jun 2006 15:21:44 -0000 1.30 @@ -69,7 +69,7 @@ static char bufferstack[FLEXML_BUFFERSTACKSIZE]; static char* limit = bufferstack + FLEXML_BUFFERSTACKSIZE; typedef struct BufferLast_s { - struct BufferLast_s *old; char* saved; char new1[1]; + struct BufferLast_s *old; const char* saved; char new1[1]; } BufferLast; #ifdef FLEXML_HasMixed static BufferLast* last = (BufferLast*)0; @@ -93,7 +93,7 @@ } #ifdef FLEXML_HasMixed -static void pushbuffer(char* p) +static void pushbuffer(const char* p) { BufferLast* l = (BufferLast*)next; assert(next < limit); @@ -103,7 +103,7 @@ last = l; } -static char* popbuffer(void) +static const char* popbuffer(void) { BufferLast* l = last; assert(last != (BufferLast*)0); |
From: William D. <wdo...@us...> - 2006-05-31 20:44:10
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10599 Modified Files: flexml.pl Log Message: Fix bug 1498401 "Parser loops on empty entity expansion" (l. 251); Fix bug 1498407 "Cannot have ELEMENT with same name as ATTLIST" (ll. 674-5); Fix bug 1498418 "ENTITY attribute type unimplemented." (ll. 842-51). Index: flexml.pl =================================================================== RCS file: /cvsroot/flexml/flexml/flexml.pl,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- flexml.pl 21 Apr 2006 23:35:51 -0000 1.49 +++ flexml.pl 31 May 2006 20:02:54 -0000 1.50 @@ -248,7 +248,7 @@ sub expandparametersat { # Expand parameter entities in $_ at $place. my ($place) = @_; while ( m/$place\s*%($Name);/ ) { - if ($parameter{$1}) { + if (defined $parameter{$1}) { s/$place(\s*)%($Name);/ ' '. $1 . $parameter{$2} . ' ' /xe; } } @@ -672,11 +672,12 @@ # strip off the matched code from the beginning of $_ $_ = $'; #' + # place the newly found tag into the list of tags @tags + die place()."Repeated element $tag.\n" if exists $source{$tag}; + # ????? - most of the time $orig is undef $source{$tag} = "$orig"; - # place the newly found tag into the list of tags @tags - die place()."Repeated element $tag.\n" if $ctag{$tag}; push @tags, $tag; # Create C-friendly tag names. @@ -839,10 +840,15 @@ $literaltype{"$tag/$attribute"} = '{Nmtokens}'; } elsif ( $type eq 'ENTITY' ) { - die place()."ENTITY attribute type unimplemented.\n"; + #die place()."ENTITY attribute type unimplemented.\n"; + $literaltype{"$tag/$attribute"} = '{Name}'; + print STDERR place()."Warning: attribute type `$type' not validated.\n"; } elsif ( $type eq 'ENTITIES' ) { - die place()."ENTITIES attribute type unimplemented.\n"; + #die place()."ENTITIES attribute type unimplemented.\n"; + $literaltype{"$tag/$attribute"} = '{Names}'; + print STDERR place()."Warning: attribute type `$type' not validated.\n"; + } elsif ( $type ne 'CDATA' ) { die place()."Unknown AttType `$type'.\n"; |
From: Martin Q. <mqu...@us...> - 2006-04-21 23:36:16
|
Update of /cvsroot/flexml/flexml/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12800/debian Modified Files: changelog Log Message: Prepare for release 1.4.1 Index: changelog =================================================================== RCS file: /cvsroot/flexml/flexml/debian/changelog,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- changelog 21 Mar 2006 13:16:21 -0000 1.21 +++ changelog 21 Apr 2006 23:36:11 -0000 1.22 @@ -1,3 +1,12 @@ +flexml (1.4.1-1) unstable; urgency=low + + * More fixes to get several parsers in the same C code: + - pass bufferstack to static too + - prefix the pcdata variable (WARNING: go fix your code using it) + Interesingly enough, this seems to be needed on Mac OSX somehow + + -- Martin Quinson <mqu...@de...> Sat, 22 Apr 2006 01:29:23 +0200 + flexml (1.4-1) unstable; urgency=low [Arnaud Legrand] |
From: Martin Q. <mqu...@us...> - 2006-04-21 23:36:16
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12800 Modified Files: Makefile.defs Log Message: Prepare for release 1.4.1 Index: Makefile.defs =================================================================== RCS file: /cvsroot/flexml/flexml/Makefile.defs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile.defs 21 Mar 2006 13:07:29 -0000 1.5 +++ Makefile.defs 21 Apr 2006 23:36:11 -0000 1.6 @@ -6,7 +6,7 @@ #SUFF ?=-$(VER) SUFF ?= -VER = 1.4 +VER = 1.4.1 # SETUP. |
From: Martin Q. <mqu...@us...> - 2006-04-21 23:35:55
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12458 Modified Files: flexml.pl Log Message: Also protect pcdata from multiple definitions, but this is a public symbol Index: flexml.pl =================================================================== RCS file: /cvsroot/flexml/flexml/flexml.pl,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- flexml.pl 21 Mar 2006 13:09:12 -0000 1.48 +++ flexml.pl 21 Apr 2006 23:35:51 -0000 1.49 @@ -236,7 +236,7 @@ sub api_data { # Print XML application interface parameters. my ($pre) = @_; print "/* FleXML-provided data. */\n"; - print $pre . "const char* pcdata;\n"; + print $pre . "const char* ${tagprefix}pcdata;\n"; for (keys %atttype) { if (m.($Nmtoken)[/]($Nmtoken).xo) { print $pre . "AT_${tagprefix}$ctag{$1}_$catt{$2} A_${tagprefix}$ctag{$1}_$catt{$2};\n"; @@ -1365,8 +1365,8 @@ } } print " LEAVE; STag_${tagprefix}$myctag();" - . (%inmixed ? ' pushbuffer(pcdata);' : '') - . ($mixed{$tag} ? 'BUFFERSET(pcdata)' : 'pcdata = NULL'). ";" + . (%inmixed ? ' pushbuffer('."${tagprefix}".'pcdata);' : '') + . ($mixed{$tag} ? 'BUFFERSET('."${tagprefix}".'pcdata)' : "${tagprefix}".'pcdata = NULL'). ";" . " ENTER($startstate{$tag});\n"; print " }\n"; # @@ -1380,10 +1380,10 @@ } } print " LEAVE; STag_${tagprefix}$myctag();" - . (%inmixed ? ' pushbuffer(pcdata);' : '') - . ' pcdata = ' . ($mixed{$tag} ? '""' : 'NULL') . ';' + . (%inmixed ? ' pushbuffer('."${tagprefix}".'pcdata);' : '') + . " ${tagprefix}".'pcdata = ' . ($mixed{$tag} ? '""' : 'NULL') . ';' . " ETag_${tagprefix}$myctag();" - . (%inmixed ? ' pcdata = popbuffer();' : '') + . (%inmixed ? " ${tagprefix}".'pcdata = popbuffer();' : '') . "\n"; # print $exitswitch; @@ -1408,7 +1408,7 @@ print " LEAVE;\n"; print " BUFFERDONE;\n" if $mixed{$tag}; print " ETag_${tagprefix}$myctag();\n"; - print " pcdata = popbuffer();\n" if %inmixed; + print " ${tagprefix}pcdata = popbuffer();\n" if %inmixed; print $exitswitch; print " }\n"; @@ -1613,7 +1613,7 @@ if not $enumtype{"$tag/$att"} =~ m/\b$elt\b/ ; } - while ( s|\{\#(PCDATA)\}|pcdata| ) { + while ( s|\{\#(PCDATA)\}|${tagprefix}pcdata| ) { die "\"$ACTIONS\", line $lineno: {#PCDATA} only allowed in end tag.\n" if $isstart; die "\"$ACTIONS\", line $lineno: {#PCDATA} only permitted in end tag with Mixed contents.\n" |
From: Martin Q. <mqu...@us...> - 2006-04-21 23:34:12
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11724 Modified Files: skel Log Message: Also protect bufferstack from multiple definitions Index: skel =================================================================== RCS file: /cvsroot/flexml/flexml/skel,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- skel 21 Mar 2006 12:04:13 -0000 1.28 +++ skel 21 Apr 2006 23:34:08 -0000 1.29 @@ -66,7 +66,7 @@ #define CLEANUP cleanup() /* Text buffer stack handling. */ -char bufferstack[FLEXML_BUFFERSTACKSIZE]; +static char bufferstack[FLEXML_BUFFERSTACKSIZE]; static char* limit = bufferstack + FLEXML_BUFFERSTACKSIZE; typedef struct BufferLast_s { struct BufferLast_s *old; char* saved; char new1[1]; |
From: Arnaud L. <leg...@us...> - 2006-03-21 17:03:46
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26621 Modified Files: skel Log Message: Make flexml work with the current flex (2.5.33) that seem to dislike ]] in the comments. Index: skel =================================================================== RCS file: /cvsroot/flexml/flexml/skel,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- skel 21 Mar 2006 08:24:12 -0000 1.27 +++ skel 21 Mar 2006 12:04:13 -0000 1.28 @@ -157,7 +157,7 @@ * INPI inside an XML PI <?...?> * VALUE1 inside a '...'-delimited literal * VALUE2 inside a "..."-delimited literal - * CDATA inside a <![CDATA[...]]> section. + * CDATA inside a <![CDATA[...] ]> section. * ROOT_<tag> expect root element <tag> * AL_<tag> inside the attribute list for <tag> * IN_<tag> inside a <tag> with element contents (ready for end tag) |
From: Arnaud L. <leg...@us...> - 2006-03-21 16:51:25
|
Update of /cvsroot/flexml/flexml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31690 Modified Files: flexml.pl Log Message: Added a few dirty hacks to rename states and transitions in the lex file and variable, functions and types in the .h. This enable to have in the same C code many xml parser with potentially identical keywords. Index: flexml.pl =================================================================== RCS file: /cvsroot/flexml/flexml/flexml.pl,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- flexml.pl 21 Mar 2006 08:24:12 -0000 1.46 +++ flexml.pl 21 Mar 2006 11:12:57 -0000 1.47 @@ -213,8 +213,8 @@ my ($pre,$post) = @_; print "/* XML application entry points. */\n" if @tags; for (@tags) { - print $pre . "void STag_$ctag{$_}(void)$post\n" unless $startok{$_}; - print $pre . "void ETag_$ctag{$_}(void)$post\n" unless $endok{$_}; + print $pre . "void STag_${tagprefix}$ctag{$_}(void)$post\n" unless $startok{$_}; + print $pre . "void ETag_${tagprefix}$ctag{$_}(void)$post\n" unless $endok{$_}; } } @@ -224,8 +224,8 @@ for (keys %atttype) { if (m.($Nmtoken)[/]($Nmtoken).xo) { my ($tag,$attribute) = ($1,$2); - print "typedef $typeof{$_} AT_$ctag{$tag}_$catt{$attribute};\n"; - print "#define AU_$ctag{$tag}_$catt{$attribute} NULL\n" + print "typedef $typeof{$_} AT_${tagprefix}$ctag{$tag}_$catt{$attribute};\n"; + print "#define AU_${tagprefix}$ctag{$tag}_$catt{$attribute} NULL\n" if not $enumtype{$_}; } } @@ -238,7 +238,7 @@ print $pre . "const char* pcdata;\n"; for (keys %atttype) { if (m.($Nmtoken)[/]($Nmtoken).xo) { - print $pre . "AT_$ctag{$1}_$catt{$2} A_$ctag{$1}_$catt{$2};\n"; + print $pre . "AT_${tagprefix}$ctag{$1}_$catt{$2} A_${tagprefix}$ctag{$1}_$catt{$2};\n"; } } } @@ -686,7 +686,7 @@ # All elements should be followed by nothing when at the root. # IF there is a list of roottags ($0 -r ..,..), then only add # the exittrans if it is in the list - $exittrans{$tag} .= ($exittrans{$tag}?',':'') . "ROOT_$c=>EPILOG" + $exittrans{$tag} .= ($exittrans{$tag}?',':'') . "ROOT_${tagprefix}$c=>EPILOG" if not %roottags or $roottags{$tag}; # Handle element declaration. @@ -796,13 +796,13 @@ s/\s+//go; s/\|/,/go; $enumtype{"$tag/$attribute"} = "$_"; - s/$Nmtoken/ "A_$ctag{$tag}_$catt{$attribute}_" . variablify($&) /xge; - my $undefined = "AU_$ctag{$tag}_$catt{$attribute}"; + s/$Nmtoken/ "A_${tagprefix}$ctag{$tag}_$catt{$attribute}_" . variablify($&) /xge; + my $undefined = "AU_${tagprefix}$ctag{$tag}_$catt{$attribute}"; s/^/enum \{ $undefined, /o; s/$/ \}/o; $typeof{"$tag/$attribute"} = "$_"; if ($default) { - $initof{"$tag/$attribute"} = "A_$ctag{$tag}_$catt{$attribute}_" + $initof{"$tag/$attribute"} = "A_${tagprefix}$ctag{$tag}_$catt{$attribute}_" . variablify($default); } else { @@ -975,6 +975,23 @@ for (@tags) { $roottags{$_} = 'true'; } } +# Handling prefix +if($opt{P}) { + my($h,$k); + my(@hashlist) = (\%states,\%emptytrans,\%instates,\%startstate, + \%endstates,\%exittrans); + + foreach $h (@hashlist) { + foreach $k (keys (%$h)) { + $$h{$k} =~ s/^E_/E_${tagprefix}/g; + $$h{$k} =~ s/,E_/,E_${tagprefix}/g; + $$h{$k} =~ s/>E_/>E_${tagprefix}/g; + $$h{$k} =~ s/^S_/S_${tagprefix}/g; + $$h{$k} =~ s/,S_/,S_${tagprefix}/g; + $$h{$k} =~ s/>S_/>S_${tagprefix}/g; + } + } +} # Debugging: show DTD representation. @@ -988,10 +1005,9 @@ my ($k,$v); my $out = ''; - while ( ($k, $v) = each(%$name) ) - { - $out .= "\n $k => " . ($v || "undef"); - } + while ( ($k, $v) = each(%$name) ) { + $out .= "\n $k => '" . ($v || "undef")."'"; + } return $out; } @@ -1045,7 +1061,6 @@ # WRITE API HEADER (if requested). - if ($opt{H}) { print STDOUT "Generating XML processor header in `$HEADER'.\n" if $verbose; @@ -1166,8 +1181,8 @@ for (@tags) { my $c = $ctag{$_}; print "%x" - . ($roottags{$_} ? " ROOT_$c" : "") - . " AL_$c " . join(' ',split(',',$states{$_})) . "\n"; + . ($roottags{$_} ? " ROOT_${tagprefix}$c" : "") + . " AL_${tagprefix}$c " . join(' ',split(',',$states{$_})) . "\n"; } } @@ -1191,8 +1206,8 @@ } for my $tag (@tags) { my $c = $ctag{$tag}; - print " ${tagprefix}statenames[ROOT_$c] = NULL;\n" if $roottags{$tag}; - print " ${tagprefix}statenames[AL_$c] = NULL;\n"; + print " ${tagprefix}statenames[ROOT_${tagprefix}$c] = NULL;\n" if $roottags{$tag}; + print " ${tagprefix}statenames[AL_${tagprefix}$c] = NULL;\n"; for (split ',',$states{$tag}) { print " ${tagprefix}statenames[$_] = \"$tag\";\n"; } @@ -1207,11 +1222,11 @@ for (keys %roottags) { my $c = $ctag{$_}; print " \"<!DOCTYPE\"{S}\"$_\"{S}" - . "SYSTEM{S}" . $sysid . "{s}\">\" SET(ROOT_$c);\n"; + . "SYSTEM{S}" . $sysid . "{s}\">\" SET(ROOT_${tagprefix}$c);\n"; if ($pubid) { print " \"<!DOCTYPE\"{S}\"$_\"{S}" . "PUBLIC{S}(\"'$pubid'\"|\"\\\"$pubid\\\"\"){S}" - . $sysid . "{s}\">\" SET(ROOT_$c);\n"; + . $sysid . "{s}\">\" SET(ROOT_${tagprefix}$c);\n"; } } @@ -1258,7 +1273,7 @@ # Start or empty tag: initialise attribute list. print "\n"; if ($roottags{$tag}) { - print "<ROOT_$myctag" . ($instates{$tag} ? ",$instates{$tag}" : ""); + print "<ROOT_${tagprefix}$myctag" . ($instates{$tag} ? ",$instates{$tag}" : ""); } else { print "<$instates{$tag}"; @@ -1269,9 +1284,9 @@ print ">\"<$tag\"{s} {\n"; for my $attribute (@myattributes) { - print " A_${myctag}_$catt{$attribute} = " . $initof{"$tag/$attribute"} . ";\n"; + print " A_${tagprefix}${myctag}_$catt{$attribute} = " . $initof{"$tag/$attribute"} . ";\n"; } - print " ENTER(AL_$myctag);\n"; + print " ENTER(AL_${tagprefix}$myctag);\n"; print " }\n"; # print " . FAIL(\"Unexpected character `%c': `<$tag' expected.\",yytext[0]);\n"; @@ -1281,7 +1296,7 @@ # Attribute list (of start or empty tag): print "\n"; - print "<AL_$myctag>{\n"; + print "<AL_${tagprefix}$myctag>{\n"; for my $attribute (@myattributes) { my $type; # set by conditions @@ -1293,7 +1308,7 @@ print " \"$attribute\"{Eq}\"'" . $attdef{"$tag/$attribute"} . "'\"" . " |\n" . " \"$attribute\"{Eq}\"\\\"" . $attdef{"$tag/$attribute"} . "\\\"\"" - . " A_${myctag}_$catt{$attribute}" + . " A_${tagprefix}${myctag}_$catt{$attribute}" . " = " . $initof{"$tag/$attribute"} . ";\n"; } else { @@ -1302,8 +1317,8 @@ print " \"$attribute\"{Eq}\"'$alternative'\"" . " |\n" . " \"$attribute\"{Eq}\"\\\"$alternative\\\"\"" - . " A_${myctag}_$catt{$attribute}" - . " = A_${myctag}_$catt{$attribute}_" . variablify($alternative) . ";\n"; + . " A_${tagprefix}${myctag}_$catt{$attribute}" + . " = A_${tagprefix}${myctag}_$catt{$attribute}_" . variablify($alternative) . ";\n"; } } } @@ -1314,23 +1329,23 @@ print " \"$attribute\"{Eq}\"'" . $attdef{"$tag/$attribute"} . "'\"" . " |\n" . " \"$attribute\"{Eq}\"\\\"" . $attdef{"$tag/$attribute"} . "\\\"\"" - . " A_${myctag}_$catt{$attribute}" + . " A_${tagprefix}${myctag}_$catt{$attribute}" . " = " . $initof{"$tag/$attribute"} . ";\n"; } elsif ($type = $literaltype{"$tag/$attribute"}) { # - (non-fixed) literal-type attribute: scan literal string directly, or - print " \"$attribute\"{Eq}\'$type\' BUFFERLITERAL('\\\'',A_${myctag}_$catt{$attribute});\n"; + print " \"$attribute\"{Eq}\'$type\' BUFFERLITERAL('\\\'',A_${tagprefix}${myctag}_$catt{$attribute});\n"; - print " \"$attribute\"{Eq}\\\"$type\\\" BUFFERLITERAL('\"',A_${myctag}_$catt{$attribute});\n"; + print " \"$attribute\"{Eq}\\\"$type\\\" BUFFERLITERAL('\"',A_${tagprefix}${myctag}_$catt{$attribute});\n"; } else { # - (non-fixed non-literal) attribute: scan string with entity expansion. - print " \"$attribute\"{Eq}\\' ENTER(VALUE1); BUFFERSET(A_${myctag}_$catt{$attribute});\n"; - print " \"$attribute\"{Eq}\\\" ENTER(VALUE2); BUFFERSET(A_${myctag}_$catt{$attribute});\n"; + print " \"$attribute\"{Eq}\\' ENTER(VALUE1); BUFFERSET(A_${tagprefix}${myctag}_$catt{$attribute});\n"; + print " \"$attribute\"{Eq}\\\" ENTER(VALUE2); BUFFERSET(A_${tagprefix}${myctag}_$catt{$attribute});\n"; } print "\n"; @@ -1341,11 +1356,11 @@ print " \">\" {\n"; for my $attribute (@myattributes) { if ($required{"$tag/$attribute"}) { - print " if (!A_$ctag{$tag}_" . variablify($attribute) . ")" + print " if (!A_${tagprefix}$ctag{$tag}_" . variablify($attribute) . ")" . " FAIL(\"Required attribute `$attribute' not set for `$tag' element.\");\n"; } } - print " LEAVE; STag_$myctag();" + print " LEAVE; STag_${tagprefix}$myctag();" . (%inmixed ? ' pushbuffer(pcdata);' : '') . ($mixed{$tag} ? 'BUFFERSET(pcdata)' : 'pcdata = NULL'). ";" . " ENTER($startstate{$tag});\n"; @@ -1356,14 +1371,14 @@ print " \"/>\" {\n"; for my $attribute (@myattributes) { if ($required{"$tag/$attribute"}) { - print " if (!A_$ctag{$tag}_" . variablify($attribute) . ")" + print " if (!A_${tagprefix}$ctag{$tag}_" . variablify($attribute) . ")" . " FAIL(\"Required attribute `$attribute' not set for `$tag' element.\");\n"; } } - print " LEAVE; STag_$myctag();" + print " LEAVE; STag_${tagprefix}$myctag();" . (%inmixed ? ' pushbuffer(pcdata);' : '') . ' pcdata = ' . ($mixed{$tag} ? '""' : 'NULL') . ';' - . " ETag_$myctag();" + . " ETag_${tagprefix}$myctag();" . (%inmixed ? ' pcdata = popbuffer();' : '') . "\n"; # @@ -1388,7 +1403,7 @@ print " \"</$tag\"{s}\">\" {\n"; print " LEAVE;\n"; print " BUFFERDONE;\n" if $mixed{$tag}; - print " ETag_$myctag();\n"; + print " ETag_${tagprefix}$myctag();\n"; print " pcdata = popbuffer();\n" if %inmixed; print $exitswitch; print " }\n"; @@ -1404,7 +1419,7 @@ # Errors when expecting root tag. if ($roottags{$tag} and $nofail) { print "\n"; - print "<ROOT_$myctag>{\n"; + print "<ROOT_${tagprefix}$myctag>{\n"; print " . FAIL(\"Unexpected character `%c': `$tag' element expected.\",yytext[0]);\n"; print " <<EOF>> FAIL(\"EOF in prolog.\");\n"; print "}\n"; @@ -1426,8 +1441,8 @@ my $sep = $`; for (@tags) { - print $sep . ($roottags{$_} ? "ROOT_$ctag{$_}," : "") - . "AL_$ctag{$_}"; + print $sep . ($roottags{$_} ? "ROOT_${tagprefix}$ctag{$_}," : "") + . "AL_${tagprefix}$ctag{$_}"; print ",$states{$_}" if $properempty{$_} or $children{$_}; $sep = ','; } @@ -1437,8 +1452,8 @@ elsif ( /FLEXML_COMMENTS([,>])/ ) { print "$`" - . join(',', map(($roottags{$_} ? "ROOT_$ctag{$_}," : "") - . "AL_$ctag{$_},$states{$_}", @tags)) + . join(',', map(($roottags{$_} ? "ROOT_${tagprefix}$ctag{$_}," : "") + . "AL_${tagprefix}$ctag{$_},$states{$_}", @tags)) . "$1$'"; } @@ -1545,19 +1560,19 @@ if ( m/^\#line ([0-9]+)/ ) { $lineno = $1; } - elsif ( m/^void\s+STag_($Name)\(void\)$/xo ) { + elsif ( m/^void\s+STag_${tagprefix}($Name)\(void\)$/xo ) { $tag = $1; die "\"$ACTIONS\", line $lineno: Unknown element `$tag'.\n" unless $ctag{$tag}; $startok{$tag} = 'true'; @myattributes = (exists $withattr{$tag} ? split /,/,"$withattr{$tag}" : ()); $isstart = 'true'; } - elsif ( m|^\}\s+\/\*\s+STag_($Name)\s+\*\/$|xo ) { + elsif ( m|^\}\s+\/\*\s+STag_${tagprefix}($Name)\s+\*\/$|xo ) { $tag = undef; @myattributes = (); $isstart = 'true'; } - elsif ( m/^void\s+ETag_($Name)\(void\)$/xo ) { + elsif ( m/^void\s+ETag_${tagprefix}($Name)\(void\)$/xo ) { $tag = $1; $endok{$1} = 'true'; $isstart = undef; @@ -1569,14 +1584,14 @@ # Replace special annotations with C equivalents. if ($tag) { - while ( s/\{($Name)\}/A_$ctag{$tag}_$catt{$1}/x ) { + while ( s/\{($Name)\}/A_${tagprefix}$ctag{$tag}_$catt{$1}/x ) { die "\"$ACTIONS\", line $lineno: Attributes only allowed in start tag.\n" if not $isstart; die "\"$ACTIONS\", line $lineno: Unknown attribute `$1' for <$tag>.\n" if not $atttype{"$tag/$1"}; } - while ( s/\{[!]($Name)\}/AU_$ctag{$tag}_$catt{$1}/x ) { + while ( s/\{[!]($Name)\}/AU_${tagprefix}$ctag{$tag}_$catt{$1}/x ) { die "\"$ACTIONS\", line $lineno: Attributes only allowed in start tag.\n" if not $isstart; die "\"$ACTIONS\", line $lineno: Unknown attribute `$1' for <$tag>.\n" @@ -1584,7 +1599,7 @@ } while ( s|\{($Name)=($Name)\}| - "A_$ctag{$tag}_$catt{$1}_" . variablify($2); |xe ) { + "A_${tagprefix}$ctag{$tag}_$catt{$1}_" . variablify($2); |xe ) { die "\"$ACTIONS\", line $lineno: Attributes only allowed in start tag.\n" if not $isstart; my ($att,$elt) = ($1,$2); @@ -1623,7 +1638,6 @@ close SCANNER || die "$0: Cannot close $SCANNER: $!\n"; } - =pod |