Imported Upstream version 0.13.7.3

Change-Id: I9163a4c8a179e18074a48494690af0a6f0298b59
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/CHANGELOG b/CHANGELOG
index c318ad7..8074dec 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 0.13.7.3 (2014-07-28)
+-----------------------------
+- Fixed CXX warning
+- Got rid of asciidoc build-time dependency
+
 Version 0.13.7.2 (2014-07-27)
 -----------------------------
 - Included man page into dist, respect users CXXFLAGS.

diff --git a/Makefile.am b/Makefile.am
index 017691d..26ea27d 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,15 +20,22 @@ YFLAGS       = -d
 RE2C         = re2c$(EXEEXT)
 RE2CFLAGS    = -bi
 
-CLEANFILES   = parser.cc y.tab.c y.tab.h scanner.cc re2c.1 .version htdocs/manual.html
+CLEANFILES = parser.cc y.tab.c y.tab.h scanner.cc .version
+if HAVE_ASCIIDOC
+    CLEANFILES += htdocs/manual.html
+endif HAVE_ASCIIDOC
+if HAVE_A2X
+    CLEANFILES += re2c.1
+endif HAVE_A2X
 
 DISTCLEANFILES = makerpm re2c.spec README scanner.cc re2c$(EXEEXT)
 
 man_MANS = re2c.1
+DOCS = $(man_MANS) htdocs/manual.html
 
 EXTRA_SRC    = README parser.y scanner.re y.tab.h CHANGELOG NO_WARRANTY \
                doc examples test bootstrap/*.cc bootstrap/*.h lessons \
-               $(man_MANS) $(DOCS_IN) $(DOCS_GEN)
+               $(DOCS)
 EXTRA_DIST   = $(EXTRA_SRC) makerpm.in re2c.spec.in re2c.spec README.in config_w32.h.in
 EXTRA_ZIP    = $(EXTRA_SRC) config_w32.h *.sln *.vcproj re2c.rules
 
@@ -95,11 +102,12 @@ vtests: all $(TESTS)
        test -x $(TESTS) || chmod +x $(TESTS)
        ./$(TESTS) --valgrind
 
-DOCS_IN  = re2c.ad
-DOCS = re2c.1 htdocs/manual.html
-DOCS_GEN = ./re2c_docs.sh
-
 docs: $(DOCS)
-
-$(DOCS): $(DOCS_GEN) $(DOCS_IN)
-       $(DOCS_GEN)
+$(DOCS): re2c.ad
+       @if test $(A2X) = "yes"; then \
+               a2x -f manpage re2c.ad; \
+       fi
+       @if test $(ASCIIDOC) = "yes"; then \
+               mkdir -p htdocs; \
+               asciidoc -o htdocs/manual.html re2c.ad; \
+       fi

diff --git a/config_w32.h b/config_w32.h
index 6f23e27..700f839 100644 (file)
--- a/config_w32.h
+++ b/config_w32.h
@@ -59,13 +59,13 @@
 #define PACKAGE_NAME "re2c"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "re2c 0.13.7.2"
+#define PACKAGE_STRING "re2c 0.13.7.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "re2c"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.13.7.2"
+#define PACKAGE_VERSION "0.13.7.3"
 
 /* The size of a `char', as computed by sizeof. */
 #define SIZEOF_CHAR 1
@@ -83,7 +83,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.13.7.2"
+#define VERSION "0.13.7.3"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

diff --git a/configure.in b/configure.in
index d945e91..30a595c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT(re2c, 0.13.7.2, re2c-general@lists.sourceforge.net)
+AC_INIT(re2c, 0.13.7.3, re2c-general@lists.sourceforge.net)
 AM_INIT_AUTOMAKE(re2c, $PACKAGE_VERSION)
 AC_CONFIG_SRCDIR(actions.cc)
 AM_CONFIG_HEADER(config.h)
@@ -16,6 +16,10 @@ AC_PROG_YACC
 AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_INSTALL
+AC_CHECK_PROG(ASCIIDOC, asciidoc, yes, no)
+AM_CONDITIONAL(HAVE_ASCIIDOC, [test "$ASCIIDOC" = yes])
+AC_CHECK_PROG(A2X, a2x, yes, no)
+AM_CONDITIONAL(HAVE_A2X, [test "$A2X" == yes])
 
 if test "$GCC" = "yes"; then
   AC_MSG_CHECKING([Testing GCC version])

diff --git a/htdocs/index.html b/htdocs/index.html
index 3225fbe..9b1cce2 100755 (executable)
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -68,6 +68,9 @@
     </ul>
     <hr />
     <h1>Changelog</h1>
+    <h2>2014-07-27: 0.13.7.3</h2>
+      <li>Fixed CXX warning</li>
+      <li>Got rid of asciidoc build-time dependency</li>
     <h2>2014-07-27: 0.13.7.2</h2>
       <li>Included man page into dist, respect users CXXFLAGS.</li>
     <h2>2014-07-26: 0.13.7.1</h2>

diff --git a/range_suffix.h b/range_suffix.h
index 148873f..82c6065 100644 (file)
--- a/range_suffix.h
+++ b/range_suffix.h
@@ -8,7 +8,7 @@
 
 namespace re2c {
 
-struct RegExp; // forward
+class RegExp; // forward
 
 class RangeSuffix
 {

diff --git a/re2c_docs.sh b/re2c_docs.sh
deleted file mode 100755 (executable)
index 8fbce9b..0000000
--- a/re2c_docs.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# generate re2c.1 from re2c.ad
-a2x -f manpage re2c.ad
-
-# generate htdocs/manual.html from re2c.ad
-mkdir -p htdocs
-asciidoc -o htdocs/manual.html re2c.ad

diff --git a/utf16_regexp.h b/utf16_regexp.h
index 19c1853..c8ed3da 100644 (file)
--- a/utf16_regexp.h
+++ b/utf16_regexp.h
@@ -5,7 +5,7 @@
 
 namespace re2c {
 
-struct RegExp; // forward
+class RegExp; // forward
 
 RegExp * UTF16Symbol(utf16::rune r);
 RegExp * UTF16Range(const Range * r);

diff --git a/utf8_regexp.h b/utf8_regexp.h
index e2468b2..2ce1d8f 100644 (file)
--- a/utf8_regexp.h
+++ b/utf8_regexp.h
@@ -5,7 +5,7 @@
 
 namespace re2c {
 
-struct RegExp; // forward
+class RegExp; // forward
 
 RegExp * UTF8Symbol(utf8::rune r);
 RegExp * UTF8Range(const Range * r);