- Add release 0.13.0

diff --git a/re2c/CHANGELOG b/re2c/CHANGELOG
index ccb70ae6015f339889b4ebdb4573e5fe35b25c98..51aa936e9349712b999bdf48f726e6c9463974ff 100644 (file)
--- a/re2c/CHANGELOG
+++ b/re2c/CHANGELOG
@@ -1,4 +1,4 @@
-Version 0.13.0 (2007-??-??)
+Version 0.13.0 (2007-06-24)
 ---------------------------
 - Added -c and -t to generate scanners with (f)lex-like condition support.
 - Fixed issue with short form of switches and parameter if not first switch.

diff --git a/re2c/Makefile.am b/re2c/Makefile.am
index a36b2942873ac182ab5f6fbd64dc9cbb2ea1e53b..b3939031a979dc24756d02b96ab8ac86217b3612 100755 (executable)
--- a/re2c/Makefile.am
+++ b/re2c/Makefile.am
@@ -1,7 +1,9 @@
 # $Id$
 
+WINBUILDDIR = Release-2003
+
 bin_PROGRAMS = re2c
-win_BINARIES = Release-2005/re2c.exe
+win_BINARIES = $(WINBUILDDIR)/re2c.exe
 re2c_SOURCES = code.cc dfa.cc main.cc parser.cc actions.cc scanner.re substr.cc\
        translate.cc scanner.cc mbo_getopt.cc \
        basics.h dfa.h globals.h ins.h parser.h re.h scanner.h \
@@ -35,10 +37,12 @@ dist-hook: re2c.spec
 rpm-files:     $(bin_PROGRAMS) $(EXTRA_DIST)
 
 rpm: dist
-       rpmbuild -ta re2c-$(PACKAGE_VERSION).tar.gz
+       rpmbuild -ba re2c.spec
 
 src-rpm: dist
-       rpmbuild -ts re2c-$(PACKAGE_VERSION).tar.gz
+       cp -f re2c-$(PACKAGE_VERSION).tar.gz `rpm --eval "%{_sourcedir}"`
+       cp -f re2c.spec `rpm --eval "%{_specdir}"`
+       rpmbuild -bs re2c.spec
        cp -f `rpm --eval "%{_srcrpmdir}"`/re2c-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE).src.rpm .
 
 zip: $(bin_PROGRAMS) $(EXTRA_ZIP)
@@ -47,7 +51,7 @@ zip: $(bin_PROGRAMS) $(EXTRA_ZIP)
        zipinfo -1      re2c-$(PACKAGE_VERSION)-src.zip | grep .svn | xargs zip -d re2c-$(PACKAGE_VERSION)-src.zip >/dev/null
        zipinfo -1      re2c-$(PACKAGE_VERSION)-src.zip | grep .cvsignore | xargs zip -d re2c-$(PACKAGE_VERSION)-src.zip >/dev/null
        if test -f re2c-$(PACKAGE_VERSION)-bin.zip; then rm -f re2c-$(PACKAGE_VERSION)-bin.zip; fi
-       if test -f Release-2005/re2c.exe; then \
+       if test -f $(WINBUILDDIR)/re2c.exe; then \
        zip -q -o -9 -j re2c-$(PACKAGE_VERSION)-bin.zip $(win_BINARIES); \
        fi;
 

diff --git a/re2c/config_w32.h b/re2c/config_w32.h
index bd6d0d011da8d5b83df43af16f74a9bd72664b5d..789e7e7a4cbb83514bfc9d8dffd24d5ace25be5e 100644 (file)
--- a/re2c/config_w32.h
+++ b/re2c/config_w32.h
@@ -107,3 +107,7 @@
 /* Define to empty if the keyword `volatile' does not work. Warning: valid
    code using `volatile' can become incorrect without. Disable with care. */
 /* #undef volatile */
+
+#ifndef vsnprintf
+#define vsnprintf _vsnprintf
+#endif

