flexml-commits — CVS log messages

[Flexml-commits] flexml Makefile,1.35,1.36

[William D. <wdo...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16360

Modified Files:
	Makefile 
Log Message:
Move default rules not needed in this directory
down to Makefile in examples directory; skel is a dependency of flexml-act.l

Index: Makefile
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Makefile	24 Feb 2005 17:26:18 -0000	1.35
+++ Makefile	18 Mar 2005 22:00:55 -0000	1.36
@@ -86,29 +86,6 @@
 test::		all
 	@echo "Testing..."
 
-# DEFAULT RULES.
-
-# Generate C source from flex scanner.
-%.c: 		%.l
-	$(FLEX) -B -s -v $(FLEXDEBUG) -o$@ $<
-
-# Direct generation of stand-alone XML processor+application.
-# Note: The dependency must be of the form "appl.l: appl.act proc.dtd".
-%.l:		%.act
-	./flexml.pl $(FLEXDEBUG) -vA -a $^
-
-# Generate XML processor to link with application.
-%.l %.h:	%.dtd
-	./flexml.pl $(FLEXDEBUG) -v -s skel $<
-
-# Generate XML application C source to compile and link with processor.
-# Note: The dependency must be of the form "appl.c: appl.act proc.dtd".
-%.c:		%.act
-	./flexml.pl $(FLEXDEBUG) -vD -a $^
-
-
-# MAIN PROGRAM.
-
 clean::; $(RM) $(FLEXML) $(FLEXML_ACT) flexml-act flexml-act.c
 
 $(FLEXML):		flexml.pl
@@ -125,7 +102,7 @@
 endif
 
 # Action language...
-flexml-act.l:		flexml-act.dtd
+flexml-act.l:		flexml-act.dtd skel
 	$(PERL) ./flexml.pl $(FLEXDEBUG) -Lv -ractions -s skel $<
 
 flexml-act.c:		flexml-act.l

[Flexml-commits] flexml Makefile,1.34,1.35 Makefile.defs,1.1,1.2

[William D. <wdo...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23223

Modified Files:
	Makefile Makefile.defs 
Log Message:
Fix bug #1151175: make SUFF= failures.

Index: Makefile.defs
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile.defs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.defs	15 Feb 2005 19:32:37 -0000	1.1
+++ Makefile.defs	24 Feb 2005 17:26:18 -0000	1.2
@@ -1,4 +1,10 @@
 
+# SUFF is the versioning suffix added to binaries and resource files.
+# To get rid of it (and do a non-versionned install, for example), do:
+#   make whatever SUFF=
+
+SUFF ?=-$(VER)
+
 VER = 1.2
 
 # SETUP.
@@ -10,15 +16,18 @@
 BASE_DIR = /usr
 BASE_DIR_ARCH = $(BASE_DIR)
 
+FLEXML= flexml$(SUFF)
+FLEXML_ACT = flexml-act$(SUFF)
+
 BINDIR  = $(BASE_DIR_ARCH)/bin
 LIBDIR  = $(BASE_DIR_ARCH)/lib
 SHARE   = $(BASE_DIR)/share
 MAN1DIR = $(SHARE)/man/man1
-DOCDIR  = $(SHARE)/doc/flexml-$(VER)
-DATADIR = $(SHARE)/flexml-$(VER)
+DOCDIR  = $(SHARE)/doc/$(FLEXML)
+DATADIR = $(SHARE)/$(FLEXML)
 TMPDIR  = /var/tmp
 
-ACT     = $(LIBDIR)/flexml-act-$(VER)
+ACT     = $(LIBDIR)/$(FLEXML_ACT)
 SKEL    = $(DATADIR)/skel
 
 # Permanent program locations

Index: Makefile
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile	23 Feb 2005 23:32:56 -0000	1.34
+++ Makefile	24 Feb 2005 17:26:18 -0000	1.35
@@ -20,20 +20,18 @@
 
 # $Id$
 
-
-# SUFF is the versionning suffix added to binaries and resource files.
-# To get rid of it (and do a non-versionned install, for example), do:
+# SUFF (defined in Makefile.defs) is the versioning suffix added to binaries and
+# resource files. To get rid of it (and do a non-versioned install,
+# for example), do:
 #   make whatever SUFF=
 
-SUFF ?=-$(VER)
-
 # FILES.
 
 include Makefile.defs
 
 STUFF =	GPL Makefile Makefile.defs flexml.pl FleXML.html
-BINS  =	flexml$(SUFF)
-LIBS  =	flexml-act$(SUFF)
+BINS  =	$(FLEXML)
+LIBS  =	$(FLEXML_ACT)
 DATA  =	skel
 MANS  =	flexml.1
 DOCS  =	README NOTES TODO flexml-act.dtd EnlargeFlex.patch
@@ -61,25 +59,28 @@
 	install -m444 $(DOCS) $(DESTDIR)$(DOCDIR)/
 	install -m444 $(HTMLS) $(DESTDIR)$(DOCDIR)/html/
 	rm -f $(DESTDIR)$(BINDIR)/flexml
-	test "x$(SUFF)" = "x" || ln -s $(DESTDIR)$(BINDIR)/flexml$(SUFF) $(DESTDIR)$(BINDIR)/flexml
+	test "x$(SUFF)" = "x" || ln -s $(DESTDIR)$(BINDIR)/$(FLEXML) $(DESTDIR)$(BINDIR)/flexml
 	make -C examples install
 
+# This should probably be something different
+FLEXML_DIR = $(FLEXML)
+
 dist:		clean
 	@echo "Building distribution..."
-	mkdir flexml$(SUFF)/
+	mkdir $(FLEXML_DIR)
 	cp $(STUFF) $(DATA) $(DOCS) $(HTMLS) flexml-act-bootstrap.c \
-		flexml$(SUFF)/
-	cp -r examples flexml$(SUFF)/
-	find flexml$(SUFF) -name CVS | xargs rm -rf
-	find flexml$(SUFF) -name .cvsignore | xargs rm -rf
-	tar cvfz flexml$(SUFF).tar.gz flexml$(SUFF)
-	rm -rf flexml$(SUFF)/
+		$(FLEXML_DIR)
+	cp -r examples $(FLEXML_DIR)
+	find $(FLEXML_DIR) -name CVS | xargs rm -rf
+	find $(FLEXML_DIR) -name .cvsignore | xargs rm -rf
+	tar cvfz $(FLEXML_DIR).tar.gz $(FLEXML_DIR)
+	rm -rf $(FLEXML_DIR)
 
 	#rsync -v FleXML.html $(WEBHOME)/FleXML.html
 	#rsync -va --cvs-exclude --delete-excluded ./ $(FTPHOME)/
 
 clean::; @echo "Cleaning..."
-	$(RM) -rf flexml$(SUFF).tar.gz flexml$(SUFF)/
+	$(RM) -rf $(FLEXML_DIR).tar.gz $(FLEXML_DIR)
 	$(RM) *.[olh1] *-dummy.? lex.* *~ ./#*
 	find -name '*~' | xargs $(RM)
 test::		all
@@ -108,9 +109,9 @@
 
 # MAIN PROGRAM.
 
-clean::; $(RM) flexml$(SUFF) flexml-act$(SUFF) flexml-act flexml-act.c
+clean::; $(RM) $(FLEXML) $(FLEXML_ACT) flexml-act flexml-act.c
 
-flexml$(SUFF):		flexml.pl
+$(FLEXML):		flexml.pl
 	sed \
 	    -e "s;[.][/]flexml-act;$(ACT);g" \
 	    -e "s;[.][/]skel;$(SKEL);g" \
@@ -118,8 +119,10 @@
 	    -e "s;/usr/share/doc/;$(DOCDIR)/;g" flexml.pl > $@
 	chmod +x $@
 
-flexml-act$(SUFF): flexml-act
+ifneq ($(SUFF),)
+$(FLEXML_ACT): flexml-act
 	cp flexml-act $@
+endif
 
 # Action language...
 flexml-act.l:		flexml-act.dtd
@@ -140,11 +143,11 @@
 
 clean::; $(RM) flexml.html index.html pod2html-*
 
-flexml.1:	flexml$(SUFF)
-	$(POD2MAN) flexml$(SUFF) > $@
+flexml.1:	$(FLEXML)
+	$(POD2MAN) $(FLEXML) > $@
 
-flexml.html:	flexml$(SUFF)
-	$(POD2HTML) < flexml$(SUFF) > $@
+flexml.html:	$(FLEXML)
+	$(POD2HTML) < $(FLEXML) > $@
 
 index.html:	FleXML.html
 	sed 's.ftp/FleXML/..g' FleXML.html > $@

[Flexml-commits] flexml Makefile,1.33,1.34

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4870

Modified Files:
	Makefile 
Log Message:
Some doc about how to do non-versionned install with the SUFF stuff I just commited (sorry I should have done only one commit for the feature and its doc)

Index: Makefile
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile	23 Feb 2005 23:23:11 -0000	1.33
+++ Makefile	23 Feb 2005 23:32:56 -0000	1.34
@@ -20,10 +20,15 @@
 
 # $Id$
 
-# FILES.
+
+# SUFF is the versionning suffix added to binaries and resource files.
+# To get rid of it (and do a non-versionned install, for example), do:
+#   make whatever SUFF=
 
 SUFF ?=-$(VER)
 
+# FILES.
+
 include Makefile.defs
 
 STUFF =	GPL Makefile Makefile.defs flexml.pl FleXML.html

[Flexml-commits] flexml/debian changelog,1.15,1.16

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3818/debian

Modified Files:
	changelog 
Log Message:
Document 1.3 changes so far

Index: changelog
===================================================================
RCS file: /cvsroot/flexml/flexml/debian/changelog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- changelog	23 Feb 2005 21:52:03 -0000	1.15
+++ changelog	23 Feb 2005 23:30:07 -0000	1.16
@@ -1,3 +1,22 @@
+flexml (1.3-1) unstable; urgency=low
+
+  [William Dowling]
+  (infrastructure)
+  * Enhance main makefile to allow versionned installs
+  * various cleanups to the makefiles
+  (generated parsers)
+  * Don't allocate the statenames array over and over (plug memleak)
+  * Try not to exaust the stack when possible
+  
+  [Ulrik Petersen]
+  * Fix statenames array on terminaison (plug memleak)
+
+  [Martin Quinson]
+  (flexml.pl script)
+  * Get paranoid on file open()/close().
+
+ -- Martin Quinson <mqu...@de...>  Thu, 24 Feb 2005 00:24:27 +0100
+
 flexml (1.2-2) unstable; urgency=low
 
   * drop conflict on flex-old since oldies are harmless here.

[Flexml-commits] flexml/debian rules,1.4,1.5

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2122

Modified Files:
	rules 
Log Message:
Don't do versionned installs in the debian package

Index: rules
===================================================================
RCS file: /cvsroot/flexml/flexml/debian/rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rules	10 Feb 2005 10:55:07 -0000	1.4
+++ rules	23 Feb 2005 23:24:13 -0000	1.5
@@ -11,14 +11,14 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE)
+	$(MAKE) SUFF=
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-$(MAKE) clean
+	-$(MAKE) clean SUFF=
 	dh_clean
 
 install: build
@@ -26,7 +26,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp SUFF=
 	rm debian/tmp/usr/share/doc/flexml/EnlargeFlex.patch
 	touch install-stamp
 

[Flexml-commits] flexml Makefile,1.32,1.33

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1726

Modified Files:
	Makefile 
Log Message:
First try to let versionned install and regular ones coexist in the same Makefile

Index: Makefile
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile	15 Feb 2005 19:34:24 -0000	1.32
+++ Makefile	23 Feb 2005 23:23:11 -0000	1.33
@@ -22,11 +22,13 @@
 
 # FILES.
 
+SUFF ?=-$(VER)
+
 include Makefile.defs
 
 STUFF =	GPL Makefile Makefile.defs flexml.pl FleXML.html
-BINS  =	flexml-$(VER)
-LIBS  =	flexml-act-$(VER)
+BINS  =	flexml$(SUFF)
+LIBS  =	flexml-act$(SUFF)
 DATA  =	skel
 MANS  =	flexml.1
 DOCS  =	README NOTES TODO flexml-act.dtd EnlargeFlex.patch
@@ -54,25 +56,25 @@
 	install -m444 $(DOCS) $(DESTDIR)$(DOCDIR)/
 	install -m444 $(HTMLS) $(DESTDIR)$(DOCDIR)/html/
 	rm -f $(DESTDIR)$(BINDIR)/flexml
-	ln -s $(DESTDIR)$(BINDIR)/flexml-$(VER) $(DESTDIR)$(BINDIR)/flexml
+	test "x$(SUFF)" = "x" || ln -s $(DESTDIR)$(BINDIR)/flexml$(SUFF) $(DESTDIR)$(BINDIR)/flexml
 	make -C examples install
 
 dist:		clean
 	@echo "Building distribution..."
-	mkdir flexml-$(VER)/
+	mkdir flexml$(SUFF)/
 	cp $(STUFF) $(DATA) $(DOCS) $(HTMLS) flexml-act-bootstrap.c \
-		flexml-$(VER)/
-	cp -r examples flexml-$(VER)/
-	find flexml-$(VER) -name CVS | xargs rm -rf
-	find flexml-$(VER) -name .cvsignore | xargs rm -rf
-	tar cvfz flexml-$(VER).tar.gz flexml-$(VER)
-	rm -rf flexml-$(VER)/
+		flexml$(SUFF)/
+	cp -r examples flexml$(SUFF)/
+	find flexml$(SUFF) -name CVS | xargs rm -rf
+	find flexml$(SUFF) -name .cvsignore | xargs rm -rf
+	tar cvfz flexml$(SUFF).tar.gz flexml$(SUFF)
+	rm -rf flexml$(SUFF)/
 
 	#rsync -v FleXML.html $(WEBHOME)/FleXML.html
 	#rsync -va --cvs-exclude --delete-excluded ./ $(FTPHOME)/
 
 clean::; @echo "Cleaning..."
-	$(RM) -rf flexml-$(VER).tar.gz flexml-$(VER)/
+	$(RM) -rf flexml$(SUFF).tar.gz flexml$(SUFF)/
 	$(RM) *.[olh1] *-dummy.? lex.* *~ ./#*
 	find -name '*~' | xargs $(RM)
 test::		all
@@ -101,9 +103,9 @@
 
 # MAIN PROGRAM.
 
-clean::; $(RM) flexml-$(VER) flexml-act-$(VER) flexml-act flexml-act.c
+clean::; $(RM) flexml$(SUFF) flexml-act$(SUFF) flexml-act flexml-act.c
 
-flexml-$(VER):		flexml.pl
+flexml$(SUFF):		flexml.pl
 	sed \
 	    -e "s;[.][/]flexml-act;$(ACT);g" \
 	    -e "s;[.][/]skel;$(SKEL);g" \
@@ -111,7 +113,7 @@
 	    -e "s;/usr/share/doc/;$(DOCDIR)/;g" flexml.pl > $@
 	chmod +x $@
 
-flexml-act-$(VER): flexml-act
+flexml-act$(SUFF): flexml-act
 	cp flexml-act $@
 
 # Action language...
@@ -133,11 +135,11 @@
 
 clean::; $(RM) flexml.html index.html pod2html-*
 
-flexml.1:	flexml-$(VER)
-	$(POD2MAN) flexml-$(VER) > $@
+flexml.1:	flexml$(SUFF)
+	$(POD2MAN) flexml$(SUFF) > $@
 
-flexml.html:	flexml-$(VER)
-	$(POD2HTML) < flexml-$(VER) > $@
+flexml.html:	flexml$(SUFF)
+	$(POD2HTML) < flexml$(SUFF) > $@
 
 index.html:	FleXML.html
 	sed 's.ftp/FleXML/..g' FleXML.html > $@

[Flexml-commits] flexml flexml.pl,1.43,1.44

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28732

Modified Files:
	flexml.pl 
Log Message:
Get paranoid on file open()/close(). Should be enough to close patch #659746, which got lost

Index: flexml.pl
===================================================================
RCS file: /cvsroot/flexml/flexml/flexml.pl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- flexml.pl	17 Feb 2005 22:14:32 -0000	1.43
+++ flexml.pl	23 Feb 2005 23:08:16 -0000	1.44
@@ -1046,7 +1046,7 @@
 
   print STDOUT "Generating XML processor header in `$HEADER'.\n" if $verbose;
 
-  open HEADER, "+>$HEADER";
+  open HEADER, "+>$HEADER" || die "$0: cannot write $HEADER: $!\n";
   select HEADER;
 
   # Identification and license.
@@ -1081,7 +1081,7 @@
     
   print "#endif\n";
 
-  close HEADER;
+  close HEADER || die "$0: cannot read $HEADER: $!\n"; 
 }
 
 
