Imported Upstream version 0.15.1

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

9 files changed, 30 insertions, 21 deletions

diff --git a/CHANGELOG b/CHANGELOG
index ec7b9038..b139627f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 0.15.1 (2015-11-22)
+---------------------------
+- Fixed test failures caused by locale-sensitive 'sort'.
+
+
 Version 0.15 (2015-11-22)
 -------------------------
 - Updated website http://re2c.org:
diff --git a/bootstrap/doc/re2c.1 b/bootstrap/doc/re2c.1
index c1f0fb0b..5ea3ed02 100644
--- a/bootstrap/doc/re2c.1
+++ b/bootstrap/doc/re2c.1
@@ -1041,6 +1041,6 @@ Emmanuel Mogenet \fI\%mgix@mgix.com\fP
 Ulya Trofimovich \fI\%skvadrik@gmail.com\fP
 .SH VERSION INFORMATION
 .sp
-This manpage describes \fBre2c\fP version 0.15, package date 22 Nov 2015.
+This manpage describes \fBre2c\fP version 0.15.1, package date 22 Nov 2015.
 .\" Generated by docutils manpage writer.
 .
diff --git a/bootstrap/src/conf/parse_opts.cc b/bootstrap/src/conf/parse_opts.cc
index 90411da8..5c5a3f85 100644
--- a/bootstrap/src/conf/parse_opts.cc
+++ b/bootstrap/src/conf/parse_opts.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.14.3 on Sun Nov 22 19:51:58 2015 */
+/* Generated by re2c 0.14.3 on Sun Nov 22 21:02:24 2015 */
 #line 1 "../src/conf/parse_opts.re"
 #include <stdio.h>
 
diff --git a/bootstrap/src/parse/lex.cc b/bootstrap/src/parse/lex.cc
index c98bab67..1eafed57 100644
--- a/bootstrap/src/parse/lex.cc
+++ b/bootstrap/src/parse/lex.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.14.3 on Sun Nov 22 19:51:58 2015 */
+/* Generated by re2c 0.14.3 on Sun Nov 22 21:02:24 2015 */
 #line 1 "../src/parse/lex.re"
 #include <stdlib.h>
 #include <string.h>
diff --git a/bootstrap/src/parse/lex_conf.cc b/bootstrap/src/parse/lex_conf.cc
index c6f21dec..21ef44fa 100644
--- a/bootstrap/src/parse/lex_conf.cc
+++ b/bootstrap/src/parse/lex_conf.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.14.3 on Sun Nov 22 19:51:58 2015 */
+/* Generated by re2c 0.14.3 on Sun Nov 22 21:02:24 2015 */
 #line 1 "../src/parse/lex_conf.re"
 #include "src/parse/scanner.h"
 #include "src/util/s_to_n32_unsafe.h"
diff --git a/configure.ac b/configure.ac
index e6b478c1..6e28b7d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([re2c],[0.15],[re2c-general@lists.sourceforge.net])
+AC_INIT([re2c],[0.15.1],[re2c-general@lists.sourceforge.net])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_SILENT_RULES([yes])
 
diff --git a/run_tests.sh.in b/run_tests.sh.in
index b0740451..9d65ff95 100644
--- a/run_tests.sh.in
+++ b/run_tests.sh.in
@@ -20,6 +20,10 @@ detect_cpu_count () {
     fi
 }
 
+lc_run() {
+    LANG=C LC_ALL=C "$@"
+}
+
 valgrind=""
 skeleton=0
 keep_tmp_files=0
@@ -118,7 +122,7 @@ run_pack() {
 		# filename (dot short* (long arg?)*)? ext
 		# must keep to POSIX standard: no syntactic sugar like +,?, etc.
 		# if you change this regexp, try it with 'sed --posix'
-		local switches=`basename "$x" | LC_ALL=C sed \
+		local switches=`basename "$x" | lc_run sed \
 			-e 's/^[^.]*\.re$//g' \
 			-e 's/^[^.]*\.\(.*\)\.re$/\1/g' \
 			-e 's/^\([^-]\)/-\1/' \
@@ -157,9 +161,9 @@ run_pack() {
 			$valgrind $wine ../../$re2c $switches "$outx" 2>"$outc.stderr" 1>&2
 			# paste all files dropped by re2c into output file
 			rm "$outx" && find . -type f \
-				| sort \
+				| lc_run sort \
 				| xargs cat \
-				| LC_ALL=C sed -e 's,/\* Generated by re2c .*\*/,/\* Generated by re2c \*/,g' \
+				| lc_run sed -e 's,/\* Generated by re2c .*\*/,/\* Generated by re2c \*/,g' \
 				>> "../$outc"
 			# cleanup sandbox
 			cd .. \
diff --git a/test/condition_05.cgitcondition_05.cgit.h.c b/test/condition_05.cgitcondition_05.cgit.h.c
index 6a7bde3f..2d3ca180 100644
--- a/test/condition_05.cgitcondition_05.cgit.h.c
+++ b/test/condition_05.cgitcondition_05.cgit.h.c
@@ -1,4 +1,10 @@
 /* Generated by re2c */
+
+enum YYCONDTYPE {
+	yycnormal,
+	yyccomment,
+};
+/* Generated by re2c */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -136,9 +142,3 @@ int main(int argc, char **argv)
 	}
 	return 0;
 }
-/* Generated by re2c */
-
-enum YYCONDTYPE {
-	yycnormal,
-	yyccomment,
-};
diff --git a/test/condition_05.cgtcondition_05.cgt.h.c b/test/condition_05.cgtcondition_05.cgt.h.c
index 81441912..f6a4e1bb 100644
--- a/test/condition_05.cgtcondition_05.cgt.h.c
+++ b/test/condition_05.cgtcondition_05.cgt.h.c
@@ -1,4 +1,11 @@
 /* Generated by re2c */
+#line 3 "condition_05.cgt.h"
+
+enum YYCONDTYPE {
+	yycnormal,
+	yyccomment,
+};
+/* Generated by re2c */
 #line 1 "condition_05.cgtcondition_05.cgt.h.re"
 #include <stdio.h>
 #include <stdlib.h>
@@ -147,10 +154,3 @@ int main(int argc, char **argv)
 	}
 	return 0;
 }
-/* Generated by re2c */
-#line 3 "condition_05.cgt.h"
-
-enum YYCONDTYPE {
-	yycnormal,
-	yyccomment,
-};