diff --git a/re2c/configure.in b/re2c/configure.in
index 9fe4f171bf2b39346cb25d6be266ff047ce15226..193638c83bd76dfb644a970e7bf1cfce0e2c2124 100644 (file)
--- a/re2c/configure.in
+++ b/re2c/configure.in
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT(re2c, 0.13.0.dev, re2c-general@lists.sourceforge.net)
+AC_INIT(re2c, 0.13.1.dev, re2c-general@lists.sourceforge.net)
 AM_INIT_AUTOMAKE(re2c, $PACKAGE_VERSION)
 AC_CONFIG_SRCDIR(actions.cc)
 AM_CONFIG_HEADER(config.h)

diff --git a/re2c/htdocs/index.html b/re2c/htdocs/index.html
index 606ea04a5c477bcc4a1e63006e63f37f42977a2d..0874bda9d224c45c24620b6462940a5864169d59 100755 (executable)
--- a/re2c/htdocs/index.html
+++ b/re2c/htdocs/index.html
@@ -80,7 +80,7 @@ fixes which were incorporated. <a href=
 </ul>
 <hr />
 <h1>Changelog</h1>
-<h2>2007-??-??: 0.13.0</h2>
+<h2>2007-06-24: 0.13.0</h2>
 <ul>
 <li>Added -c and -t to generate scanners with (f)lex-like condition support.</li>
 <li>Fixed issue with short form of switches and parameter if not first switch.</li>

diff --git a/re2c/htdocs/manual.html b/re2c/htdocs/manual.html
index cb4a376eb05bab45c642fc4b74567cb1a37a64ab..e8b07940170cd0c3c3df53193746da2dae5d11c7 100755 (executable)
--- a/re2c/htdocs/manual.html
+++ b/re2c/htdocs/manual.html
@@ -276,7 +276,7 @@ switch. In this case <b>re2c</b> generates scanner blocks for each conditon. Eac
 generated scanners has its own precondition. The precondition is given by the 
 interface define <b>YYGETCONDITON</b> and must be of type <b>YYCONDTYPE</b>.
 </p><p>
-There are two special conditons. First the rules of the condition '*' are 
+There are two special rule types. First the rules of the condition '*' are 
 merged to all  conditions. And second the empty condition list allows to 
 provide a code block that does not have a scanner part. Meaning it does not 
 allow any regular expression. The condition value referring to this special 

diff --git a/re2c/re2c.1.in b/re2c/re2c.1.in
index 02d17b321a217ae9b5c9aba9fc823eddb349e124..657e6a24643256a6e07f148c5a798a2275b5b53f 100644 (file)
--- a/re2c/re2c.1.in
+++ b/re2c/re2c.1.in
@@ -316,7 +316,7 @@ switch. In this case \*(re generates scanner blocks for each conditon. Each of t
 generated blocks has its own precondition. The precondition is given by the 
 interface define \fBYYGETCONDITON\fP and must be of type \fBYYCONDTYPE\fP.
 .LP
-There are two special conditons. First the rules of the condition '*' are 
+There are two special rule types. First the rules of the condition '*' are 
 merged to all  conditions. And second the empty condition list allows to 
 provide a code block that does not have a scanner part. Meaning it does not 
 allow any regular expression. The condition value referring to this special 

diff --git a/re2c/substr.h b/re2c/substr.h
index 4393f9c80e467877158e1f4c3b5ad924c2fa72c2..a9ab432c4874ca173bf4200a08aa4b89baee1bce 100644 (file)
--- a/re2c/substr.h
+++ b/re2c/substr.h
@@ -98,4 +98,8 @@ char *strndup(const char *str, size_t len);
 
 #endif
 
+#if defined(_MSC_VER) && !defined(vsnprintf)
+#define vsnprintf _vsnprintf
+#endif
+
 #endif

diff --git a/re2c/token.h b/re2c/token.h
index 6fc3989589bce7c6d020df15f52ddeaeae8a72f8..e0e5eae073e3c5c778db19b7ff89d0ddfda81b0a 100644 (file)
--- a/re2c/token.h
+++ b/re2c/token.h
@@ -26,7 +26,7 @@ inline Token::Token(const SubStr& t, uint l) : text(t), newcond(NULL), line(l)
 }
 
 inline Token::Token(const Token& oth)
-       : text(oth.text)
+       : text(oth.text.to_string().c_str())
        , newcond(oth.newcond ? new Str(*oth.newcond) : NULL)
        , line(oth.line)
 {