@@ -1095,10 +1095,10 @@
              . ($opt{a} || $opt{A} ? " and application" : "")
              . " onto `$SCANNER'.\n" if $verbose;
 
-  open SCANNER, "+>$SCANNER";
+  open SCANNER, "+>$SCANNER"|| die "$0: cannot write $SCANNER: $!\n";
   select SCANNER;
 
-  open SKELETON;
+  open (SKELETON) || die "$0: cannot read $SKELETON: $!\n";
 
   # Identification and license.
   print "/* Validating XML processor for $dtd"
@@ -1483,8 +1483,10 @@
 
   }
 
-  close SKELETON;
-  close SCANNER unless $opt{A};
+  close SKELETON || die "$0: Cannot close $SKELETON: $!\n";
+  unless ($opt{A}) {
+    close SCANNER || die "$0: Cannot close $SCANNER: $!\n";
+  }
 }
 
 
@@ -1498,7 +1500,7 @@
              . ($opt{a} ? "" : " dummy")
              . " application onto `$APPLICATION'.\n" if $verbose;
 
-  open APPLICATION, "+>$APPLICATION";
+  open APPLICATION, "+>$APPLICATION" || die "$0: Cannot write $APPLICATION: $!\n";
   select APPLICATION;
 
   # Identification and license.
@@ -1522,7 +1524,7 @@
   # Get requested actions.
   if ($ACTIONS) {
 
-    open ACTIONS, "./flexml-act $ACTIONS|";
+    open ACTIONS, "./flexml-act $ACTIONS|" || die "$0: Cannot exec ./flexml-act $ACTIONS: $!\n";
 
     my ($tag,$attribute);
     my @myattributes;
@@ -1597,7 +1599,7 @@
       print $_;
 
     }
-    close ACTIONS;
+    close ACTIONS || die "$0: Cannot close pipe to flexml-act: $!\n";
     print "\n";
   }
 
@@ -1607,10 +1609,10 @@
 }
 
 if ($opt{D}) {
-  close APPLICATION;
+  close APPLICATION || die "$0: Cannot close $APPLICATION: $!\n";
 }
 elsif ($opt{A}) {
-  close SCANNER;
+  close SCANNER || die "$0: Cannot close $SCANNER: $!\n";
 }
 
 

[Flexml-commits] flexml skel,1.25,1.26

[William D. <wdo...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12032

Modified Files:
	skel 
Log Message:
Set freed pointer to NULL for possible reuse.

Index: skel
===================================================================
RCS file: /cvsroot/flexml/flexml/skel,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- skel	23 Feb 2005 18:04:38 -0000	1.25
+++ skel	23 Feb 2005 22:22:20 -0000	1.26
@@ -325,8 +325,10 @@
 
 static void cleanup(void)
 {
-    if (statenames)
+    if (statenames) {
         free(statenames);
+	statenames = NULL;
+    }
 }
 
 

[Flexml-commits] flexml/debian control,1.6,1.7

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4534

Modified Files:
	control 
Log Message:
Not only document changes, but also do them

Index: control
===================================================================
RCS file: /cvsroot/flexml/flexml/debian/control,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- control	10 Feb 2005 11:26:17 -0000	1.6
+++ control	23 Feb 2005 22:03:55 -0000	1.7
@@ -10,7 +10,6 @@
 Architecture: any
 Depends: ${shlibs:Depends}, libwww-perl, liburi-perl, libdate-calc-perl
 Recommends: flex
-Conflicts: flex-old
 Description: generate fast validating XML processors and applications
  FleXML makes it easy to generate very fast validating XML processors
  as flex(1) source.

[Flexml-commits] flexml/debian changelog,1.14,1.15

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32709

Modified Files:
	changelog 
Log Message:
Drop conflict against flex-old since it's not needed and since it makes difficulties to people

Index: changelog
===================================================================
RCS file: /cvsroot/flexml/flexml/debian/changelog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- changelog	13 Feb 2005 18:54:05 -0000	1.14
+++ changelog	23 Feb 2005 21:52:03 -0000	1.15
@@ -1,3 +1,9 @@
+flexml (1.2-2) unstable; urgency=low
+
+  * drop conflict on flex-old since oldies are harmless here.
+
+ -- Martin Quinson <mqu...@de...>  Wed, 23 Feb 2005 22:04:14 +0100
+
 flexml (1.2-1) unstable; urgency=low
 
   [Martin Quinson]

[Flexml-commits] flexml skel,1.24,1.25

[William D. <wdo...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6495

Modified Files:
	skel 
Log Message:
Fix memory leak reported in bug #1126171; thanks to Ulrik Petersen for patch.

Index: skel
===================================================================
RCS file: /cvsroot/flexml/flexml/skel,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- skel	10 Feb 2005 11:42:39 -0000	1.24
+++ skel	23 Feb 2005 18:04:38 -0000	1.25
@@ -55,12 +55,16 @@
 
 /* Generic actions. */
 #define SKIP	/*skip*/
-#define SUCCEED	return 0
+#define SUCCEED        CLEANUP; return 0
 
 #define FAIL	return fail
 static int fail(const char*, ...);
 const char * parse_err_msg(void);
 
+/* Cleanup */
+static void cleanup(void);
+#define CLEANUP  cleanup()
+
 /* Text buffer stack handling. */
 char bufferstack[FLEXML_BUFFERSTACKSIZE];
 char* limit = bufferstack + FLEXML_BUFFERSTACKSIZE;
@@ -213,7 +217,7 @@
  /* EPILOG: after the root element. */
 
 <EPILOG>{
- . {SET(PROLOG); yyless(0); return -1;}
+ . {SET(PROLOG); yyless(0); CLEANUP; return -1;}
  <<EOF>> 	SUCCEED;
 }
 
@@ -319,6 +323,13 @@
 }
 
 
+static void cleanup(void)
+{
+    if (statenames)
+        free(statenames);
+}
+
+
 static int fail(const char* fmt, ...)
 {
     int chars_left, used;
@@ -341,6 +352,8 @@
     fprintf(stderr, "%s\n", flexml_err_msg);
     flexml_err_msg[0] = '\0';
 #endif
-   
+
+    cleanup();
+
     return 1;
 }

[Flexml-commits] flexml flexml.pl,1.42,1.43

[William D. <wdo...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14768

Modified Files:
	flexml.pl 
Log Message:
Set bufferstack pointer to beginning so multiple invocations
of yylex() don"t exhaust the stack; don"t reinitialize statenames[]
elements (closes bug #1028705)

Index: flexml.pl
===================================================================
RCS file: /cvsroot/flexml/flexml/flexml.pl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- flexml.pl	16 Feb 2005 14:54:46 -0000	1.42
+++ flexml.pl	17 Feb 2005 22:14:32 -0000	1.43
@@ -1180,7 +1180,8 @@
       my ($state, $tag);
 
       print "  /* FleXML_init */\n";
-      print "  if(!statenames) statenames= (const char **)calloc(IMPOSSIBLE,sizeof(char*));\n";
+      print "  next = bufferstack;\n";
+      print "  if(!statenames) {statenames= (const char **)calloc(IMPOSSIBLE,sizeof(char*));\n";
       for ('PROLOG','DOCTYPE','EPILOG','INCOMMENT','INPI','VALUE1','VALUE2','CDATA') {
 	print "  statenames[$_] = NULL;\n";
       }
@@ -1192,7 +1193,7 @@
 	  print "  statenames[$_] = \"$tag\";\n";
 	}
       }
-
+      print "  }\n";
     }
     elsif ( /^FLEXML_DOCTYPES$/ ) {
 

[Flexml-commits] flexml flexml.pl,1.41,1.42

[William D. <wdo...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11765

Modified Files:
	flexml.pl 
Log Message:
Add q to getopts() param so -q is accepted.

Index: flexml.pl
===================================================================
RCS file: /cvsroot/flexml/flexml/flexml.pl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- flexml.pl	15 Feb 2005 19:37:08 -0000	1.41
+++ flexml.pl	16 Feb 2005 14:54:46 -0000	1.42
@@ -488,7 +488,7 @@
 $Use = "Usage: flexml [-ASHDvdqnLXV] [-s skel] [-p pubid] [-u uri]\n"
      . "       [-b stack_size] [-r roottags] [-a actions] name[.dtd]";
 
-getopts('ASHDvdnLXVp:b:s:u:r:a:', \%opt);
+getopts('ASHDvdnLXVqp:b:s:u:r:a:', \%opt);
 
 # Version!
 print "FleXML version $Id.\n" if $opt{V} or $opt{v};

[Flexml-commits] flexml flexml.pl,1.40,1.41

[William D. <wdo...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30096

Modified Files:
	flexml.pl 
Log Message:
Default skel file is pulled from configurable location

Index: flexml.pl
===================================================================
RCS file: /cvsroot/flexml/flexml/flexml.pl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- flexml.pl	13 Feb 2005 18:54:05 -0000	1.40
+++ flexml.pl	15 Feb 2005 19:37:08 -0000	1.41
@@ -516,7 +516,7 @@
 $stacksize = ($opt{'b'} ? $opt{'b'} : 100000);
 
 # Set skeleton scanner file name and check it is readable (if needed).
-$SKELETON = ($opt{'s'} ? $opt{'s'} : '/usr/share/flexml/skel');
+$SKELETON = ($opt{'s'} ? $opt{'s'} : './skel');
 die "$0: No skeleton file $SKELETON.\n" if not -r $SKELETON and $opt{S};
 
 # Set document type URI and PUBID.

[Flexml-commits] flexml/examples Makefile,1.2,1.3

[William D. <wdo...@us...>]

Update of /cvsroot/flexml/flexml/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29695/examples

Modified Files:
	Makefile 
Log Message:
Extract common defs to ../Makefile.defs

Index: Makefile
===================================================================
RCS file: /cvsroot/flexml/flexml/examples/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	5 Jan 2005 18:51:35 -0000	1.2
+++ Makefile	15 Feb 2005 19:35:25 -0000	1.3
@@ -22,6 +22,8 @@
 
 # FILES.
 
+include ../Makefile.defs
+
 SAMPS =	my.dtd my-show.act my-joke.xml my-joke2.xml my-joke3.xml \
 	tricky.dtd tricky.act tricky.xml \
 	test.html
@@ -29,34 +31,10 @@
 SRC =	$(SAMPS)
 ALL =	$(SAMPS)
 
-# SETUP.
-
-# Installation paths
-USR = /usr
-BINDIR = $(USR)/bin
-LIBDIR = $(USR)/lib
-SHARE = /usr/share
-MAN1DIR = $(SHARE)/man/man1
-DOCDIR = $(SHARE)/doc
-DATADIR = $(SHARE)/flexml
-TMPDIR = /var/tmp
-
-# Permanent program locations
-PERL = /usr/bin/perl
-FLEX = /usr/bin/flex
-FLEXML = $(BINDIR)/flexml
-ACT = $(LIBDIR)/flexml-act
-SKEL = $(DATADIR)/skel
-
-# Build compilation setup.
-CC = gcc -Wall -ansi -pedantic
-CFLAGS = -O2 -g
-#FLEXDEBUG = -d
+.PHONY:		all install dist test clean
 
 # PRIMARY TARGETS.
 
-.PHONY:		all install dist test clean
-
 start: test
 
 all:		$(ALL)

[Flexml-commits] flexml Makefile,1.31,1.32

[William D. <wdo...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29487

Modified Files:
	Makefile 
Log Message:
Extract common defs to Makefile.defs; install flexml
to version-specific location; general cleanup

Index: Makefile
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile	10 Feb 2005 12:16:05 -0000	1.31
+++ Makefile	15 Feb 2005 19:34:24 -0000	1.32
@@ -22,79 +22,46 @@
 
 # FILES.
 
-VER = 1.2
+include Makefile.defs
 
-STUFF =	GPL Makefile flexml.pl FleXML.html
-BINS =	flexml
-LIBS =	flexml-act
-DATA =	skel
-MANS =	flexml.1
-DOCS =	README NOTES TODO flexml-act.dtd EnlargeFlex.patch
+STUFF =	GPL Makefile Makefile.defs flexml.pl FleXML.html
+BINS  =	flexml-$(VER)
+LIBS  =	flexml-act-$(VER)
+DATA  =	skel
+MANS  =	flexml.1
+DOCS  =	README NOTES TODO flexml-act.dtd EnlargeFlex.patch
 HTMLS =	FleXML.html 
-# index.html flexml.html paper.html
-SAMPS =	
-#SAMPS =	my.dtd my-show.act my-joke.xml my-joke2.xml my-joke3.xml \
-#	tricky.dtd tricky.act tricky.xml \
-#	test.html
-
-SRC =	$(STUFF) $(DATA) $(DOCS) $(HTMLS) $(SAMPS)
-ALL =	$(PROGS) $(LIBS) $(DATA) $(MANS) $(DOCS) $(HTMLS) $(SAMPS)
-
-# SETUP.
-
-# Installation paths
-USR = /usr
-BINDIR = $(USR)/bin
-LIBDIR = $(USR)/lib
-SHARE = /usr/share
-MAN1DIR = $(SHARE)/man/man1
-DOCDIR = $(SHARE)/doc
-DATADIR = $(SHARE)/flexml
-TMPDIR = /var/tmp
-
-# Permanent program locations
-PERL = /usr/bin/perl
-POD2MAN = /usr/bin/pod2man
-POD2HTML =/usr/bin/pod2html
-FLEX = /usr/bin/flex
-FLEXML = $(BINDIR)/flexml
-ACT = $(LIBDIR)/flexml-act
-SKEL = $(DATADIR)/skel
-
-# Build compilation setup.
-CC = gcc -Wall -ansi -pedantic
-CFLAGS = -O2 -g
-#FLEXDEBUG = -d
 
-# Web location.
+SRC =	$(STUFF) $(DATA) $(DOCS) $(HTMLS)
+ALL =	$(PROGS) $(LIBS) $(DATA) $(MANS) $(DOCS) $(HTMLS)
 
-WEBHOME = info:public_html
-FTPHOME = info:public_html/ftp/FleXML
+.PHONY:		all install dist test clean
 
 # PRIMARY TARGETS.
 
-.PHONY:		all install dist test clean
-
 all:		$(ALL)
 
 install:	$(ALL)
 	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) \
 		$(DESTDIR)$(MAN1DIR) $(DESTDIR)$(DOCDIR) \
 		$(DESTDIR)$(DATADIR) \
-		$(DESTDIR)$(DOCDIR)/flexml/html \
-		$(DESTDIR)$(DOCDIR)/flexml/examples
+		$(DESTDIR)$(DOCDIR)/html \
+		$(DESTDIR)$(DOCDIR)/examples
 	install -m555 $(BINS) $(DESTDIR)$(BINDIR)/
 	install -m555 $(LIBS) $(DESTDIR)$(LIBDIR)/
 	install -m444 $(DATA) $(DESTDIR)$(DATADIR)/
 	install -m444 $(MANS) $(DESTDIR)$(MAN1DIR)/
-	install -m444 $(DOCS) $(DESTDIR)$(DOCDIR)/flexml/
-	install -m444 $(HTMLS) $(DESTDIR)$(DOCDIR)/flexml/html/
+	install -m444 $(DOCS) $(DESTDIR)$(DOCDIR)/
+	install -m444 $(HTMLS) $(DESTDIR)$(DOCDIR)/html/
+	rm -f $(DESTDIR)$(BINDIR)/flexml
+	ln -s $(DESTDIR)$(BINDIR)/flexml-$(VER) $(DESTDIR)$(BINDIR)/flexml
 	make -C examples install
 
 dist:		clean
 	@echo "Building distribution..."
 	mkdir flexml-$(VER)/
-	cp $(STUFF) $(DATA) $(DOCS) $(HTMLS) $(SAMPS) flexml-act-bootstrap.c flexml-$(VER)/
+	cp $(STUFF) $(DATA) $(DOCS) $(HTMLS) flexml-act-bootstrap.c \
+		flexml-$(VER)/
 	cp -r examples flexml-$(VER)/
 	find flexml-$(VER) -name CVS | xargs rm -rf
 	find flexml-$(VER) -name .cvsignore | xargs rm -rf
@@ -105,7 +72,7 @@
 	#rsync -va --cvs-exclude --delete-excluded ./ $(FTPHOME)/
 
 clean::; @echo "Cleaning..."
-	$(RM) -rf flexml-$(VER)/
+	$(RM) -rf flexml-$(VER).tar.gz flexml-$(VER)/
 	$(RM) *.[olh1] *-dummy.? lex.* *~ ./#*
 	find -name '*~' | xargs $(RM)
 test::		all
@@ -134,19 +101,22 @@
 
 # MAIN PROGRAM.
 
-clean::; $(RM) flexml flexml-act flexml-act.c
+clean::; $(RM) flexml-$(VER) flexml-act-$(VER) flexml-act flexml-act.c
 
-flexml:		flexml.pl
+flexml-$(VER):		flexml.pl
 	sed \
 	    -e "s;[.][/]flexml-act;$(ACT);g" \
 	    -e "s;[.][/]skel;$(SKEL);g" \
 	    -e "s;/var/tmp;$(TMPDIR);g" \
-	    -e "s;/usr/share/doc/;$(DOCDIR)/;g" flexml.pl >flexml
-	chmod +x flexml
+	    -e "s;/usr/share/doc/;$(DOCDIR)/;g" flexml.pl > $@
+	chmod +x $@
+
+flexml-act-$(VER): flexml-act
+	cp flexml-act $@
 
 # Action language...
 flexml-act.l:		flexml-act.dtd
-	./flexml.pl $(FLEXDEBUG) -Lv -ractions -s skel $<
+	$(PERL) ./flexml.pl $(FLEXDEBUG) -Lv -ractions -s skel $<
 
 flexml-act.c:		flexml-act.l
 	$(FLEX) -B -s -v -oflexml-act.c flexml-act.l
@@ -163,14 +133,14 @@
 
 clean::; $(RM) flexml.html index.html pod2html-*
 
-flexml.1:	flexml
-	$(POD2MAN) flexml >flexml.1
+flexml.1:	flexml-$(VER)
+	$(POD2MAN) flexml-$(VER) > $@
 
-flexml.html:	flexml
-	$(POD2HTML) <flexml >flexml.html
+flexml.html:	flexml-$(VER)
+	$(POD2HTML) < flexml-$(VER) > $@
 
 index.html:	FleXML.html
-	sed 's.ftp/FleXML/..g' FleXML.html >index.html
+	sed 's.ftp/FleXML/..g' FleXML.html > $@
 
 # TESTS.
 

[Flexml-commits] flexml Makefile.defs,NONE,1.1

[William D. <wdo...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28943

Added Files:
	Makefile.defs 
Log Message:
Initial revision

--- NEW FILE: Makefile.defs ---

VER = 1.2

# SETUP.

# Installation paths

# BASE_DIR:      like --prefix for configure
# BASE_DIR_ARCH: like --exec-prefix for configure
BASE_DIR = /usr
BASE_DIR_ARCH = $(BASE_DIR)

BINDIR  = $(BASE_DIR_ARCH)/bin
LIBDIR  = $(BASE_DIR_ARCH)/lib
SHARE   = $(BASE_DIR)/share
MAN1DIR = $(SHARE)/man/man1
DOCDIR  = $(SHARE)/doc/flexml-$(VER)
DATADIR = $(SHARE)/flexml-$(VER)
TMPDIR  = /var/tmp

ACT     = $(LIBDIR)/flexml-act-$(VER)
SKEL    = $(DATADIR)/skel

# Permanent program locations
PERL_DIR = /usr/bin
PERL     = $(PERL_DIR)/perl
POD2MAN  = $(PERL_DIR)/pod2man
POD2HTML = $(PERL_DIR)/pod2html

FLEX     = /usr/bin/flex

# Build compilation setup.
CC = gcc -Wall -ansi -pedantic
CFLAGS = -O2 -g
#FLEXDEBUG = -d

# Web location.

WEBHOME = info:public_html
FTPHOME = info:public_html/ftp/FleXML

[Flexml-commits] flexml/debian changelog,1.13,1.14

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25465/debian

Modified Files:
	changelog 
Log Message:
Clarify the licence of the produced parsers. Thanks to Ulrik Petersen for proposing the patch, and to Kristoffer H Rose for forwarding it.

Index: changelog
===================================================================
RCS file: /cvsroot/flexml/flexml/debian/changelog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- changelog	13 Feb 2005 18:32:36 -0000	1.13
+++ changelog	13 Feb 2005 18:54:05 -0000	1.14
@@ -1,7 +1,9 @@
 flexml (1.2-1) unstable; urgency=low
 
   [Martin Quinson]
-  * add a \n after the error messages when not using quiet_parsers
+  * Add a \n after the error messages when not using quiet_parsers
+  * Clarify the licence of the produced parsers. Thanks to Ulrik Petersen
+    for proposing the patch, and to Kristoffer H Rose for forwarding it.
 
   [Arnaud Legrand]
   * Add a -b option to modify the default FLEXML_BUFFERSTACKSIZE.

[Flexml-commits] flexml flexml.pl,1.39,1.40

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25465

Modified Files:
	flexml.pl 
Log Message:
Clarify the licence of the produced parsers. Thanks to Ulrik Petersen for proposing the patch, and to Kristoffer H Rose for forwarding it.

Index: flexml.pl
===================================================================
RCS file: /cvsroot/flexml/flexml/flexml.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- flexml.pl	13 Feb 2005 18:12:19 -0000	1.39
+++ flexml.pl	13 Feb 2005 18:54:05 -0000	1.40
@@ -159,14 +159,25 @@
 
 
 sub redistribute { # Print C comment with generated file "license".
+                   # Notice that this is not intended to affect
+                   # flexml.pl itself.
   my ($pre) = @_;
   print <<EOT;
-$pre This program was generated with the FleXML XML processor generator,
+$pre This program was generated with the FleXML XML processor generator.
+$pre FleXML is Copyright © 1999-2005 Kristoffer Rose.  All rights reserved.
 $pre ($Id).
-$pre Copyright © 1999 Kristoffer Rose.  All rights reserved.
+$pre 
+$pre There are two, intertwined parts to this program, part A and part B.
 $pre
-$pre You can redistribute and/or modify this program provided the following
-$pre two conditions hold:
+$pre Part A
+$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
+$pre You can redistribute, use, perform, display and/or modify "Part A"
+$pre provided the following two conditions hold:
 $pre
 $pre 1. The program is distributed WITHOUT ANY WARRANTY from the author of
 $pre    FleXML; without even the implied warranty of MERCHANTABILITY or
@@ -179,6 +190,20 @@
 $pre Notice that these are explicit rights granted to you for files
 $pre generated by the FleXML system.  For your rights in connection with
 $pre the FleXML system itself please consult the GNU General Public License.
+$pre 
+$pre Part B
+$pre ------
+$pre 
+$pre The other parts, here collectively called "Part B", and which came 
+$pre from the DTD used by FleXML to generate this program, can be 
+$pre distributed (or not, as the case may be) under the terms of whoever
+$pre wrote them, provided these terms respect and obey the two conditions 
+$pre above under the heading "Part A".
+$pre
+$pre The author of and contributors to FleXML specifically disclaim
+$pre any copyright interest in "Part B", unless "Part B" was written 
+$pre by the author of or contributors to FleXML.
+$pre 
 EOT
 }
 

[Flexml-commits] flexml/debian changelog,1.12,1.13

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14338/debian

Modified Files:
	changelog 
Log Message:
Document [Arnaud's] last changes, and go for the release (I need those changes)

Index: changelog
===================================================================
RCS file: /cvsroot/flexml/flexml/debian/changelog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- changelog	10 Feb 2005 11:56:33 -0000	1.12
+++ changelog	13 Feb 2005 18:32:36 -0000	1.13
@@ -1,9 +1,13 @@
-flexml (1.2-1) NOT RELEASED YET; urgency=low
+flexml (1.2-1) unstable; urgency=low
 
   [Martin Quinson]
   * add a \n after the error messages when not using quiet_parsers
 
- -- Martin Quinson <mqu...@de...>  Thu, 10 Feb 2005 12:55:37 +0100
+  [Arnaud Legrand]
+  * Add a -b option to modify the default FLEXML_BUFFERSTACKSIZE.
+    That is useful when you get an error like "Assertion next<limit' failed".
+
+ -- Martin Quinson <mqu...@de...>  Sun, 13 Feb 2005 19:23:45 +0100
 
 flexml (1.1-1) unstable; urgency=low
 

[Flexml-commits] flexml flexml.pl,1.38,1.39

[Arnaud L. <leg...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3476

Modified Files:
	flexml.pl 
Log Message:
Add an option to modify the default FLEXML_BUFFERSTACKSIZE. That is useful
when you get an error like "Assertion next<limit' failed".



Index: flexml.pl
===================================================================
RCS file: /cvsroot/flexml/flexml/flexml.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- flexml.pl	10 Feb 2005 11:13:51 -0000	1.38
+++ flexml.pl	13 Feb 2005 18:12:19 -0000	1.39
@@ -53,6 +53,7 @@
 my $quiet_parser;		# -q option flag
 my $uri;			# -u option uri
 my $pubid;			# -p option string
+my $stacksize;			# -b option flag
 
 my $dtd;			# DTD file name (or URI)
 my $dtdrevision;		# DTD version pruned from file
@@ -460,9 +461,9 @@
 
 # Parse options.
 $Use = "Usage: flexml [-ASHDvdqnLXV] [-s skel] [-p pubid] [-u uri]\n"
-     . "       [-r roottags] [-a actions] name[.dtd]";
+     . "       [-b stack_size] [-r roottags] [-a actions] name[.dtd]";
 
-getopts('ASHDvdnLXVp:s:u:r:a:', \%opt);
+getopts('ASHDvdnLXVp:b:s:u:r:a:', \%opt);
 
 # Version!
 print "FleXML version $Id.\n" if $opt{V} or $opt{v};
@@ -486,6 +487,9 @@
   for (split ',',$opt{r}) { $roottags{$_} = 'true'; }
 }
 
+# Specific stack size?
+$stacksize = ($opt{'b'} ? $opt{'b'} : 100000);
+
 # Set skeleton scanner file name and check it is readable (if needed).
 $SKELETON = ($opt{'s'} ? $opt{'s'} : '/usr/share/flexml/skel');
 die "$0: No skeleton file $SKELETON.\n" if not -r $SKELETON and $opt{S};
@@ -1103,7 +1107,7 @@
       print "#define FLEXML_NOFAIL\n" if $nofail;
       print "#define FLEXML_quiet_parser\n" if $quiet_parser;
       print "#define FLEXML_HasMixed\n" if %inmixed;
-      print "#define FLEXML_BUFFERSTACKSIZE 100000\n";
+      print "#define FLEXML_BUFFERSTACKSIZE $stacksize\n";
       print "\n";
 
       if ($opt{A}) {
@@ -1712,6 +1716,12 @@
 
 Use the skeleton scanner I<skel> instead of the default.
 
+=item 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<-u> I<uri>
 
 Sets the URI of the DTD, used in the C<DOCTYPE> header, to the

[Flexml-commits] flexml Makefile,1.30,1.31

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27219

Modified Files:
	Makefile 
Log Message:
Go for next release

Index: Makefile
===================================================================
RCS file: /cvsroot/flexml/flexml/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile	10 Feb 2005 10:50:05 -0000	1.30
+++ Makefile	10 Feb 2005 12:16:05 -0000	1.31
@@ -22,7 +22,7 @@
 
 # FILES.
 
-VER = 1.1
+VER = 1.2
 
 STUFF =	GPL Makefile flexml.pl FleXML.html
 BINS =	flexml

[Flexml-commits] flexml/debian changelog,1.11,1.12

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19126/debian

Modified Files:
	changelog 
Log Message:
Document last changes and go on for next release

Index: changelog
===================================================================
RCS file: /cvsroot/flexml/flexml/debian/changelog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- changelog	10 Feb 2005 11:26:17 -0000	1.11
+++ changelog	10 Feb 2005 11:56:33 -0000	1.12
@@ -1,3 +1,10 @@
+flexml (1.2-1) NOT RELEASED YET; urgency=low
+
+  [Martin Quinson]
+  * add a \n after the error messages when not using quiet_parsers
+
+ -- Martin Quinson <mqu...@de...>  Thu, 10 Feb 2005 12:55:37 +0100
+
 flexml (1.1-1) unstable; urgency=low
 
   The "back to life" version (hopefully).

[Flexml-commits] flexml skel,1.23,1.24

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13283

Modified Files:
	skel 
Log Message:
revert previous broked change; add a \n after the error messages when not using quiet_parsers

Index: skel
===================================================================
RCS file: /cvsroot/flexml/flexml/skel,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- skel	10 Feb 2005 11:36:53 -0000	1.23
+++ skel	10 Feb 2005 11:42:39 -0000	1.24
@@ -305,7 +305,7 @@
 }
 #endif
 
-const int flexml_max_err_msg_size = 512;
+enum {flexml_max_err_msg_size = 512};
 
 static char flexml_err_msg[flexml_max_err_msg_size];
 const char * parse_err_msg()
@@ -338,7 +338,7 @@
 
 #ifndef FLEXML_quiet_parser
     /* print directly to sdterr */
-    fprintf(stderr, "%s", flexml_err_msg);
+    fprintf(stderr, "%s\n", flexml_err_msg);
     flexml_err_msg[0] = '\0';
 #endif
    

[Flexml-commits] flexml skel,1.22,1.23

[Martin Q. <mqu...@us...>]

Update of /cvsroot/flexml/flexml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10697

Modified Files:
	skel 
Log Message:
useless cleanup

Index: skel
===================================================================
RCS file: /cvsroot/flexml/flexml/skel,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- skel	10 Feb 2005 11:18:26 -0000	1.22
+++ skel	10 Feb 2005 11:36:53 -0000	1.23
@@ -305,7 +305,7 @@
 }
 #endif
 
-enum {flexml_max_err_msg_size = 512};
+const int flexml_max_err_msg_size = 512;
 
 static char flexml_err_msg[flexml_max_err_msg_size];
 const char * parse_err_msg()