This commit was manufactured by cvs2svn to create tag

'Version_1_18_3'.

[SVN r8252]

appendix.htm

@@ -20,7 +20,7 @@
 <H3> Regex++, Appendices.</H3>
 </CENTER>
 <CENTER>
-<I>(version 3.01, 18 April 2000)</I> 
+<I>(version 3.02, 18 April 2000)</I> 
 </CENTER>
 <PRE><I>Copyright (c) 1998-2000
 Dr John Maddock

clean

@@ -1,55 +0,0 @@
-
-do_erase()
-{
-	args="$1""$2"
-	rm -f $args
-}
-
-do_clean()
-{
-	echo cleaning directory "$1"
-	do_erase $1 '*.bak'
-	do_erase $1 '*.~*'
-	do_erase $1 '*.il?' 
-	do_erase $1 '*.obj' 
-	do_erase $1 '*.csm' 
-	do_erase $1 '*.exe' 
-	do_erase $1 '*.tds' 
-	do_erase $1 '*.pch' 
-	do_erase $1 '*.id?' 
-	do_erase $1 '*.s' 
-	do_erase $1 '*.o'
-	do_erase $1 'makefile'
-	do_erase $1 '*.ZIP' 
-	do_erase $1 '*.zip' 
-	do_erase $1 '*.tar' 
-	do_erase $1 '*.gz' 
-	do_erase $1 'config.cache' 
-	do_erase $1 'config.log' 
-	do_erase $1 'config.status'
-	do_erase $1 '*.pdb'
-	do_erase $1 '*.tr2'
-	do_erase $1 '*.exe'
-	do_erase $1 '*.a'
-	do_erase $1 '*.lib'
-	do_erase $1 '*.exp'
-	do_erase $1 '*.ii'
-	do_erase $1 '*.s'
-	do_erase $1 '*.tds'
-	
-	path="$1"'*'
-	for file in $path 
-	do
-		if test -d "$file"; then
-			file=$file'/'
-			do_clean $file
-		fi
-	done
-}
-
-do_clean './'
-cat jm_opt.in > ../../boost/re_detail/regex_options.hpp
-rm -f ./lib/out.txt
-
-
-

compiler_tests

@@ -1,124 +0,0 @@
-#!bash
-
-#
-# set up compilers here:
-root_path="$PATH"
-root_include="$INCLUDE"
-root_lib="$LIB"
-
-function bcb4()
-{
-	PATH="//e/cbuilder4/bin:$root_path"
-	INCLUDE="$root_include"
-	LIB="$root_lib"
-}
-
-function bcb5()
-{
-	PATH="//e/cbuilder5/bin:$root_path"
-	INCLUDE="$root_include"
-	LIB="$root_lib"
-}
-
-function bc55()
-{
-	PATH="//e/bcb550/bin:$root_path"
-	INCLUDE="$root_include"
-	LIB="$root_lib"
-}
-
-function cygwin()
-{
-	PATH="/cygnus/cygwin-b20/H-i586-cygwin32/bin:$root_path"
-	INCLUDE="$root_include"
-	LIB="$root_lib"
-}
-
-function mwin()
-{
-	PATH="//e/gcc2.95.2/bin:$root_path"
-	INCLUDE="$root_include"
-	LIB="$root_lib"
-}
-
-function vc6()
-{
-	PATH="$root_path"
-	INCLUDE="$root_include"
-	LIB="$root_lib"
-}
-
-function vc6p4()
-{
-	PATH="$root_path"
-	INCLUDE="e:\\stlport\\stlport;$root_include"
-	LIB="e:\\stlport\\lib;$root_lib"
-}
-
-function vc6p3()
-{
-	PATH="$root_path"
-	INCLUDE="e:\stlport321\stlport;$root_include"
-	LIB="$root_lib"
-}
-
-#
-# function run performs and logs each command
-function run()
-{
-	eval "$1" >> $out 2>&1
-}
-
-#
-# set output file:
-out=compiler_log.txt
-echo > $out
-#
-# and set up tail to follow output
-tail -f "$out" &
-
-#
-# start with Borland C++ command line tools v5.5:
-bc55
-cd lib
-out=../compiler_log.txt
-run 'make -fbc55.mak'
-
-cd ../demo/jgrep
-out=../../compiler_log.txt
-rm -f *.o *.obj *.exe
-run 'make -fbc55.mak'
-
-cd ../timer
-out=../../compiler_log.txt
-rm -f *.o *.obj *.exe
-run 'make -fbc55.mak'
-
-cd ../regress
-out=../../compiler_log.txt
-rm -f *.o *.obj *.exe
-run 'make -fbc55.mak'
-
-cd ../snippets
-out=../../compiler_log.txt
-rm -f *.o *.obj *.exe
-run 'bcc32 -O2 -I../../../../ snip1.cpp'
-run 'bcc32 -O2 -I../../../../ snip2.cpp'
-run 'bcc32 -O2 -I../../../../ snip3.cpp'
-run 'bcc32 -O2 -I../../../../ snip4.cpp'
-run 'bcc32 -O2 -I../../../../ snip5.cpp'
-run 'bcc32 -O2 -I../../../../ snip6.cpp'
-run 'bcc32 -O2 -I../../../../ snip7.cpp'
-run 'bcc32 -O2 -I../../../../ snip8.cpp'
-run 'bcc32 -O2 -I../../../../ snip9.cpp'
-
-
-kill $!
-
-
-
-
-
-
-
-

configure

@@ -1759,7 +1759,7 @@ cat > conftest.$ac_ext <<EOF
 int main() {
 
  wchar_t c[50];
- swprintf(c, L"abcd");
+ swprintf(c, 50, L"abcd");
 
 ; return 0; }
 EOF
@@ -1780,48 +1780,6 @@ fi
 rm -f conftest*
 fi
 
-if test "$enable_wstring" != "no" && test "$enable_swprintf" = "no"; then
-echo $ac_n "checking for wsprintf support""... $ac_c" 1>&6
-echo "configure:1786: checking for wsprintf support" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1788 "configure"
-#include "confdefs.h"
- 
-#include "confdefs.h"
-#ifndef BOOST_RE_NO_WCHAR_H
-#include <wchar.h>
-#endif
-#ifndef BOOST_RE_NO_WCTYPE_H
-#include <wctype.h>
-#endif
-#include <string.h>
-#include <stdio.h>
-#include <widec.h>
-
-int main() {
-
- wchar_t c[50];
- wsprintf(c, "abcd");
-
-; return 0; }
-EOF
-if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define BOOST_RE_NO_WSPRINTF 
-EOF
-
-echo "$ac_t""no" 1>&6
-fi
-rm -f conftest*
-fi
-
-
 
 # Check whether --enable-member-templates or --disable-member-templates was given.
 if test "${enable_member_templates+set}" = set; then
@@ -1837,9 +1795,9 @@ EOF
 else
 
 echo $ac_n "checking for member template classes and functions""... $ac_c" 1>&6
-echo "configure:1841: checking for member template classes and functions" >&5
+echo "configure:1799: checking for member template classes and functions" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1843 "configure"
+#line 1801 "configure"
 #include "confdefs.h"
  
 
@@ -1876,7 +1834,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1907,9 +1865,9 @@ EOF
 else
 
 echo $ac_n "checking for parameterised function returns""... $ac_c" 1>&6
-echo "configure:1911: checking for parameterised function returns" >&5
+echo "configure:1869: checking for parameterised function returns" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1913 "configure"
+#line 1871 "configure"
 #include "confdefs.h"
  
 template <class T>
@@ -1923,7 +1881,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1954,7 +1912,7 @@ EOF
 else
 
 echo $ac_n "checking for 64-bit integral type""... $ac_c" 1>&6
-echo "configure:1958: checking for 64-bit integral type" >&5
+echo "configure:1916: checking for 64-bit integral type" >&5
 
 if test "$ac_cv_sizeof_short" -eq 8; then
 cat >> confdefs.h <<\EOF
@@ -1982,7 +1940,7 @@ have_int64="true"
 fi
 if test "$have_int64" != "true"; then
 cat > conftest.$ac_ext <<EOF
-#line 1986 "configure"
+#line 1944 "configure"
 #include "confdefs.h"
  
 #include <inttypes.h>
@@ -1994,7 +1952,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes - int64_t" 1>&6
 have_int64="true"
@@ -2013,7 +1971,7 @@ fi
 if test "$have_int64" != "true"; then
 
 cat > conftest.$ac_ext <<EOF
-#line 2017 "configure"
+#line 1975 "configure"
 #include "confdefs.h"
  
 #include <stdlib.h>
@@ -2025,7 +1983,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes - long long" 1>&6
 have_int64="true"
@@ -2045,7 +2003,7 @@ fi
 if test "$have_int64" != "true"; then
 
 cat > conftest.$ac_ext <<EOF
-#line 2049 "configure"
+#line 2007 "configure"
 #include "confdefs.h"
  
 #include <stdlib.h>
@@ -2057,7 +2015,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes - __int64" 1>&6
 have_int64="true"
@@ -2096,7 +2054,7 @@ EOF
 else
 
 echo $ac_n "checking for catopen in -lnl_types""... $ac_c" 1>&6
-echo "configure:2100: checking for catopen in -lnl_types" >&5
+echo "configure:2058: checking for catopen in -lnl_types" >&5
 ac_lib_var=`echo nl_types'_'catopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2104,7 +2062,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnl_types  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2108 "configure"
+#line 2066 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2118,7 +2076,7 @@ int main() {
 catopen()
 ; return 0; }
 EOF
-if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2146,7 +2104,7 @@ else
 fi
 
 echo $ac_n "checking for catopen in -lposix""... $ac_c" 1>&6
-echo "configure:2150: checking for catopen in -lposix" >&5
+echo "configure:2108: checking for catopen in -lposix" >&5
 ac_lib_var=`echo posix'_'catopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2154,7 +2112,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2158 "configure"
+#line 2116 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2168,7 +2126,7 @@ int main() {
 catopen()
 ; return 0; }
 EOF
-if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2197,9 +2155,9 @@ fi
 
 
 echo $ac_n "checking for POSIX message categories""... $ac_c" 1>&6
-echo "configure:2201: checking for POSIX message categories" >&5
+echo "configure:2159: checking for POSIX message categories" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2203 "configure"
+#line 2161 "configure"
 #include "confdefs.h"
  
 #include <nl_types.h>
@@ -2213,7 +2171,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2233,7 +2191,7 @@ fi
 if test "$enable_threads" != "no" && test "$enable_ms_windows" = "no"; then
 
 echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
-echo "configure:2237: checking for pthread_mutex_init in -lpthread" >&5
+echo "configure:2195: checking for pthread_mutex_init in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2241,7 +2199,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2245 "configure"
+#line 2203 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2255,7 +2213,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:2259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2283,7 +2241,7 @@ else
 fi
 
 echo $ac_n "checking for pthread_mutex_init in -lposix""... $ac_c" 1>&6
-echo "configure:2287: checking for pthread_mutex_init in -lposix" >&5
+echo "configure:2245: checking for pthread_mutex_init in -lposix" >&5
 ac_lib_var=`echo posix'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2291,7 +2249,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2295 "configure"
+#line 2253 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2305,7 +2263,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:2309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2334,9 +2292,9 @@ fi
 
 
 echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
-echo "configure:2338: checking for POSIX threads" >&5
+echo "configure:2296: checking for POSIX threads" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2340 "configure"
+#line 2298 "configure"
 #include "confdefs.h"
  
 #include <pthread.h>
@@ -2353,7 +2311,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -2385,9 +2343,9 @@ EOF
 else
 
 echo $ac_n "checking for template nested class access""... $ac_c" 1>&6
-echo "configure:2389: checking for template nested class access" >&5
+echo "configure:2347: checking for template nested class access" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2391 "configure"
+#line 2349 "configure"
 #include "confdefs.h"
  
 template <class T>
@@ -2424,7 +2382,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""yes" 1>&6
@@ -2450,9 +2408,9 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking for explicit template instantiation""... $ac_c" 1>&6
-echo "configure:2454: checking for explicit template instantiation" >&5
+echo "configure:2412: checking for explicit template instantiation" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2456 "configure"
+#line 2414 "configure"
 #include "confdefs.h"
  
 #include "confdefs.h"
@@ -2490,7 +2448,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""yes" 1>&6
@@ -2528,9 +2486,9 @@ EOF
 else
 
 echo $ac_n "checking for __fastcall and __stdcall""... $ac_c" 1>&6
-echo "configure:2532: checking for __fastcall and __stdcall" >&5
+echo "configure:2490: checking for __fastcall and __stdcall" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2534 "configure"
+#line 2492 "configure"
 #include "confdefs.h"
  
 void __fastcall f1(int)
@@ -2549,7 +2507,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -2583,9 +2541,9 @@ fi
 
 
 echo $ac_n "checking for standard library namespace""... $ac_c" 1>&6
-echo "configure:2587: checking for standard library namespace" >&5
+echo "configure:2545: checking for standard library namespace" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2589 "configure"
+#line 2547 "configure"
 #include "confdefs.h"
  
 #include <stddef.h>
@@ -2609,7 +2567,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes - std" 1>&6
 have_std_namespace="yes"
@@ -2624,9 +2582,9 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for <exception>""... $ac_c" 1>&6
-echo "configure:2628: checking for <exception>" >&5
+echo "configure:2586: checking for <exception>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2630 "configure"
+#line 2588 "configure"
 #include "confdefs.h"
  
 #include <exception>
@@ -2656,7 +2614,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2674,9 +2632,9 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for <iterator>""... $ac_c" 1>&6
-echo "configure:2678: checking for <iterator>" >&5
+echo "configure:2636: checking for <iterator>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2680 "configure"
+#line 2638 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -2687,7 +2645,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2705,9 +2663,9 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for <algorithm>""... $ac_c" 1>&6
-echo "configure:2709: checking for <algorithm>" >&5
+echo "configure:2667: checking for <algorithm>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2711 "configure"
+#line 2669 "configure"
 #include "confdefs.h"
  
 #include <algorithm>
@@ -2719,7 +2677,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2735,9 +2693,9 @@ rm -f conftest*
 
 if test "$enable_stl" != "no" && test "$need_algo" = "yes"; then
 echo $ac_n "checking for <algo>""... $ac_c" 1>&6
-echo "configure:2739: checking for <algo>" >&5
+echo "configure:2697: checking for <algo>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2741 "configure"
+#line 2699 "configure"
 #include "confdefs.h"
  
 #include <algo>
@@ -2748,7 +2706,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -2793,9 +2751,9 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking for <memory>""... $ac_c" 1>&6
-echo "configure:2797: checking for <memory>" >&5
+echo "configure:2755: checking for <memory>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2799 "configure"
+#line 2757 "configure"
 #include "confdefs.h"
  
 #include <memory>
@@ -2813,7 +2771,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2833,9 +2791,9 @@ rm -f conftest*
 
 if test "$enable_stl" != "no"; then
 echo $ac_n "checking for <string>""... $ac_c" 1>&6
-echo "configure:2837: checking for <string>" >&5
+echo "configure:2795: checking for <string>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2839 "configure"
+#line 2797 "configure"
 #include "confdefs.h"
  
 #include <string>
@@ -2850,7 +2808,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2868,9 +2826,9 @@ fi
 
 if test "$enable_stl" != "no"; then
 echo $ac_n "checking for std::basic_string default arguments""... $ac_c" 1>&6
-echo "configure:2872: checking for std::basic_string default arguments" >&5
+echo "configure:2830: checking for std::basic_string default arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2874 "configure"
+#line 2832 "configure"
 #include "confdefs.h"
  
 #include <string>
@@ -2885,7 +2843,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2907,9 +2865,9 @@ fi
 ac_have_locale='no'
 if test "$enable_stl" != "no"; then
 echo $ac_n "checking for <locale>""... $ac_c" 1>&6
-echo "configure:2911: checking for <locale>" >&5
+echo "configure:2869: checking for <locale>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2913 "configure"
+#line 2871 "configure"
 #include "confdefs.h"
  
 #include <locale>
@@ -2922,7 +2880,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 ac_have_locale='yes'
@@ -2944,9 +2902,9 @@ fi
 
 if test "$enable_stl" != "no"; then
 echo $ac_n "checking for <iostream>""... $ac_c" 1>&6
-echo "configure:2948: checking for <iostream>" >&5
+echo "configure:2906: checking for <iostream>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2950 "configure"
+#line 2908 "configure"
 #include "confdefs.h"
  
 #include <iostream>
@@ -2962,7 +2920,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2982,9 +2940,9 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking for std::distance""... $ac_c" 1>&6
-echo "configure:2986: checking for std::distance" >&5
+echo "configure:2944: checking for std::distance" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2988 "configure"
+#line 2946 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -2998,7 +2956,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -3015,7 +2973,7 @@ rm -f conftest*
 
 if test "$enable_stl" != "no" && test "$have_dist" != "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 3019 "configure"
+#line 2977 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -3029,7 +2987,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -3055,9 +3013,9 @@ fi
 
 if test "$enable_stl" != "no" && test "$have_si" != "yes"; then
 echo $ac_n "checking for standard iterator syntax""... $ac_c" 1>&6
-echo "configure:3059: checking for standard iterator syntax" >&5
+echo "configure:3017: checking for standard iterator syntax" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3061 "configure"
+#line 3019 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -3074,7 +3032,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -3098,7 +3056,7 @@ fi
 
 if test "$enable_stl" != "no" && test "$have_si" != "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 3102 "configure"
+#line 3060 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -3115,7 +3073,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -3146,9 +3104,9 @@ fi
 
 if test "$have_oi" != "yes"; then
 echo $ac_n "checking for output iterator syntax""... $ac_c" 1>&6
-echo "configure:3150: checking for output iterator syntax" >&5
+echo "configure:3108: checking for output iterator syntax" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3152 "configure"
+#line 3110 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -3161,7 +3119,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -3187,9 +3145,9 @@ fi
 
 if test "$enable_stl" != "no" && test "$have_ii" != "yes"; then
 echo $ac_n "checking for input iterator syntax""... $ac_c" 1>&6
-echo "configure:3191: checking for input iterator syntax" >&5
+echo "configure:3149: checking for input iterator syntax" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3193 "configure"
+#line 3151 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -3202,7 +3160,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -3221,7 +3179,7 @@ fi
 
 if test "$enable_stl" != "no" && test "$have_ii" != "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 3225 "configure"
+#line 3183 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -3234,7 +3192,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -3260,9 +3218,9 @@ fi
 
 if test "$enable_stl" != "no" && test "$have_fi" != "yes"; then
 echo $ac_n "checking for forward iterator syntax""... $ac_c" 1>&6
-echo "configure:3264: checking for forward iterator syntax" >&5
+echo "configure:3222: checking for forward iterator syntax" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3266 "configure"
+#line 3224 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -3275,7 +3233,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -3301,9 +3259,9 @@ fi
 
 if test "$enable_stl" != "no" && test "$have_bi" != "yes"; then
 echo $ac_n "checking for bidirectional iterator syntax""... $ac_c" 1>&6
-echo "configure:3305: checking for bidirectional iterator syntax" >&5
+echo "configure:3263: checking for bidirectional iterator syntax" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3307 "configure"
+#line 3265 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -3316,7 +3274,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -3342,9 +3300,9 @@ fi
 
 if test "$enable_stl" != "no" && test "$have_ri" != "yes"; then
 echo $ac_n "checking for random access iterator syntax""... $ac_c" 1>&6
-echo "configure:3346: checking for random access iterator syntax" >&5
+echo "configure:3304: checking for random access iterator syntax" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3348 "configure"
+#line 3306 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -3357,7 +3315,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -3383,9 +3341,9 @@ fi
 
 if test "$enable_stl" != "no"; then
 echo $ac_n "checking for output iterator assignment""... $ac_c" 1>&6
-echo "configure:3387: checking for output iterator assignment" >&5
+echo "configure:3345: checking for output iterator assignment" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3389 "configure"
+#line 3347 "configure"
 #include "confdefs.h"
  
 #include "confdefs.h"
@@ -3420,7 +3378,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -3486,22 +3444,10 @@ echo "$ac_rules" >> ./lib/makefile.in
 
 
 
-if test "$enable_ms_windows" != "no"; then
-ac_regress="r1$ac_exe_ext"
-fi
-ac_regress="$ac_regress r2$ac_exe_ext"
-if test "$ac_have_locale" != "no"; then
-ac_regress="$ac_regress r3$ac_exe_ext"
-fi
+ac_regress="$ac_regress r1$ac_exe_ext"
 
 if test "$enable_wstring" != "no"; then
-if test "$enable_ms_windows" != "no"; then
-ac_regress="$ac_regress r4$ac_exe_ext"
-fi
-ac_regress="$ac_regress r5$ac_exe_ext"
-if test "$ac_have_locale" != "no"; then
-ac_regress="$ac_regress r6$ac_exe_ext"
-fi
+ac_regress="$ac_regress r2$ac_exe_ext"
 fi
 
 
@@ -3568,9 +3514,9 @@ old_libs="$LIBS"
 LIBS="conf2.cpp $old_libs"
 
 echo $ac_n "checking for link time template merging""... $ac_c" 1>&6
-echo "configure:3572: checking for link time template merging" >&5
+echo "configure:3518: checking for link time template merging" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3574 "configure"
+#line 3520 "configure"
 #include "confdefs.h"
 
 #include "conf2.h"
@@ -3583,7 +3529,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3607,9 +3553,9 @@ if eval "$CXX $CXXFLAGS -c conf2.cpp" && eval "ar -rc libconf2.a conf2$ac_obj_ex
 LIBS="-L./ -lconf2 $old_libs"
 
 echo $ac_n "checking for link time template merging from archive files""... $ac_c" 1>&6
-echo "configure:3611: checking for link time template merging from archive files" >&5
+echo "configure:3557: checking for link time template merging from archive files" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3613 "configure"
+#line 3559 "configure"
 #include "confdefs.h"
 
 #include "conf2.h"
@@ -3622,7 +3568,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3751,9 +3697,9 @@ old_libs="$LIBS"
 LIBS="conf2.cpp $old_libs"
 
 echo $ac_n "checking for link time template merging of switch statements""... $ac_c" 1>&6
-echo "configure:3755: checking for link time template merging of switch statements" >&5
+echo "configure:3701: checking for link time template merging of switch statements" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3757 "configure"
+#line 3703 "configure"
 #include "confdefs.h"
 
 #include "conf2.h"
@@ -3766,7 +3712,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4143,6 +4089,8 @@ rm -f jm_opt.out
 
 
 
+
+
 
 
 

configure.in

@@ -559,7 +559,7 @@ AC_TRY_LINK(
 ],
 [
  wchar_t c[50];
- swprintf(c, L"abcd");
+ swprintf(c, 50, L"abcd");
 ],
 [AC_MSG_RESULT(yes)],
 [AC_DEFINE(BOOST_RE_NO_SWPRINTF,[])
@@ -567,31 +567,6 @@ AC_MSG_RESULT(no)]
 enable_swprintf="no")
 fi
 
-if test "$enable_wstring" != "no" && test "$enable_swprintf" = "no"; then
-AC_MSG_CHECKING(for wsprintf support)
-AC_TRY_LINK(
-[ 
-#include "confdefs.h"
-#ifndef BOOST_RE_NO_WCHAR_H
-#include <wchar.h>
-#endif
-#ifndef BOOST_RE_NO_WCTYPE_H
-#include <wctype.h>
-#endif
-#include <string.h>
-#include <stdio.h>
-#include <widec.h>
-],
-[
- wchar_t c[50];
- wsprintf(c, "abcd");
-],
-[AC_MSG_RESULT(yes)],
-[AC_DEFINE(BOOST_RE_NO_WSPRINTF,[])
-AC_MSG_RESULT(no)])
-fi
-
-
 
 AC_ARG_ENABLE(member-templates, [--disable-member-templates turns off member template class and function support])
 if test "$enable_member_templates" = "no"; then
@@ -1447,22 +1422,10 @@ AC_SUBST(ac_all_h)
 AC_SUBST(ac_all_cpp)
 AC_SUBST(ac_all_dep)
 
-if test "$enable_ms_windows" != "no"; then
-ac_regress="r1$ac_exe_ext"
-fi
-ac_regress="$ac_regress r2$ac_exe_ext"
-if test "$ac_have_locale" != "no"; then
-ac_regress="$ac_regress r3$ac_exe_ext"
-fi
+ac_regress="$ac_regress r1$ac_exe_ext"
 
 if test "$enable_wstring" != "no"; then
-if test "$enable_ms_windows" != "no"; then
-ac_regress="$ac_regress r4$ac_exe_ext"
-fi
-ac_regress="$ac_regress r5$ac_exe_ext"
-if test "$ac_have_locale" != "no"; then
-ac_regress="$ac_regress r6$ac_exe_ext"
-fi
+ac_regress="$ac_regress r2$ac_exe_ext"
 fi
 
 AC_SUBST(ac_regress)
@@ -1742,6 +1705,8 @@ rm -f jm_opt.out
 
 
 
+
+
 
 
 

demo/c_compiler_checks/posix_api_compiler_check.cpp

@@ -0,0 +1,64 @@
+/*
+ *
+ * Copyright (c) 1998-2000
+ * Dr John Maddock
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Dr John Maddock makes no representations
+ * about the suitability of this software for any purpose.
+ * It is provided "as is" without express or implied warranty.
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         posix_api_compiler_check.c
+  *   VERSION      3.01
+  *   DESCRIPTION: Verify that POSIX API calls compile: note this is a compile
+  *                time check only.
+  */
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <boost/regex.h>
+
+const char* expression = "^";
+const char* text = "\n      ";
+regmatch_t matches[1];
+int flags = REG_EXTENDED | REG_BASIC | REG_NOSPEC | REG_ICASE | REG_NOSUB |
+            REG_NEWLINE | REG_PEND | REG_NOCOLLATE | REG_ESCAPE_IN_LISTS |
+            REG_NEWLINE_ALT | REG_PERL | REG_AWK | REG_GREP | REG_EGREP;
+
+
+int main()
+{
+   regex_t re;
+   int result;
+   result = regcomp(&re, expression, REG_AWK);
+   if(result > REG_NOERROR)
+   {
+      char buf[256];
+      regerror(result, &re, buf, sizeof(buf));
+      printf(buf);
+      return result;
+   }
+   assert(re.re_nsub == 0);
+   matches[0].rm_so = 0;
+   matches[0].rm_eo = strlen(text);
+   result = regexec(&re, text, 1, matches, REG_NOTBOL | REG_NOTEOL | REG_STARTEND);
+   if(result > REG_NOERROR)
+   {
+      char buf[256];
+      regerror(result, &re, buf, sizeof(buf));
+      printf(buf);
+      regfree(&re);
+      return result;
+   }
+   assert(matches[0].rm_so == matches[0].rm_eo == 1);
+   regfree(&re);
+   return 0;
+}

demo/c_compiler_checks/wide_posix_api_compiler_check.cpp

@@ -0,0 +1,67 @@
+/*
+ *
+ * Copyright (c) 1998-2000
+ * Dr John Maddock
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Dr John Maddock makes no representations
+ * about the suitability of this software for any purpose.
+ * It is provided "as is" without express or implied warranty.
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         wide_posix_api_compiler_check.c
+  *   VERSION      3.01
+  *   DESCRIPTION: Verify that POSIX API calls compile: note this is a compile
+  *                time check only.
+  */
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <wchar.h>
+#define UNICODE
+#include <boost/regex.h>
+
+const wchar_t* expression = L"^";
+const wchar_t* text = L"\n      ";
+regmatch_t matches[1];
+int flags = REG_EXTENDED | REG_BASIC | REG_NOSPEC | REG_ICASE | REG_NOSUB |
+            REG_NEWLINE | REG_PEND | REG_NOCOLLATE | REG_ESCAPE_IN_LISTS |
+            REG_NEWLINE_ALT | REG_PERL | REG_AWK | REG_GREP | REG_EGREP;
+
+
+int main()
+{
+   regex_t re;
+   int result;
+   result = regcomp(&re, expression, REG_AWK);
+   if(result > REG_NOERROR)
+   {
+      wchar_t buf[256];
+      regerror(result, &re, buf, sizeof(buf));
+      wprintf(buf);
+      return result;
+   }
+   assert(re.re_nsub == 0);
+   matches[0].rm_so = 0;
+   matches[0].rm_eo = wcslen(text);
+   result = regexec(&re, text, 1, matches, REG_NOTBOL | REG_NOTEOL | REG_STARTEND);
+   if(result > REG_NOERROR)
+   {
+      wchar_t buf[256];
+      regerror(result, &re, buf, sizeof(buf));
+      wprintf(buf);
+      regfree(&re);
+      return result;
+   }
+   assert(matches[0].rm_so == matches[0].rm_eo == 1);
+   regfree(&re);
+   return 0;
+}
+

demo/jgrep/gcc.mak

@@ -8,6 +8,9 @@ CXX= -O2 -I../../../../ -I./
 jgrep : jgrep.cpp main.cpp
 	g++ -ojgrep $(CXX) jgrep.cpp main.cpp -L../../lib/gcc -lregex++
 
+debug : jgrep.cpp main.cpp
+	g++ -ojgrep -I../../../../ -I./ -g jgrep.cpp main.cpp -L../../lib/gcc -lregex++debug
+
 
 
 

demo/jgrep/jgrep.cpp

@@ -15,7 +15,7 @@
  
  /*
   *   FILE     jgrep.cpp
-  *   VERSION  3.01
+  *   VERSION  3.02
   */
 
 #include <stdio.h>

demo/jgrep/jgrep.h

@@ -15,7 +15,7 @@
  
  /*
   *   FILE     jgrep.h
-  *   VERSION  3.01
+  *   VERSION  3.02
   */
 
 #ifndef _JGREP_H

demo/jgrep/main.cpp

@@ -15,7 +15,7 @@
  
  /*
   *   FILE     main.cpp
-  *   VERSION  3.01
+  *   VERSION  3.02
   */
 
 

demo/regress/bc55.mak

@@ -47,80 +47,87 @@ all :: r1.exe r2.exe r3.exe r4.exe r5.exe r6.exe r1m.exe r2m.exe r3m.exe r4m.exe
 	r6lm tests.txt
 
 
-r1.exe : r1.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r1.cpp
+r1.exe : tests.cpp regress.cpp parse.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2.exe : r2.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r2.cpp
+r2.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3.exe : r3.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r3.cpp
+r3.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4.exe : r4.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r4.cpp
+r4.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5.exe : r5.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r5.cpp
+r5.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6.exe : r6.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r6.cpp
+r6.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 	
 
-r1m.exe : r1.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe r1.cpp
+r1m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp
 
-r2m.exe : r2.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe r2.cpp
+r2m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3m.exe : r3.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe r3.cpp
+r3m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4m.exe : r4.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe r4.cpp
+r4m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5m.exe : r5.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe r5.cpp
+r5m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6m.exe : r6.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe r6.cpp
+r6m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1l.exe : r1.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe r1.cpp
+r1l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp
 
-r2l.exe : r2.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe r2.cpp
+r2l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3l.exe : r3.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe r3.cpp
+r3l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4l.exe : r4.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe r4.cpp
+r4l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5l.exe : r5.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe r5.cpp
+r5l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6l.exe : r6.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe r6.cpp
+r6l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
+
+
+r1lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp
+
+r2lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
+
+r3lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
+
+r4lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
+
+r5lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
+
+r6lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1lm.exe : r1.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe r1.cpp
 
-r2lm.exe : r2.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe r2.cpp
 
-r3lm.exe : r3.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe r3.cpp
 
-r4lm.exe : r4.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe r4.cpp
 
-r5lm.exe : r5.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe r5.cpp
 
-r6lm.exe : r6.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe r6.cpp
 
 
 

demo/regress/bcb4.mak

@@ -61,118 +61,125 @@ all :: r1.exe r2.exe r3.exe r4.exe r5.exe r6.exe r1m.exe r2m.exe r3m.exe r4m.exe
 	r6lv tests.txt
 
 
-r1.exe : r1.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r1.cpp
+r1.exe : tests.cpp regress.cpp parse.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2.exe : r2.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r2.cpp
+r2.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3.exe : r3.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r3.cpp
+r3.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4.exe : r4.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r4.cpp
+r4.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5.exe : r5.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r5.cpp
+r5.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6.exe : r6.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r6.cpp
+r6.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 	
 
-r1m.exe : r1.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe r1.cpp
+r1m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp
 
-r2m.exe : r2.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe r2.cpp
+r2m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3m.exe : r3.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe r3.cpp
+r3m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4m.exe : r4.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe r4.cpp
+r4m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5m.exe : r5.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe r5.cpp
+r5m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6m.exe : r6.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe r6.cpp
+r6m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1v.exe : r1.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe r1.cpp
+r1v.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp
 
-r2v.exe : r2.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe r2.cpp
+r2v.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3v.exe : r3.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe r3.cpp
+r3v.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4v.exe : r4.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe r4.cpp
+r4v.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5v.exe : r5.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe r5.cpp
+r5v.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6v.exe : r6.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe r6.cpp
+r6v.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1l.exe : r1.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe r1.cpp
+r1l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp
 
-r2l.exe : r2.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe r2.cpp
+r2l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3l.exe : r3.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe r3.cpp
+r3l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4l.exe : r4.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe r4.cpp
+r4l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5l.exe : r5.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe r5.cpp
+r5l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6l.exe : r6.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe r6.cpp
+r6l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1lm.exe : r1.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe r1.cpp
+r1lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp
 
-r2lm.exe : r2.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe r2.cpp
+r2lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3lm.exe : r3.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe r3.cpp
+r3lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4lm.exe : r4.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe r4.cpp
+r4lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5lm.exe : r5.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe r5.cpp
+r5lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6lm.exe : r6.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe r6.cpp
+r6lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
+
+
+r1lv.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er1lv.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp
+
+r2lv.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er2lv.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
+
+r3lv.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er3lv.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
+
+r4lv.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er4lv.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
+
+r5lv.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er5lv.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
+
+r6lv.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er6lv.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1lv.exe : r1.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er1lv.exe r1.cpp
 
-r2lv.exe : r2.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er2lv.exe r2.cpp
 
-r3lv.exe : r3.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er3lv.exe r3.cpp
 
-r4lv.exe : r4.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er4lv.exe r4.cpp
 
-r5lv.exe : r5.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er5lv.exe r5.cpp
 
-r6lv.exe : r6.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er6lv.exe r6.cpp
 
 
 

demo/regress/bcb5.mak

@@ -61,118 +61,125 @@ all :: r1.exe r2.exe r3.exe r4.exe r5.exe r6.exe r1m.exe r2m.exe r3m.exe r4m.exe
 	r6lv tests.txt
 
 
-r1.exe : r1.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r1.cpp
+r1.exe : tests.cpp regress.cpp parse.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2.exe : r2.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r2.cpp
+r2.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3.exe : r3.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r3.cpp
+r3.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4.exe : r4.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r4.cpp
+r4.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5.exe : r5.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r5.cpp
+r5.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6.exe : r6.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r6.cpp
+r6.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 	
 
-r1m.exe : r1.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe r1.cpp
+r1m.exe : tests.cpp regress.cpp parse.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2m.exe : r2.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe r2.cpp
+r2m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3m.exe : r3.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe r3.cpp
+r3m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4m.exe : r4.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe r4.cpp
+r4m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5m.exe : r5.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe r5.cpp
+r5m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6m.exe : r6.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe r6.cpp
+r6m.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1v.exe : r1.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe r1.cpp
+r1v.exe : tests.cpp regress.cpp parse.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2v.exe : r2.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe r2.cpp
+r2v.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3v.exe : r3.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe r3.cpp
+r3v.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4v.exe : r4.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe r4.cpp
+r4v.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5v.exe : r5.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe r5.cpp
+r5v.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6v.exe : r6.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe r6.cpp
+r6v.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1l.exe : r1.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe r1.cpp
+r1l.exe : tests.cpp regress.cpp parse.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2l.exe : r2.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe r2.cpp
+r2l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3l.exe : r3.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe r3.cpp
+r3l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4l.exe : r4.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe r4.cpp
+r4l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5l.exe : r5.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe r5.cpp
+r5l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6l.exe : r6.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe r6.cpp
+r6l.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1lm.exe : r1.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe r1.cpp
+r1lm.exe : tests.cpp regress.cpp parse.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2lm.exe : r2.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe r2.cpp
+r2lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3lm.exe : r3.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe r3.cpp
+r3lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4lm.exe : r4.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe r4.cpp
+r4lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5lm.exe : r5.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe r5.cpp
+r5lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6lm.exe : r6.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe r6.cpp
+r6lm.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
+
+
+r1lv.exe : tests.cpp regress.cpp parse.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er1lv.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
+
+r2lv.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er2lv.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
+
+r3lv.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er3lv.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
+
+r4lv.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er4lv.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
+
+r5lv.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er5lv.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
+
+r6lv.exe : tests.cpp parse.cpp regress.cpp
+	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er6lv.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1lv.exe : r1.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er1lv.exe r1.cpp
 
-r2lv.exe : r2.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er2lv.exe r2.cpp
 
-r3lv.exe : r3.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er3lv.exe r3.cpp
 
-r4lv.exe : r4.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er4lv.exe r4.cpp
 
-r5lv.exe : r5.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er5lv.exe r5.cpp
 
-r6lv.exe : r6.cpp
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er6lv.exe r6.cpp
 
 
 

demo/regress/egcs.mak

@@ -1,50 +0,0 @@
-
-# very basic makefile for regress.exe
-#
-# egcs compiler GCC
-#
-CXX= g++ -O2 -pedantic -Wall -I../../../../ -I./
-
-total : r2.exe
-	r2 tests.txt
-	r5 tests.txt
-
-r2.exe : r2.cpp
-	$(CXX) -or2.exe r2.cpp -L../../lib -lregex++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

demo/regress/gcc.mak

@@ -3,13 +3,17 @@
 #
 # g++ 2.95 and greater
 #
-CXX= g++ -O2 -pedantic -Wall -I../../../../ -I./ -L../../lib/gcc
+CXX= g++ -pedantic -Wall -I../../../../ -I./ -L../../lib/gcc
 
 total : r2
 	./r2 tests.txt
 
-r2 : r2.cpp
-	$(CXX) -o r2 r2.cpp -lregex++
+r2 : tests.cpp parse.cpp regress.cpp
+	$(CXX) -O2 -o r2 tests.cpp parse.cpp regress.cpp -lregex++
+
+debug : tests.cpp parse.cpp regress.cpp
+	$(CXX) -g -o r2 tests.cpp parse.cpp regress.cpp -lregex++debug
+
 
 
 

demo/regress/makefile.in

@@ -2,7 +2,7 @@
 # very basic makefile for regression tests
 #
 CXX=@CXX@
-CXXFLAGS=@CXXFLAGS@
+CXXFLAGS=@CXXFLAGS@ -I../../../../
 LIBS=@LIBS@ -L../../lib -lregex++
 EXE=@ac_exe_ext@
 OBJ=@ac_obj_ext@
@@ -11,47 +11,15 @@ total : @ac_regress@
 
 LIBDEP=../../lib/libregex++.a ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp
 
-r1$(EXE) :: r1$(OBJ)
-	$(CXX) -o r1$(EXE) r1$(OBJ) $(LIBS)
-	./r1 tests.txt test1252.txt
+r1$(EXE) :: tests.cpp parse.cpp regress.cpp
+	$(CXX) -o r1$(EXE) $(CXXFLAGS) tests.cpp parse.cpp regress.cpp $(LIBS)
+	./r1 tests.txt
 
-r2$(EXE) ::  r2$(OBJ)
-	$(CXX) -o r2$(EXE) r2$(OBJ) $(LIBS)
+r2$(EXE) ::  tests.cpp parse.cpp regress.cpp
+	$(CXX) -o r2$(EXE) $(CXXFLAGS) -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LIBS)
 	./r2 tests.txt
 
-r3$(EXE) ::  r3$(OBJ) 
-	$(CXX) -o r3$(EXE) r3$(OBJ) $(LIBS)
-	./r3 tests.txt
-
-r4$(EXE) :: r4$(OBJ)
-	$(CXX) -o r4$(EXE) r4$(OBJ) $(LIBS)
-	./r4 tests.txt test1252.txt
-
-r5$(EXE) :: r5$(OBJ)
-	$(CXX) -o r5$(EXE) r5$(OBJ) $(LIBS)
-	./r5 tests.txt
-
-r6$(EXE) :: r6$(OBJ)
-	$(CXX) -o r6$(EXE) r6$(OBJ) $(LIBS)
-	./r6 tests.txt
-
-r1$(OBJ) : parse.cpp regress.cpp tests.cpp r1.cpp $(LIBDEP)
-	$(CXX) -c $(CXXFLAGS) -DSTRICT -I../../../../ -I./ r1.cpp
-
-r2$(OBJ) :  parse.cpp regress.cpp tests.cpp r2.cpp $(LIBDEP)
-	$(CXX) -c $(CXXFLAGS) -I../../../../ -I./ r2.cpp
-
-r3$(OBJ) :  parse.cpp regress.cpp tests.cpp r3.cpp $(LIBDEP) 
-	$(CXX) -c $(CXXFLAGS) -I../../../../ -I./ r3.cpp
-
-r4$(OBJ) : parse.cpp regress.cpp tests.cpp r4.cpp $(LIBDEP)
-	$(CXX) -c $(CXXFLAGS) -DSTRICT -I../../../../ -I./ r4.cpp
-
-r5$(OBJ) : parse.cpp regress.cpp tests.cpp r5.cpp $(LIBDEP)
-	$(CXX) -c $(CXXFLAGS) -I../../../../ -I./ r5.cpp
-
-r6$(OBJ) : parse.cpp regress.cpp tests.cpp r6.cpp $(LIBDEP)
-	$(CXX) -c $(CXXFLAGS) -I../../../../ -I./ r6.cpp
+
 
 
 

demo/regress/out.txt

@@ -1,342 +0,0 @@
-
-Microsoft (R) Program Maintenance Utility   Version 6.00.8168.0
-Copyright (C) Microsoft Corp 1988-1998. All rights reserved.
-
-	cl /MT /D_MT -o r1m.exe -O2 -GX -GR -I..\..\..\.. r1.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r1.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r1.exe 
-/out:r1m.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r1.obj 
-	cl /MT /D_MT -O2 -GX -GR -I..\..\..\.. -o r2m.exe r2.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r2.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r2.exe 
-/out:r2m.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r2.obj 
-	cl /MT /D_MT -O2 -GX -GR -I..\..\..\.. -o r3m.exe r3.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r3.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r3.exe 
-/out:r3m.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r3.obj 
-	cl /MT /D_MT -O2 -GX -GR -I..\..\..\.. -o r4m.exe r4.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r4.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r4.exe 
-/out:r4m.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r4.obj 
-	cl /MT /D_MT -O2 -GX -GR -I..\..\..\.. -o r5m.exe r5.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r5.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r5.exe 
-/out:r5m.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r5.obj 
-	cl /MT /D_MT -O2 -GX -GR -I..\..\..\.. -o r6m.exe r6.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r6.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r6.exe 
-/out:r6m.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r6.obj 
-	cl /MD /D_MT /D_DLL -O2 -GX -GR -I..\..\..\.. -o r1l.exe r1.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r1.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r1.exe 
-/out:r1l.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r1.obj 
-	cl /MD /D_MT /D_DLL -O2 -GX -GR -I..\..\..\.. -o r2l.exe r2.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r2.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r2.exe 
-/out:r2l.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r2.obj 
-	cl /MD /D_MT /D_DLL -O2 -GX -GR -I..\..\..\.. -o r3l.exe r3.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r3.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r3.exe 
-/out:r3l.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r3.obj 
-	cl /MD /D_MT /D_DLL -O2 -GX -GR -I..\..\..\.. -o r4l.exe r4.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r4.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r4.exe 
-/out:r4l.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r4.obj 
-	cl /MD /D_MT /D_DLL -O2 -GX -GR -I..\..\..\.. -o r5l.exe r5.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r5.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r5.exe 
-/out:r5l.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r5.obj 
-	cl /MD /D_MT /D_DLL -O2 -GX -GR -I..\..\..\.. -o r6l.exe r6.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r6.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r6.exe 
-/out:r6l.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r6.obj 
-	cl /MTd /D_MT /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r1md.exe r1.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r1.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r1.exe 
-/out:r1md.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r1.obj 
-LINK : warning LNK4098: defaultlib "LIBCMT" conflicts with use of other libs; use /NODEFAULTLIB:library
-	cl /MTd /D_MT /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r2md.exe r2.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r2.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r2.exe 
-/out:r2md.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r2.obj 
-LINK : warning LNK4098: defaultlib "LIBCMT" conflicts with use of other libs; use /NODEFAULTLIB:library
-	cl /MTd /D_MT /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r3md.exe r3.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r3.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r3.exe 
-/out:r3md.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r3.obj 
-LINK : warning LNK4098: defaultlib "LIBCMT" conflicts with use of other libs; use /NODEFAULTLIB:library
-	cl /MTd /D_MT /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r4md.exe r4.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r4.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r4.exe 
-/out:r4md.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r4.obj 
-LINK : warning LNK4098: defaultlib "LIBCMT" conflicts with use of other libs; use /NODEFAULTLIB:library
-	cl /MTd /D_MT /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r5md.exe r5.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r5.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r5.exe 
-/out:r5md.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r5.obj 
-LINK : warning LNK4098: defaultlib "LIBCMT" conflicts with use of other libs; use /NODEFAULTLIB:library
-	cl /MTd /D_MT /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r6md.exe r6.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r6.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r6.exe 
-/out:r6md.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r6.obj 
-LINK : warning LNK4098: defaultlib "LIBCMT" conflicts with use of other libs; use /NODEFAULTLIB:library
-	cl /MDd /D_MT /D_DLL /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r1lmd.exe r1.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r1.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r1.exe 
-/out:r1lmd.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r1.obj 
-	cl /MDd /D_MT /D_DLL /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r2lmd.exe r2.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r2.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r2.exe 
-/out:r2lmd.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r2.obj 
-	cl /MDd /D_MT /D_DLL /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r3lmd.exe r3.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r3.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r3.exe 
-/out:r3lmd.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r3.obj 
-	cl /MDd /D_MT /D_DLL /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r4lmd.exe r4.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r4.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r4.exe 
-/out:r4lmd.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r4.obj 
-	cl /MDd /D_MT /D_DLL /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r5lmd.exe r5.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r5.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r5.exe 
-/out:r5lmd.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r5.obj 
-	cl /MDd /D_MT /D_DLL /D_DEBUG -O2 -GX -GR -I..\..\..\.. -o r6lmd.exe r6.cpp -link /LIBPATH:..\..\lib\vc6-stlport user32.lib
-Microsoft (R) 32-bit C/C++ Standard Compiler Version 12.00.8168 for 80x86
-Copyright (C) Microsoft Corp 1984-1998. All rights reserved.
-
-r6.cpp
-Microsoft (R) Incremental Linker Version 6.00.8447
-Copyright (C) Microsoft Corp 1992-1998. All rights reserved.
-
-/out:r6.exe 
-/out:r6lmd.exe 
-/LIBPATH:..\..\lib\vc6-stlport 
-user32.lib 
-r6.obj 
-	echo testing static multi-threaded version....
-testing static multi-threaded version....
-	r1m tests.txt test1252.txt
-858 lines, 625 tests completed in file tests.txt
-33 lines, 10 tests completed in file test1252.txt
-	r2m tests.txt
-858 lines, 625 tests completed in file tests.txt
-	r3m tests.txt
-Error in line 259 of file tests.txt
-Expression: [[:print:]]+
-Search text: 
-a b
-
-Flags: REG_EXTENDED | basic | escape_in_lists | char_classes | intervals | bk_refs | normal | basic | extended
-regex++ API result mismatch in sub-expression 0, found (0,5) expected (1,4)
-regex++ API result mismatch in sub-expression 0, found (0,5) expected (1,4)
-regex++ API result mismatch in sub-expression 0, found (0,5) expected (1,4)
-858 lines, 625 tests completed in file tests.txt
-NMAKE : fatal error U1077: 'd:\boost\regexpp\libs\regex\demo\regress\r3m.exe' : return code '0x1'
-Stop.

demo/regress/parse.cpp

@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     parse.cpp
-  *   VERSION  3.01
+  *   VERSION  3.02
   *
   * Input parsing functions for regress.
   *
@@ -77,6 +77,7 @@ flag_info flag_data[] = {
                           { BOOST_RE_STR("match_any"), 9, match_any, 3 },
                           { BOOST_RE_STR("match_not_null"), 14, match_not_null, 3 },
                           { BOOST_RE_STR("match_continuous"), 16, match_continuous, 3 },
+                          { BOOST_RE_STR("match_partial"), 13, match_partial, 3 },
 
                           { BOOST_RE_STR("format_sed"), 10, format_sed, 3 },
                           { BOOST_RE_STR("format_perl"), 11, format_perl, 3 },
@@ -297,7 +298,7 @@ void expand_escapes(string_type& s)
                int val = 0;
                unsigned int pos = i;
                ++i;
-               while( (s[i] >= BOOST_RE_STR('0')) && (s[i] <= BOOST_RE_STR('9')) && (i < s.size()))
+               while((i < s.size()) && (s[i] >= BOOST_RE_STR('0')) && (s[i] <= BOOST_RE_STR('9')))
                {
                   val *= 10;
                   val += s[i] - BOOST_RE_STR('0');

demo/regress/r1.cpp

@@ -1,24 +0,0 @@
-
-//
-// master include file for different regression builds...
-//
-// r1.cpp
-// narrow char's, locale Win32
-
-#define BOOST_RE_TEST_LOCALE_W32
-
-#include "parse.cpp"
-#include "regress.cpp"
-#include "tests.cpp"
-
-
-
-
-
-
-
-
-
-
-
-

demo/regress/r1lm.cpp

@@ -1,24 +0,0 @@
-
-//
-// master include file for different regression builds...
-//
-// r1.cpp
-// narrow char's, locale Win32
-
-#define BOOST_RE_TEST_LOCALE_W32
-
-#include "parse.cpp"
-#include "regress.cpp"
-#include "tests.cpp"
-
-
-
-
-
-
-
-
-
-
-
-

demo/regress/r2.cpp

@@ -1,28 +0,0 @@
-
-//
-// master include file for different regression builds...
-//
-// r1.cpp
-// narrow char's, locale C, force no Win32
-
-#define BOOST_RE_TEST_LOCALE_C
-
-
-#include "parse.cpp"
-#include "regress.cpp"
-#include "tests.cpp"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

demo/regress/r3.cpp

@@ -1,26 +0,0 @@
-
-//
-// master include file for different regression builds...
-//
-// r1.cpp
-// narrow char's, locale CPP
-
-#define BOOST_RE_TEST_LOCALE_CPP
-
-#include "parse.cpp"
-#include "regress.cpp"
-#include "tests.cpp"
-
-
-
-
-
-
-
-
-
-
-
-
-
-

demo/regress/r4.cpp

@@ -1,26 +0,0 @@
-
-//
-// master include file for different regression builds...
-//
-// r1.cpp
-// wide char's, locale Win32
-
-#define BOOST_RE_TEST_LOCALE_W32
-#define TEST_UNICODE
-
-#include "parse.cpp"
-#include "regress.cpp"
-#include "tests.cpp"
-
-
-
-
-
-
-
-
-
-
-
-
-

demo/regress/r5.cpp

@@ -1,27 +0,0 @@
-
-//
-// master include file for different regression builds...
-//
-// r1.cpp
-// wide char's, locale C
-
-#define BOOST_RE_TEST_LOCALE_C
-#define TEST_UNICODE
-
-#include "parse.cpp"
-#include "regress.cpp"
-#include "tests.cpp"
-
-
-
-
-
-
-
-
-
-
-
-
-
-

demo/regress/r6.cpp

@@ -1,27 +0,0 @@
-
-//
-// master include file for different regression builds...
-//
-// r1.cpp
-// wide char's, locale CPP
-
-#define BOOST_RE_TEST_LOCALE_CPP
-#define TEST_UNICODE
-
-#include "parse.cpp"
-#include "regress.cpp"
-#include "tests.cpp"
-
-
-
-
-
-
-
-
-
-
-
-
-
-

demo/regress/regex_test.cpp

@@ -0,0 +1,201 @@
+/*
+ *
+ * Copyright (c) 1998-2000
+ * Dr John Maddock
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Dr John Maddock makes no representations
+ * about the suitability of this software for any purpose.  
+ * It is provided "as is" without express or implied warranty.
+ *
+ */
+ 
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         regex_test.cpp
+  *   VERSION      3.02
+  *   DESCRIPTION: Builds regression test program with default
+  *                locale and narrow character tests.  Also
+  *                instantiates all the templates in the library
+  *                as a sanity check.
+  */
+
+// disable automatic selection of support library:
+#define BOOST_RE_NO_LIB
+
+#include <boost/regex.hpp>
+
+//
+// instantiate templates used:
+//
+namespace boost{
+
+#if defined(__GNUC__) && defined(__BEOS__)
+#define ra_it const char*
+#define test_char_type char
+#else
+typedef const char* ra_it;
+typedef char test_char_type;
+#endif
+typedef std::basic_string<test_char_type> test_string_type;
+
+bool pred1(const match_results<ra_it>&)
+{ return true; }
+
+typedef bool (*pred1_type)(const match_results<ra_it>&);
+typedef bool (*pred2_type)(const match_results<test_string_type::const_iterator>&);
+
+//check that all the defined flags are available:
+regbase::flag_type f = regbase::escape_in_lists | regbase::char_classes | regbase::intervals | regbase::limited_ops
+                       | regbase::newline_alt | regbase::bk_plus_qm | regbase::bk_braces
+                       | regbase::bk_parens | regbase::bk_refs | regbase::bk_vbar | regbase::use_except
+                       | regbase::failbit | regbase::literal | regbase::icase | regbase::nocollate | regbase::basic
+                       | regbase::extended | regbase::normal | regbase::emacs | regbase::awk | regbase::grep | regbase::egrep | regbase::sed;
+
+template class reg_expression<test_char_type>;
+template class sub_match<ra_it>;
+template class match_results<ra_it>;
+
+template bool regex_match(ra_it,
+                 ra_it,
+                 match_results<ra_it>& m,
+                 const reg_expression<test_char_type>& e,
+                 unsigned flags);
+template bool regex_match(ra_it,
+                 ra_it,
+                 const reg_expression<test_char_type>& e,
+                 unsigned flags);
+template bool regex_search(ra_it,
+                ra_it,
+                match_results<ra_it>& m,
+                const reg_expression<test_char_type>& e,
+                unsigned flags);
+template unsigned int regex_grep(pred1_type,
+                        ra_it,
+                        ra_it,
+                        const reg_expression<test_char_type>& e,
+                        unsigned flags);
+template test_char_type* regex_format(test_char_type*,
+                            const match_results<ra_it>& m,
+                            const test_char_type* fmt,
+                            unsigned flags);
+template test_char_type* regex_format(test_char_type*,
+                            const match_results<ra_it>& m,
+                            const test_string_type& fmt,
+                            unsigned flags);
+template test_char_type* regex_merge(test_char_type*,
+                          ra_it,
+                          ra_it,
+                          const reg_expression<test_char_type>&,
+                          const test_char_type*,
+                          unsigned int flags);
+template test_char_type* regex_merge(test_char_type*,
+                           ra_it,
+                           ra_it,
+                           const reg_expression<test_char_type>& e,
+                           const test_string_type&,
+                           unsigned int flags);
+template std::size_t regex_split(test_string_type*,
+                        test_string_type&,
+                        const reg_expression<test_char_type>&,
+                        unsigned flags,
+                        std::size_t);
+template std::size_t regex_split(test_string_type*,
+                        test_string_type& s,
+                        const reg_expression<test_char_type>& e,
+                        unsigned flags);
+
+template std::size_t regex_split(test_string_type*, test_string_type&);
+
+#ifndef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+//
+// the following prototypes are only available if partial ordering
+// of template functions is supported:
+//
+template bool regex_match(const test_char_type*,
+                 match_results<const test_char_type*>& m,
+                 const reg_expression<test_char_type>& e,
+                 unsigned flags);
+template bool regex_match(const test_string_type&,
+                 match_results<test_string_type::const_iterator>&,
+                 const reg_expression<test_char_type>&,
+                 unsigned flags);
+template bool regex_match(const test_char_type*,
+                 const reg_expression<test_char_type>&,
+                 unsigned flags);
+template bool regex_match(const test_string_type&,
+                 const reg_expression<test_char_type>&,
+                 unsigned flags);
+template bool regex_search(const test_char_type*,
+                match_results<const test_char_type*>&,
+                const reg_expression<test_char_type>&,
+                unsigned flags);
+template bool regex_search(const test_string_type&,
+                match_results<test_string_type::const_iterator>&,
+                const reg_expression<test_char_type>&,
+                unsigned flags);
+template unsigned int regex_grep(pred1_type,
+              const test_char_type*,
+              const reg_expression<test_char_type>&,
+              unsigned flags);
+template unsigned int regex_grep(pred2_type,
+              const test_string_type&,
+              const reg_expression<test_char_type>&,
+              unsigned flags);
+template test_string_type regex_format
+                                 (const match_results<test_string_type::const_iterator>& m,
+                                  const test_char_type*,
+                                  unsigned flags);
+template test_string_type regex_format
+                                 (const match_results<test_string_type::const_iterator>&,
+                                  const test_string_type&,
+                                  unsigned flags);
+template test_string_type regex_merge(const test_string_type&,
+                                     const reg_expression<test_char_type>&,
+                                     const test_char_type*,
+                                     unsigned int flags);
+template test_string_type regex_merge(const test_string_type&,
+                                     const reg_expression<test_char_type>&,
+                                     const test_string_type&,
+                                     unsigned int flags);
+
+#endif
+
+} // namespace boost
+
+//
+// include regression test source files:
+//
+#ifdef BOOST_RE_LOCALE_W32
+#define BOOST_RE_TEST_LOCALE_W32
+#elif !defined(BOOST_RE_LOCALE_C)
+#define BOOST_RE_TEST_LOCALE_CPP
+#endif
+
+#include "tests.cpp"
+#include "parse.cpp"
+#include "regress.cpp"
+
+//
+// include library source files:
+//
+#ifdef BOOST_RE_LOCALE_W32
+#include "libs/regex/src/w32_regex_traits.cpp"
+#elif defined(BOOST_RE_LOCALE_C)
+#include "libs/regex/src/c_regex_traits.cpp"
+#else
+#include "libs/regex/src/cpp_regex_traits.cpp"
+#endif
+#include "libs/regex/src/c_regex_traits_common.cpp"
+#include "libs/regex/src/cregex.cpp"
+#include "libs/regex/src/fileiter.cpp"
+#include "libs/regex/src/posix_api.cpp"
+#include "libs/regex/src/regex.cpp"
+#include "libs/regex/src/regex_debug.cpp"
+#include "libs/regex/src/regex_synch.cpp"
+#include "libs/regex/src/wide_posix_api.cpp"
+
+

demo/regress/regress.cpp

@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     regress.cpp
-  *   VERSION  3.01
+  *   VERSION  3.02
   *
   * main() and associated code for regress.
   *

demo/regress/regress.h

@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     regress.h
-  *   VERSION  3.01
+  *   VERSION  3.02
   *
   * Function and data declarations for regress.
   *
@@ -115,8 +115,8 @@ private:
    int* blocks, *count;
    jm_debug_alloc* guard;
 public:
-   typedef size_t    size_type;
-   typedef ptrdiff_t difference_type;
+   typedef std::size_t    size_type;
+   typedef std::ptrdiff_t difference_type;
    typedef char*        pointer;
    typedef const char*  const_pointer;
    typedef char&        reference;
@@ -182,7 +182,7 @@ public:
 // class debug_iterator
 //
 template <class T>
-struct debug_iterator : public BOOST_RE_RA_ITERATOR(T, ptrdiff_t)
+struct debug_iterator : public BOOST_RE_RA_ITERATOR(T, std::ptrdiff_t)
 {
    typedef std::ptrdiff_t                    difference_type;
    typedef char_t                            value_type;
@@ -190,7 +190,7 @@ struct debug_iterator : public BOOST_RE_RA_ITERATOR(T, ptrdiff_t)
    typedef char_t&                           reference;
    typedef std::random_access_iterator_tag   iterator_category;
    typedef debug_iterator                    self;
-   typedef size_t                            size_type;
+   typedef std::size_t                       size_type;
 
   T cur;
   T first;
@@ -201,6 +201,13 @@ struct debug_iterator : public BOOST_RE_RA_ITERATOR(T, ptrdiff_t)
   debug_iterator() : cur(), first(), last() {}
   debug_iterator(const debug_iterator& x)
     : cur(x.cur), first(x.first), last(x.last) {}
+  debug_iterator& operator=(const debug_iterator& x)
+  {
+     cur = x.cur;
+     first = x.first;
+     last = x.last;
+     return *this;
+  }
 
   reference operator*() const
   {
@@ -287,6 +294,11 @@ struct debug_iterator : public BOOST_RE_RA_ITERATOR(T, ptrdiff_t)
   bool operator<(const self& x) const {
     return (cur < x.cur);
   }
+  friend self operator+(difference_type n, const self& i)
+  {
+    self tmp = i;
+    return tmp += n;
+  }
 };
 
 #if defined(__SGI_STL_PORT) && (__SGI_STL_PORT >= 0x400)

demo/regress/sunpro.mak

@@ -13,11 +13,11 @@ all: r2 r5
 %.o : %.cpp 
 	$(CXX) -c -o $@ $(CPP_FLAGS) $<
 
-r2 : r2.o
-	$(CXX) -o $@  $(CPP_FLAGS) r2.o -L../../lib -lregex++
+r2 : tests.cpp parse.cpp regress.cpp
+	$(CXX) -o $@  $(CPP_FLAGS) tests.cpp parse.cpp regress.cpp -L../../lib -lregex++
 
-r5 : r5.o
-	$(CXX) -o $@  $(CPP_FLAGS) r5.o -L../../lib -lregex++
+r5 : tests.cpp parse.cpp regress.cpp
+	$(CXX) -o $@  $(CPP_FLAGS) -DTEST_UNICODE tests.cpp parse.cpp regress.cpp -L../../lib -lregex++
 
 clean:
 	rm -rf SunWS_cache
@@ -26,3 +26,4 @@ clean:
 
 
 
+

demo/regress/test1252.txt

@@ -30,3 +30,5 @@
 
 
 
+
+

demo/regress/tests.cpp

@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     tests.cpp
-  *   VERSION  3.01
+  *   VERSION  3.02
   *
   * the actual tests conducted by regress.
   *
@@ -236,7 +236,7 @@ void cpp_tests(const reg_expression<C, T, A>& e, bool recurse = true)
          begin_error();
          cout << "Expression did not compile using regex++ API" << endl;
       }
-      else if(recurse)
+      else if((recurse) && ((flags[3] & match_partial) == 0))
          cpp_eh_tests(e);
    }
    else if(flags[4] & REG_GREP)
@@ -299,7 +299,7 @@ void cpp_tests(const reg_expression<C, T, A>& e, bool recurse = true)
                (m[-1].first - x) << "," << (m[-1].second - x) << ") expected (0" <<
                "," << matches[0] << ")" << endl;
          }
-         if((m[-2].first != m[0].second) || (m[-2].second != y))
+         if(((flags[3] & match_partial) == 0) && ((m[-2].first != m[0].second) || (m[-2].second != y)))
          {
             begin_error();
             cout << "regex++ API result mismatch in $' (match -2), found (" <<
@@ -327,6 +327,26 @@ void cpp_tests(const reg_expression<C, T, A>& e, bool recurse = true)
                begin_error();
                cout << "regex++ API result mismatch in regex_search(const std::string&, match_results&, const reg_expression&, int)" << endl;
             }
+            //
+            // partial match should give same result as full match
+            // provided a full match is expected:
+            //
+            if(matches[0] > 0)
+            {
+               if(regex_search(x, y, m, e, flags[3] | boost::match_partial))
+               {
+                  if(compare_result(sm, m) == false)
+                  {
+                     begin_error();
+                     cout << "regex++ API result mismatch in regex_search when enabling match_partial" << endl;
+                  }
+               }
+               else
+               {
+                  begin_error();
+                  cout << "regex++ API result: match not found when match_partial specified" << endl;
+               }
+            }
             if(s.find(char_t(0)) == std::basic_string<char_t>::npos)
             {
                match_results<const char_t*> ssm;
@@ -615,7 +635,7 @@ void run_tests()
 #if !defined(TEST_UNICODE)
    try
    {
-      if((flags[2] == regbase::normal) && (has_nulls(search_text.begin(), search_text.end()) == false))
+      if(((flags[3] & match_partial) == 0) && (flags[2] == regbase::normal) && (has_nulls(search_text.begin(), search_text.end()) == false))
       {
          RegEx e;
          e.SetExpression(expression.c_str(), flags[0] & REG_ICASE);

demo/regress/tests.txt

@@ -850,6 +850,12 @@ abc|\w+? abcd 0 3
 (?:a+(b+)) xaaabbba 1 7 4 7
 a+(?#b+)b+ xaaabbba 1 7
 
+;
+; try some partial matches:
+- match_partial match_default normal REG_EXTENDED REG_NO_POSIX_TEST
+(xyz)(.*)abc xyzaaab -1 -1 0 3 3 7
+(xyz)(.*)abc xyz -1 -1 0 3 3 3
+(xyz)(.*)abc xy -1 -1 -1 -1 -1 -1
 
 
 

demo/regress/vc6-stlport.mak

@@ -40,86 +40,79 @@ all :: r1m.exe r2m.exe r3m.exe r4m.exe r5m.exe r6m.exe r1l.exe r2l.exe r3l.exe r
 	r6lmd tests.txt
 
 
-r1m.exe : r1.cpp
-	cl /MT /D_MT -o r1m.exe $(CFLAGS) r1.cpp $(LFLAGS)
+r1m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT -o r1m.exe $(CFLAGS) -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2m.exe : r2.cpp
-	cl /MT /D_MT $(CFLAGS) -o r2m.exe r2.cpp $(LFLAGS)
+r2m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r2m.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3m.exe : r3.cpp
-	cl /MT /D_MT $(CFLAGS) -o r3m.exe r3.cpp $(LFLAGS)
+r3m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r3m.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4m.exe : r4.cpp
-	cl /MT /D_MT $(CFLAGS) -o r4m.exe r4.cpp $(LFLAGS)
+r4m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r5m.exe : r5.cpp
-	cl /MT /D_MT $(CFLAGS) -o r5m.exe r5.cpp $(LFLAGS)
+r5m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r6m.exe : r6.cpp
-	cl /MT /D_MT $(CFLAGS) -o r6m.exe r6.cpp $(LFLAGS)
+r6m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
 
-r1l.exe : r1.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r1l.exe r1.cpp $(LFLAGS)
+r1l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r1l.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2l.exe : r2.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r2l.exe r2.cpp $(LFLAGS)
+r2l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r2l.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3l.exe : r3.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r3l.exe r3.cpp $(LFLAGS)
+r3l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r3l.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4l.exe : r4.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r4l.exe r4.cpp $(LFLAGS)
+r4l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r5l.exe : r5.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r5l.exe r5.cpp $(LFLAGS)
+r5l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r6l.exe : r6.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r6l.exe r6.cpp $(LFLAGS)
+r6l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
 
-r1md.exe : r1.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r1md.exe r1.cpp $(LFLAGS)
+r1md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r1md.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2md.exe : r2.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r2md.exe r2.cpp $(LFLAGS)
+r2md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r2md.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3md.exe : r3.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r3md.exe r3.cpp $(LFLAGS)
+r3md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r3md.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4md.exe : r4.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r4md.exe r4.cpp $(LFLAGS)
+r4md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r4md.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r5md.exe : r5.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r5md.exe r5.cpp $(LFLAGS)
+r5md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r5md.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r6md.exe : r6.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r6md.exe r6.cpp $(LFLAGS)
-
-
-r1lmd.exe : r1.cpp
-	cl /MDd /D_MT /D_DLL /D_DEBUG $(CFLAGS) -o r1lmd.exe r1.cpp $(LFLAGS)
-
-r2lmd.exe : r2.cpp
-	cl /MDd /D_MT /D_DLL /D_DEBUG $(CFLAGS) -o r2lmd.exe r2.cpp $(LFLAGS)
-
-r3lmd.exe : r3.cpp
-	cl /MDd /D_MT /D_DLL /D_DEBUG $(CFLAGS) -o r3lmd.exe r3.cpp $(LFLAGS)
-
-r4lmd.exe : r4.cpp
-	cl /MDd /D_MT /D_DLL /D_DEBUG $(CFLAGS) -o r4lmd.exe r4.cpp $(LFLAGS)
-
-r5lmd.exe : r5.cpp
-	cl /MDd /D_MT /D_DLL /D_DEBUG $(CFLAGS) -o r5lmd.exe r5.cpp $(LFLAGS)
-
-r6lmd.exe : r6.cpp
-	cl /MDd /D_MT /D_DLL /D_DEBUG $(CFLAGS) -o r6lmd.exe r6.cpp $(LFLAGS)
+r6md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r6md.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
 
+r1lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r1lmd.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
+r2lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r2lmd.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
+r3lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r3lmd.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
+r4lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r4lmd.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
+r5lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r5lmd.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
+r6lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r6lmd.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
 

demo/regress/vc6.mak

@@ -52,118 +52,125 @@ all :: r1.exe r2.exe r3.exe r4.exe r5.exe r6.exe r1m.exe r2m.exe r3m.exe r4m.exe
 	r6lmd tests.txt
 
 
-r1.exe : r1.cpp
-	cl /ML $(CFLAGS) r1.cpp $(LFLAGS)
+r1.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r1.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2.exe : r2.cpp
-	cl /ML $(CFLAGS) r2.cpp $(LFLAGS)
+r2.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r2.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3.exe : r3.cpp
-	cl /ML $(CFLAGS) r3.cpp $(LFLAGS)
+r3.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r3.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4.exe : r4.cpp
-	cl /ML $(CFLAGS) r4.cpp $(LFLAGS)
+r4.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r5.exe : r5.cpp
-	cl /ML $(CFLAGS) r5.cpp $(LFLAGS)
+r5.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r6.exe : r6.cpp
-	cl /ML $(CFLAGS) r6.cpp $(LFLAGS)
+r6.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 	
 
-r1m.exe : r1.cpp
-	cl /MT /D_MT -o r1m.exe $(CFLAGS) r1.cpp $(LFLAGS)
+r1m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT -o r1m.exe $(CFLAGS) -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2m.exe : r2.cpp
-	cl /MT /D_MT $(CFLAGS) -o r2m.exe r2.cpp $(LFLAGS)
+r2m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r2m.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3m.exe : r3.cpp
-	cl /MT /D_MT $(CFLAGS) -o r3m.exe r3.cpp $(LFLAGS)
+r3m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r3m.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4m.exe : r4.cpp
-	cl /MT /D_MT $(CFLAGS) -o r4m.exe r4.cpp $(LFLAGS)
+r4m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r5m.exe : r5.cpp
-	cl /MT /D_MT $(CFLAGS) -o r5m.exe r5.cpp $(LFLAGS)
+r5m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r6m.exe : r6.cpp
-	cl /MT /D_MT $(CFLAGS) -o r6m.exe r6.cpp $(LFLAGS)
+r6m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
 
-r1l.exe : r1.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r1l.exe r1.cpp $(LFLAGS)
+r1l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r1l.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2l.exe : r2.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r2l.exe r2.cpp $(LFLAGS)
+r2l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r2l.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3l.exe : r3.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r3l.exe r3.cpp $(LFLAGS)
+r3l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r3l.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4l.exe : r4.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r4l.exe r4.cpp $(LFLAGS)
+r4l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r5l.exe : r5.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r5l.exe r5.cpp $(LFLAGS)
+r5l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r6l.exe : r6.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r6l.exe r6.cpp $(LFLAGS)
+r6l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
 
-r1d.exe : r1.cpp
-	cl /MLd $(CFLAGS) -o r1d.exe r1.cpp $(LFLAGS)
+r1d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r1d.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2d.exe : r2.cpp
-	cl /MLd $(CFLAGS) -o r2d.exe r2.cpp $(LFLAGS)
+r2d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r2d.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3d.exe : r3.cpp
-	cl /MLd $(CFLAGS) -o r3d.exe r3.cpp $(LFLAGS)
+r3d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r3d.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4d.exe : r4.cpp
-	cl /MLd $(CFLAGS) -o r4d.exe r4.cpp $(LFLAGS)
+r4d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r4d.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r5d.exe : r5.cpp
-	cl /MLd $(CFLAGS) -o r5d.exe r5.cpp $(LFLAGS)
+r5d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r5d.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r6d.exe : r6.cpp
-	cl /MLd $(CFLAGS) -o r6d.exe r6.cpp $(LFLAGS)
+r6d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r6d.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
 
-r1md.exe : r1.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r1md.exe r1.cpp $(LFLAGS)
+r1md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r1md.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2md.exe : r2.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r2md.exe r2.cpp $(LFLAGS)
+r2md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r2md.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3md.exe : r3.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r3md.exe r3.cpp $(LFLAGS)
+r3md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r3md.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4md.exe : r4.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r4md.exe r4.cpp $(LFLAGS)
+r4md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r4md.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r5md.exe : r5.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r5md.exe r5.cpp $(LFLAGS)
+r5md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r5md.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r6md.exe : r6.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r6md.exe r6.cpp $(LFLAGS)
+r6md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r6md.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+
+r1lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r1lmd.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r2lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r2lmd.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r3lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r3lmd.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r4lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r4lmd.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r5lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r5lmd.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r6lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r6lmd.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
 
-r1lmd.exe : r1.cpp
-	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r1lmd.exe r1.cpp $(LFLAGS)
 
-r2lmd.exe : r2.cpp
-	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r2lmd.exe r2.cpp $(LFLAGS)
 
-r3lmd.exe : r3.cpp
-	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r3lmd.exe r3.cpp $(LFLAGS)
 
-r4lmd.exe : r4.cpp
-	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r4lmd.exe r4.cpp $(LFLAGS)
 
-r5lmd.exe : r5.cpp
-	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r5lmd.exe r5.cpp $(LFLAGS)
 
-r6lmd.exe : r6.cpp
-	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r6lmd.exe r6.cpp $(LFLAGS)
 
 
 

demo/regress/wregex_test.cpp

@@ -0,0 +1,196 @@
+/*
+ *
+ * Copyright (c) 1998-2000
+ * Dr John Maddock
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Dr John Maddock makes no representations
+ * about the suitability of this software for any purpose.  
+ * It is provided "as is" without express or implied warranty.
+ *
+ */
+ 
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         regex_test.cpp
+  *   VERSION      3.02
+  *   DESCRIPTION: Builds regression test program with default
+  *                locale and wide character tests.  Also
+  *                instantiates all the templates in the library
+  *                as a sanity check.
+  */
+
+// disable automatic selection of support library:
+#define BOOST_RE_NO_LIB
+#define TEST_UNICODE
+
+#include <boost/regex.hpp>
+
+//
+// instantiate templates used:
+//
+namespace boost{
+
+typedef const wchar_t* ra_it;
+typedef wchar_t char_type;
+typedef std::basic_string<char_type> test_string_type;
+
+bool pred1(const match_results<ra_it>&)
+{ return true; }
+
+typedef bool (*pred1_type)(const match_results<ra_it>&);
+typedef bool (*pred2_type)(const match_results<test_string_type::const_iterator>&);
+
+//check that all the defined flags are available:
+regbase::flag_type f = regbase::escape_in_lists | regbase::char_classes | regbase::intervals | regbase::limited_ops
+                       | regbase::newline_alt | regbase::bk_plus_qm | regbase::bk_braces
+                       | regbase::bk_parens | regbase::bk_refs | regbase::bk_vbar | regbase::use_except
+                       | regbase::failbit | regbase::literal | regbase::icase | regbase::nocollate | regbase::basic
+                       | regbase::extended | regbase::normal | regbase::emacs | regbase::awk | regbase::grep | regbase::egrep | regbase::sed;
+
+template class reg_expression<char_type>;
+template class sub_match<ra_it>;
+template class match_results<ra_it>;
+
+template bool regex_match(ra_it,
+                 ra_it,
+                 match_results<ra_it>& m,
+                 const reg_expression<char_type>& e,
+                 unsigned flags);
+template bool regex_match(ra_it,
+                 ra_it,
+                 const reg_expression<char_type>& e,
+                 unsigned flags);
+template bool regex_search(ra_it,
+                ra_it,
+                match_results<ra_it>& m,
+                const reg_expression<char_type>& e,
+                unsigned flags);
+template unsigned int regex_grep(pred1_type,
+                        ra_it,
+                        ra_it,
+                        const reg_expression<char_type>& e,
+                        unsigned flags);
+template char_type* regex_format(char_type*,
+                            const match_results<ra_it>& m,
+                            const char_type* fmt,
+                            unsigned flags);
+template char_type* regex_format(char_type*,
+                            const match_results<ra_it>& m,
+                            const test_string_type& fmt,
+                            unsigned flags);
+template char_type* regex_merge(char_type*,
+                          ra_it,
+                          ra_it,
+                          const reg_expression<char_type>&,
+                          const char_type*,
+                          unsigned int flags);
+template char_type* regex_merge(char_type*,
+                           ra_it,
+                           ra_it,
+                           const reg_expression<char_type>& e,
+                           const test_string_type&,
+                           unsigned int flags);
+template std::size_t regex_split(test_string_type*,
+                        test_string_type&,
+                        const reg_expression<char_type>&,
+                        unsigned flags,
+                        std::size_t);
+template std::size_t regex_split(test_string_type*,
+                        test_string_type& s,
+                        const reg_expression<char_type>& e,
+                        unsigned flags);
+
+template std::size_t regex_split(test_string_type*, test_string_type&);
+
+#ifndef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+//
+// the following prototypes are only available if partial ordering
+// of template functions is supported:
+//
+template bool regex_match(const char_type*,
+                 match_results<const char_type*>& m,
+                 const reg_expression<char_type>& e,
+                 unsigned flags);
+template bool regex_match(const test_string_type&,
+                 match_results<test_string_type::const_iterator>&,
+                 const reg_expression<char_type>&,
+                 unsigned flags);
+template bool regex_match(const char_type*,
+                 const reg_expression<char_type>&,
+                 unsigned flags);
+template bool regex_match(const test_string_type&,
+                 const reg_expression<char_type>&,
+                 unsigned flags);
+template bool regex_search(const char_type*,
+                match_results<const char_type*>&,
+                const reg_expression<char_type>&,
+                unsigned flags);
+template bool regex_search(const test_string_type&,
+                match_results<test_string_type::const_iterator>&,
+                const reg_expression<char_type>&,
+                unsigned flags);
+template unsigned int regex_grep(pred1_type,
+              const char_type*,
+              const reg_expression<char_type>&,
+              unsigned flags);
+template unsigned int regex_grep(pred2_type,
+              const test_string_type&,
+              const reg_expression<char_type>&,
+              unsigned flags);
+template test_string_type regex_format
+                                 (const match_results<test_string_type::const_iterator>& m,
+                                  const char_type*,
+                                  unsigned flags);
+template test_string_type regex_format
+                                 (const match_results<test_string_type::const_iterator>&,
+                                  const test_string_type&,
+                                  unsigned flags);
+template test_string_type regex_merge(const test_string_type&,
+                                     const reg_expression<char_type>&,
+                                     const char_type*,
+                                     unsigned int flags);
+template test_string_type regex_merge(const test_string_type&,
+                                     const reg_expression<char_type>&,
+                                     const test_string_type&,
+                                     unsigned int flags);
+
+#endif
+
+
+} // namespace boost
+
+//
+// include regression test source files:
+//
+#ifdef BOOST_RE_LOCALE_W32
+#define BOOST_RE_TEST_LOCALE_W32
+#elif !defined(BOOST_RE_LOCALE_C)
+#define BOOST_RE_TEST_LOCALE_CPP
+#endif
+#include "tests.cpp"
+#include "parse.cpp"
+#include "regress.cpp"
+
+//
+// include library source files:
+//
+#ifdef BOOST_RE_LOCALE_W32
+#include "libs/regex/src/w32_regex_traits.cpp"
+#elif defined(BOOST_RE_LOCALE_C)
+#include "libs/regex/src/c_regex_traits.cpp"
+#else
+#include "libs/regex/src/cpp_regex_traits.cpp"
+#endif
+#include "libs/regex/src/c_regex_traits_common.cpp"
+#include "libs/regex/src/cregex.cpp"
+#include "libs/regex/src/fileiter.cpp"
+#include "libs/regex/src/posix_api.cpp"
+#include "libs/regex/src/regex.cpp"
+#include "libs/regex/src/regex_debug.cpp"
+#include "libs/regex/src/regex_synch.cpp"
+#include "libs/regex/src/wide_posix_api.cpp"
+

demo/snippets/snip10.cpp

@@ -5,7 +5,7 @@
 bool validate_card_format(const std::string& s)
 {
    static const boost::regex e("(\\d{4}[- ]){3}\\d{4}");
-   return regex_match(s, e);
+   return boost::regex_match(s, e);
 }
 
 const boost::regex e("\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z");
@@ -14,12 +14,12 @@ const std::string human_format("\\1-\\2-\\3-\\4");
 
 std::string machine_readable_card_number(const std::string& s)
 {
-   return regex_merge(s, e, machine_format, boost::match_default | boost::format_sed);
+   return boost::regex_merge(s, e, machine_format, boost::match_default | boost::format_sed);
 }
 
 std::string human_readable_card_number(const std::string& s)
 {
-   return regex_merge(s, e, human_format, boost::match_default | boost::format_sed);
+   return boost::regex_merge(s, e, human_format, boost::match_default | boost::format_sed);
 }
 
 #include <iostream>
@@ -43,3 +43,4 @@ int main()
    }
    return 0;
 }
+

demo/snippets/snip2.cpp

@@ -40,7 +40,7 @@ void IndexClasses(map_type& m, const std::string& file)
    end = file.end();   
    boost::match_results<std::string::const_iterator> what;
    unsigned int flags = boost::match_default;
-   while(regex_search(start, end, what, expression, flags))   
+   while(boost::regex_search(start, end, what, expression, flags))   
    {
       // what[0] contains the whole string
       // what[5] contains the class name.
@@ -103,3 +103,4 @@ int main(int argc, const char** argv)
 
 
 
+

demo/snippets/snip3.cpp

@@ -56,7 +56,7 @@ void IndexClasses(map_type& m, const std::string& file)
    std::string::const_iterator start, end;
    start = file.begin();
    end = file.end();
-   regex_grep(IndexClassesPred(m, start), start, end, expression);
+   boost::regex_grep(IndexClassesPred(m, start), start, end, expression);
 }
 
 
@@ -104,3 +104,4 @@ int main(int argc, const char** argv)
 
 
 
+

demo/snippets/snip4.cpp

@@ -72,12 +72,12 @@ int main(int argc, const char** argv)
       // temporary string stream
       std::ostringstream t(std::ios::out | std::ios::binary);
       std::ostream_iterator<char, char> oi(t);
-      regex_merge(oi, in.begin(), in.end(), e2, pre_format);
+      boost::regex_merge(oi, in.begin(), in.end(), e2, pre_format);
       // then output to final output stream
       // adding syntax highlighting:
       std::string s(t.str());
       std::ostream_iterator<char, char> out(os);
-      regex_merge(out, s.begin(), s.end(), e1, format_string);
+      boost::regex_merge(out, s.begin(), s.end(), e1, format_string);
       os << footer_text;
    }
    return 0;
@@ -128,3 +128,4 @@ const char* footer_text = "</PRE>\n</BODY>\n\n";
 
 
 
+

demo/snippets/snip5.cpp

@@ -53,7 +53,7 @@ void IndexClasses(const std::string& file)
    start = file.begin();
    end = file.end();
    base = start;
-   regex_grep(grep_callback, start, end, expression);
+   boost::regex_grep(grep_callback, start, end, expression);
 }
 
 #include <fstream>
@@ -96,3 +96,4 @@ int main(int argc, const char** argv)
    }
    return 0;
 }
+

demo/snippets/snip6.cpp

@@ -66,7 +66,7 @@ void class_index::IndexClasses(const std::string& file)
    start = file.begin();
    end = file.end();
    base = start;
-   regex_grep(std::bind1st(std::mem_fun(&class_index::grep_callback), this),
+   boost::regex_grep(std::bind1st(std::mem_fun(&class_index::grep_callback), this),
             start,
             end,
             expression);
@@ -115,3 +115,4 @@ int main(int argc, const char** argv)
 }
 
 
+

demo/snippets/snip7.cpp

@@ -69,7 +69,7 @@ void class_index::IndexClasses(const std::string& file)
    end = file.end();
    base = start;
    class_index::grep_callback_type cl = &(this->grep_callback);
-   regex_grep(cl,
+   boost::regex_grep(cl,
             start,
             end,
             expression);
@@ -118,3 +118,4 @@ int main(int argc, const char** argv)
 }
 
 
+

demo/timer/gcc.mak

@@ -1,18 +1,15 @@
 
 # very basic makefile for timer.exe
 #
-# egcs compiler GCC
+# GNU compiler GCC
 #
-CXX= -O2 -I../../../../ -I./
+CXX=-I../../../../ -I./
 
-timer : regex_timer.o timer.o 
-	g++ -o -L../../lib/gcc timer regex_timer.o timer.o -lregex++
+timer : regex_timer.cpp timer.cpp 
+	g++ $(CXX) -O2 -o timer regex_timer.cpp timer.cpp -L../../lib/gcc -lregex++
 
-timer.o : ../../../timer/timer.cpp
-	g++ -c $(CXX)  ../../../timer/timer.cpp
-
-regex_timer.o : regex_timer.cpp
-	g++ -c $(CXX)  regex_timer.cpp
+debug : regex_timer.cpp timer.cpp 
+	g++ $(CXX) -g -o timer regex_timer.cpp timer.cpp -L../../lib/gcc -lregex++debug
 
 
 

faq.htm

@@ -20,7 +20,7 @@
 <H3> Regex++, FAQ.</H3>
 </CENTER>
 <CENTER>
-<I>(version 3.01, 18 April 2000)</I>
+<I>(version 3.02, 18 April 2000)</I>
 </CENTER>
 <PRE><I>Copyright (c) 1998-2000
 Dr John Maddock

format_string.htm

@@ -20,7 +20,7 @@
 <H3> Regex++, Format String Reference.</H3>
 </CENTER>
 <CENTER>
-<I>(version 3.01, 18 April 2000)</I>
+<I>(version 3.02, 18 April 2000)</I>
 </CENTER>
 <PRE><I>Copyright (c) 1998-2000
 Dr John Maddock

hl_ref.htm

@@ -20,7 +20,7 @@ content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
         </td>
         <td valign="top" width="50%"><h3 align="center">Regex++,
         RegEx Class Reference. </h3>
-        <p><i>(version 3.01, 18 April 2000)</i> </p>
+        <p><i>(version 3.02, 18 April 2000)</i> </p>
         <pre><i>Copyright (c) 1998-2000
 Dr John Maddock
 

include/boost/cregex.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         cregex.cpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Declares POSIX API functions
   *                + boost::RegEx high level wrapper.
   */
@@ -171,8 +171,11 @@ enum match_flags
    match_not_null = match_any << 1,                  // string can't be null
    match_continuous = match_not_null << 1,           // each grep match must continue from
                                                      // uninterupted from the previous one
-   match_stop = match_continuous << 1,               // stop after first match (grep)
-   match_max = match_stop
+   match_partial = match_continuous << 1,            // find partial matches
+   
+   match_stop = match_partial << 1,                  // stop after first match (grep)
+   match_all = match_stop << 1,                      // must find the whole of input even if match_any is set
+   match_max = match_all
 };
 
 

include/boost/pattern_except.hpp

@@ -39,14 +39,14 @@ class BOOST_RE_IX_DECL bad_pattern : public std::runtime_error
 {
 public:
    explicit bad_pattern(const std::string& s) : std::runtime_error(s){};
-   ~bad_pattern();
+   ~bad_pattern() throw();
 };
 
 class BOOST_RE_IX_DECL bad_expression : public bad_pattern
 {
 public:
    explicit bad_expression(const std::string& s) : bad_pattern(s) {}
-   ~bad_expression();
+   ~bad_expression() throw();
 };
 
 

include/boost/re_detail/fileiter.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         fileiter.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Declares various platform independent file and
   *                directory iterators, plus binary file input in
   *                the form of class map_file.
@@ -250,6 +250,12 @@ public:
       assert(node < file->_last);
       return file ? *(*node + sizeof(int) + offset) : char(0);
    }
+   char operator[] (long off)const
+   {
+      mapfile_iterator tmp(*this);
+      tmp += off;
+      return *tmp;
+   }
    mapfile_iterator& operator++ ();
    mapfile_iterator operator++ (int);
    mapfile_iterator& operator-- ();
@@ -280,8 +286,25 @@ public:
    {
       return i.position() < j.position();
    }
+   friend inline bool operator>(const mapfile_iterator& i, const mapfile_iterator& j)
+   {
+      return i.position() > j.position();
+   }
+   friend inline bool operator<=(const mapfile_iterator& i, const mapfile_iterator& j)
+   {
+      return i.position() <= j.position();
+   }
+   friend inline bool operator>=(const mapfile_iterator& i, const mapfile_iterator& j)
+   {
+      return i.position() >= j.position();
+   }
 
    friend mapfile_iterator operator + (const mapfile_iterator& i, long off);
+   friend mapfile_iterator operator + (long off, const mapfile_iterator& i)
+   {
+      mapfile_iterator tmp(i);
+      return tmp += off;
+   }
    friend mapfile_iterator operator - (const mapfile_iterator& i, long off);
    friend inline long operator - (const mapfile_iterator& i, const mapfile_iterator& j)
    {

include/boost/re_detail/regex_compile.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_compile.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Declares reg_expression<> member functions.  This is
   *                an internal header file, do not include directly.
   */
@@ -1240,7 +1240,8 @@ unsigned int BOOST_RE_CALL reg_expression<charT, traits, Allocator>::set_express
    register traits_size_type c;
    register re_detail::re_syntax_base* dat;
 
-   unsigned rep_min, rep_max;
+   unsigned rep_min = 0;
+   unsigned rep_max = 0;
 
    //
    // set up header:
@@ -1603,7 +1604,8 @@ unsigned int BOOST_RE_CALL reg_expression<charT, traits, Allocator>::set_express
             //unsigned pos = (char*)dat - (char*)data.data();
 
             // add the trailing jump:
-            add_simple(dat, re_detail::syntax_element_jump, re_detail::re_jump_size);
+            dat = add_simple(dat, re_detail::syntax_element_jump, re_detail::re_jump_size);
+            ((re_detail::re_jump*)dat)->alt.i = 0;
 
             // now insert the leading repeater:
             dat = (re_detail::re_syntax_base*)data.insert(offset, re_detail::re_repeater_size);
@@ -1959,12 +1961,12 @@ unsigned int BOOST_RE_CALL reg_expression<charT, traits, Allocator>::fixup_leadi
          leading_lit = false;
          break;
       case re_detail::syntax_element_rep:
-         if(1 == fixup_leading_rep(dat->next.p, ((re_detail::re_repeat*)dat)->alt.p) )
+         if((len == 0) && (1 == fixup_leading_rep(dat->next.p, ((re_detail::re_repeat*)dat)->alt.p) ))
          {
             ((re_detail::re_repeat*)dat)->leading = true;
             return len;
          }
-         return 0;
+         return len;
       default:
          break;
       }

include/boost/re_detail/regex_config.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_config.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: auto-configure options for regular expression code.
   */
 
@@ -46,10 +46,19 @@ Do not change this file unless you really really have to, add options to
 #include <cstring>
 #include <cctype>
 #include <cstdio>
+#include <clocale>
 #include <string>
 #include <boost/smart_ptr.hpp>
 #else
+//
+// C build,
+// don't include <boost/config.hpp> because that may
+// do C++ specific things in future...
+//
 #include <stdlib.h>
+#ifdef _MSC_VER
+#define BOOST_MSVC _MSC_VER
+#endif
 #endif
 
 /* this will increase in future versions: */
@@ -64,6 +73,12 @@ Do not change this file unless you really really have to, add options to
 #if (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(__GNUC__)
    #define BOOST_RE_PLATFORM_W32
 #endif
+
+#ifdef __MWERKS__
+// no std::maessages facet
+#define BOOST_RE_NO_MESSAGES
+#endif
+
 #ifdef __BORLANDC__
 
    #if __BORLANDC__ < 0x500
@@ -150,6 +165,8 @@ Do not change this file unless you really really have to, add options to
    #define BOOST_RE_INT64t __int64
    #define BOOST_RE_IMM64(val) val##i64
    #define BOOST_RE_NO_CAT
+   // broken wide character support:
+   #define BOOST_RE_NO_SWPRINTF
 
    #ifdef __MT__
       #define BOOST_RE_THREADS
@@ -199,7 +216,7 @@ Do not change this file unless you really really have to, add options to
       #define BOOST_RE_NO_STRING_DEF_ARGS
    #endif
 
-   #ifndef _CPPUNWIND
+   #if !defined(_CPPUNWIND) && defined(__cplusplus)
       #error exception handling support required
    #endif
 
@@ -213,6 +230,7 @@ Do not change this file unless you really really have to, add options to
    #define BOOST_RE_NO_CAT
    #define BOOST_RE_NO_PARTIAL_FUNC_SPEC
    #define BOOST_RE_NO_TEMPLATE_FRIEND
+   #define BOOST_RE_NO_SWPRINTF
 
    #ifdef _MT
       #define BOOST_RE_THREADS
@@ -263,12 +281,23 @@ Do not change this file unless you really really have to, add options to
       #define BOOST_RE_NO_TEMPLATE_SWITCH_MERGE
    #endif
    #define BOOST_RE_NO_CAT
-   #define BOOST_RE_OLD_IOSTREAM
    #define BOOST_RE_NESTED_TEMPLATE_DECL
-   #define BOOST_RE_NO_WCSTRING
+   #define BOOST_RE_NO_SWPRINTF
+   #include <string>
+   #ifdef __BASTRING__
+   	#define BOOST_RE_NO_WCSTRING
+   #endif
+   #if defined(__BEOS__)
+   	#define BOOST_RE_NO_WCTYPE_H
+   	#define BOOST_RE_NO_WCSTRING
+   #endif
 
 #endif
 
+#ifdef __MWERKS__
+   #define BOOST_RE_NO_CAT
+#endif
+
 #ifdef __SUNPRO_CC
    #if (__SUNPRO_CC < 0x500)
       #define BOOST_RE_NO_NAMESPACES
@@ -300,6 +329,7 @@ Do not change this file unless you really really have to, add options to
    #define BOOST_RE_IMM64(val) val##LL
    #define BOOST_RE_NESTED_TEMPLATE_DECL
    #define BOOST_RE_NO_TEMPLATE_FRIEND
+   #define BOOST_RE_NO_SWPRINTF
 #endif
 
 
@@ -389,7 +419,7 @@ typedef unsigned long jm_uintfast32_t;
        some of these (std)
        may be guesswork: */
 
-      # if !defined (__SGI_STL_OWN_IOSTREAMS) || defined (__STL_HAS_NO_NEW_IOSTREAMS) || defined (__STL_USE_NO_IOSTREAMS)
+      # if !defined (__SGI_STL_OWN_IOSTREAMS) || defined (__STL_HAS_NO_NEW_IOSTREAMS) || defined (__STL_USE_NO_IOSTREAMS) || defined(__STL_NO_MBSTATE_T)
          // Old IO streams:
          #define BOOST_RE_NO_LOCALE_H
          #define BOOST_RE_OLD_IOSTREAM
@@ -398,6 +428,9 @@ typedef unsigned long jm_uintfast32_t;
             #define BOOST_RE_USE_FACET(l, m) (*std::_Use_facet<m >(l))
          #endif
       #endif
+      #ifdef __BASTRING__
+      	#define BOOST_RE_NO_WCSTRING
+      #endif
       #if !defined(__STL_MEMBER_TEMPLATE_CLASSES) ||  !defined(__STL_MEMBER_TEMPLATES)
          #define BOOST_RE_NO_MEMBER_TEMPLATES
       #endif
@@ -595,18 +628,22 @@ typedef unsigned long jm_uintfast32_t;
       #define BOOST_RE_NEED_ALLOC
 
       #define BOOST_RE_STL_DONE
-
-      #define BOOST_RE_USE_FACET(l, type) std::use_facet(l, (type*)0, true)
-      #define BOOST_RE_HAS_FACET(l, type) std::has_facet(l, (type*)0)
-
+      #ifndef _CPPLIB_VER
+         #define BOOST_RE_USE_FACET(l, type) std::use_facet(l, (type*)0, true)
+         #define BOOST_RE_HAS_FACET(l, type) std::has_facet(l, (type*)0)
+      #else
+         #define BOOST_RE_USE_FACET(l, type) std::use_facet(l, (type*)0)
+         #define BOOST_RE_HAS_FACET(l, type) std::has_facet(l, (type*)0)
+      #endif
 
 
    #else
 
       /* unknown STL version
        try the defaults: */
-
-      #define BOOST_RE_DISTANCE(i, j, n) std::distance(i, j, n)do { n = 0; std::distance(i, j, n); } while(false)
+    
+      // dwa 10/05/00 Why were we assuming a broken distance in this case?
+      #define BOOST_RE_DISTANCE(i, j, n)  (n = std::distance(i, j))
       /* these may be suspect for older libraries */
       #define BOOST_RE_OUTPUT_ITERATOR(T, D) std::iterator<std::output_iterator_tag, T, D, T*, T&>
       #define BOOST_RE_INPUT_ITERATOR(T, D) std::iterator<std::input_iterator_tag, T, D, T*, T&>
@@ -770,15 +807,15 @@ public:
    typedef const T*  const_pointer;
    typedef T&        reference;
    typedef const T&  const_reference;
-   typedef size_t    size_type;
+   typedef std::size_t    size_type;
    typedef std::ptrdiff_t difference_type;
 
    re_alloc_binder(const Allocator& i);
    re_alloc_binder(const re_alloc_binder& o) : Allocator(o) {}
 
-   T* BOOST_RE_CALL allocate(size_t n, size_t /* hint */ = 0)
+   T* BOOST_RE_CALL allocate(std::size_t n, std::size_t /* hint */ = 0)
       { return 0 == n ? 0 : (T*) this->Allocator::allocate(n * sizeof(T)); }
-   void BOOST_RE_CALL deallocate(T *p, size_t n)
+   void BOOST_RE_CALL deallocate(T *p, std::size_t n)
              { if (0 != n) this->Allocator::deallocate((char*)p, n * sizeof (T)); }
 
    pointer BOOST_RE_CALL address(reference x) const { return &x; }
@@ -825,7 +862,7 @@ public:
    typedef const char*  const_pointer;
    typedef char&        reference;
    typedef const char&  const_reference;
-   typedef size_t    size_type;
+   typedef std::size_t    size_type;
    typedef std::ptrdiff_t difference_type;
 
    pointer BOOST_RE_CALL address(reference x) const { return &x; }
@@ -833,11 +870,11 @@ public:
    static size_type BOOST_RE_CALL max_size() { return (size_type)-1; }
    static void BOOST_RE_CALL construct(pointer , const char& ) {  }
    void BOOST_RE_CALL destroy(pointer ) {  }
-   static void * BOOST_RE_CALL allocate(size_t n, size_t /* hint */ = 0)
+   static void * BOOST_RE_CALL allocate(std::size_t n, std::size_t /* hint */ = 0)
    {
       return ::operator new(n);
    }
-   static void BOOST_RE_CALL deallocate(void *p, size_t /*n*/ )
+   static void BOOST_RE_CALL deallocate(void *p, std::size_t /*n*/ )
    {
       ::operator delete(p);
    }
@@ -1117,10 +1154,6 @@ namespace std{
    using ::strcmp;
    using ::strcpy;
    using ::strlen;
-   using ::swprintf;
-   using ::wcslen;
-   using ::wcscpy;
-   using ::wcscmp;
    using ::isalpha;
    using ::iscntrl;
    using ::isdigit;
@@ -1130,6 +1163,15 @@ namespace std{
    using ::isspace;
    using ::isxdigit;
    using ::tolower;
+   using ::abs;
+   using ::setlocale;
+#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_RE_NO_SWPRINTF
+   using ::swprintf;
+#endif
+   using ::wcslen;
+   using ::wcscpy;
+   using ::wcscmp;
    using ::iswalpha;
    using ::iswcntrl;
    using ::iswdigit;
@@ -1140,7 +1182,12 @@ namespace std{
    using ::iswxdigit;
    using ::towlower;
    using ::wcsxfrm;
+   using ::wcstombs;
+   using ::mbstowcs;
+#ifndef BOOST_RE_NO_LOCALE_H
    using ::mbstate_t;
+#endif
+#endif // BOOST_RE_NO_WCSTRING
 }
 
 #endif
@@ -1201,5 +1248,6 @@ namespace std{
 
 
 
+
 
 

include/boost/re_detail/regex_cstring.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_cstring.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: This is an internal header file, do not include directly.
   *                String support and helper functions, for regular
   *                expression library.

include/boost/re_detail/regex_format.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_format.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Provides formatting output routines for search and replace
   *                operations.  Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
@@ -42,7 +42,7 @@ namespace re_detail{
    #if __BORLANDC__ == 0x530
     #pragma option push -a4 -b -Ve
    #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b -Ve
+    #pragma option push -a8 -b -Ve -w-8037
    #endif
 #endif
 
@@ -471,7 +471,7 @@ public:
 } // namespace re_detail
 
 template <class OutputIterator, class iterator, class Allocator, class charT>
-OutputIterator BOOST_RE_CALL regex_format(OutputIterator out,
+OutputIterator regex_format(OutputIterator out,
                           const match_results<iterator, Allocator>& m,
                           const charT* fmt,
                           unsigned flags = 0
@@ -482,18 +482,19 @@ OutputIterator BOOST_RE_CALL regex_format(OutputIterator out,
 }
 
 template <class OutputIterator, class iterator, class Allocator, class charT>
-OutputIterator BOOST_RE_CALL regex_format(OutputIterator out,
+OutputIterator regex_format(OutputIterator out,
                           const match_results<iterator, Allocator>& m,
                           const std::basic_string<charT>& fmt,
                           unsigned flags = 0
                          )
 {
    regex_traits<charT> t;
-   return re_detail::_reg_format_aux(out, m, fmt.c_str(), flags, t);
+   const charT* start = fmt.c_str();
+   return re_detail::_reg_format_aux(out, m, start, flags, t);
 }  
 
 template <class iterator, class Allocator, class charT>
-std::basic_string<charT> BOOST_RE_CALL regex_format(const match_results<iterator, Allocator>& m, const charT* fmt, unsigned flags = 0)
+std::basic_string<charT> regex_format(const match_results<iterator, Allocator>& m, const charT* fmt, unsigned flags = 0)
 {
    std::basic_string<charT> result;
    re_detail::string_out_iterator<std::basic_string<charT> > i(result);
@@ -502,7 +503,7 @@ std::basic_string<charT> BOOST_RE_CALL regex_format(const match_results<iterator
 }
 
 template <class iterator, class Allocator, class charT>
-std::basic_string<charT> BOOST_RE_CALL regex_format(const match_results<iterator, Allocator>& m, const std::basic_string<charT>& fmt, unsigned flags = 0)
+std::basic_string<charT> regex_format(const match_results<iterator, Allocator>& m, const std::basic_string<charT>& fmt, unsigned flags = 0)
 {
    std::basic_string<charT> result;
    re_detail::string_out_iterator<std::basic_string<charT> > i(result);
@@ -511,7 +512,7 @@ std::basic_string<charT> BOOST_RE_CALL regex_format(const match_results<iterator
 }
 
 template <class OutputIterator, class iterator, class traits, class Allocator, class charT>
-OutputIterator BOOST_RE_CALL regex_merge(OutputIterator out,
+OutputIterator regex_merge(OutputIterator out,
                          iterator first,
                          iterator last,
                          const reg_expression<charT, traits, Allocator>& e, 
@@ -525,7 +526,7 @@ OutputIterator BOOST_RE_CALL regex_merge(OutputIterator out,
 }
 
 template <class OutputIterator, class iterator, class traits, class Allocator, class charT>
-inline OutputIterator BOOST_RE_CALL regex_merge(OutputIterator out,
+inline OutputIterator regex_merge(OutputIterator out,
                          iterator first,
                          iterator last,
                          const reg_expression<charT, traits, Allocator>& e, 
@@ -536,7 +537,7 @@ inline OutputIterator BOOST_RE_CALL regex_merge(OutputIterator out,
 }
 
 template <class traits, class Allocator, class charT>
-std::basic_string<charT> BOOST_RE_CALL regex_merge(const std::basic_string<charT>& s,
+std::basic_string<charT> regex_merge(const std::basic_string<charT>& s,
                          const reg_expression<charT, traits, Allocator>& e, 
                          const charT* fmt,
                          unsigned int flags = match_default)
@@ -548,7 +549,7 @@ std::basic_string<charT> BOOST_RE_CALL regex_merge(const std::basic_string<charT
 }
 
 template <class traits, class Allocator, class charT>
-std::basic_string<charT> BOOST_RE_CALL regex_merge(const std::basic_string<charT>& s,
+std::basic_string<charT> regex_merge(const std::basic_string<charT>& s,
                          const reg_expression<charT, traits, Allocator>& e, 
                          const std::basic_string<charT>& fmt,
                          unsigned int flags = match_default)

include/boost/re_detail/regex_kmp.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_kmp.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Provides Knuth Morris Pratt search operations.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.

include/boost/re_detail/regex_library_include.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_libary_include.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Automatic library inclusion for Borland/Microsoft compilers.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.

include/boost/re_detail/regex_match.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_match.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Regular expression matching algorithms.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
@@ -141,7 +141,6 @@ iterator BOOST_RE_CALL re_is_set_member(iterator next,
          }
       }
    }
-
    if(traits_inst.is_class(col, set_->cclasses) == true)
       return set_->isnot ? next : ++next;
    return set_->isnot ? ++next : next;
@@ -263,7 +262,7 @@ bool query_match_aux(iterator first,
                      iterator last, 
                      match_results<iterator, Allocator>& m, 
                      const reg_expression<charT, traits, Allocator2>& e, 
-                     unsigned flags, 
+                     unsigned flags,
                      _priv_match_data<iterator, Allocator>& pd,
                      iterator* restart)
 {
@@ -287,6 +286,7 @@ bool query_match_aux(iterator first,
 
    const re_syntax_base* ptr = access::first(e);
    bool match_found = false;
+   bool have_partial_match = false;
    bool need_push_match = (e.mark_count() > 1);
    int cur_acc = -1;    // no active accumulator
    pd.set_accumulator_size(access::repeat_count(e));
@@ -325,7 +325,7 @@ bool query_match_aux(iterator first,
             temp_match.set_second(first);
             m.maybe_assign(temp_match);
             match_found = true;
-            if((flags & match_any) || ((first == last) && (need_push_match == false)))
+            if(((flags & match_any) && ((first == last) || !(flags & match_all))) || ((first == last) && (need_push_match == false)))
             {
                // either we don't care what we match or we've matched
                // the whole string and can't match anything longer.
@@ -607,7 +607,7 @@ bool query_match_aux(iterator first,
          {
             cur_acc = ((re_repeat*)ptr)->id;
             accumulators[cur_acc] = 0;
-            start_loop[cur_acc] = iterator();
+            start_loop[cur_acc] = first;
          }
 
          cur_acc = ((re_repeat*)ptr)->id;
@@ -648,7 +648,7 @@ bool query_match_aux(iterator first,
                   }
                }
                // move to next item in list:
-               if(first != start_loop[cur_acc])
+               if((first != start_loop[cur_acc]) || !accumulators[cur_acc])
                {
                   ++accumulators[cur_acc];
                   ptr = ptr->next.p;
@@ -703,7 +703,7 @@ bool query_match_aux(iterator first,
          // otherwise see if we can take the repeat:
          if(((unsigned int)accumulators[cur_acc] < ((re_repeat*)ptr)->max)
                && access::can_start(*first, ((re_repeat*)ptr)->_map, mask_take) &&
-               (first != start_loop[cur_acc]))
+               ((first != start_loop[cur_acc]) || !accumulators[cur_acc]))
          {
             // move to next item in list:
             ++accumulators[cur_acc];
@@ -748,7 +748,7 @@ bool query_match_aux(iterator first,
    //
    // if we get to here then we've run out of characters to match against,
    // we could however still have non-character regex items left
-   if(ptr->can_be_null == 0)
+   if((ptr->can_be_null == 0) && ((flags & match_partial) == 0))
       goto failure;
    while(true)
    {
@@ -838,7 +838,7 @@ bool query_match_aux(iterator first,
 
          // see if we can skip the repeat:
          if(((unsigned int)accumulators[cur_acc] >= ((re_repeat*)ptr)->min)
-            && (ptr->can_be_null & mask_skip))
+            && ((ptr->can_be_null & mask_skip) || (flags & match_partial)))
          {
             // don't push failure info, there's no point:
             ptr = ((re_repeat*)ptr)->alt.p;
@@ -847,7 +847,7 @@ bool query_match_aux(iterator first,
 
          // otherwise see if we can take the repeat:
          if(((unsigned int)accumulators[cur_acc] < ((re_repeat*)ptr)->max)
-               && ((ptr->can_be_null & (mask_take | mask_skip)) == (mask_take | mask_skip)))
+               && (((ptr->can_be_null & (mask_take | mask_skip)) == (mask_take | mask_skip))) || (flags & match_partial))
          {
             // move to next item in list:
             ++accumulators[cur_acc];
@@ -870,6 +870,18 @@ bool query_match_aux(iterator first,
 
    failure:
 
+   //
+   // check for possible partial match:
+   //
+   if((flags & match_partial)
+      && !match_found          // no full match already
+      && (base != first)       // some charcters have been consumed
+      && (first == last))      // end of input has been reached
+   {
+      have_partial_match = true;
+      m.maybe_assign(temp_match);
+   }
+
    if(prev_record.empty() == false)
    {
       ptr = prev_record.peek();
@@ -931,7 +943,7 @@ bool query_match_aux(iterator first,
       }
    }
 
-   if(match_found)
+   if(match_found || have_partial_match)
       return true;
 
    // if we get to here then everything has failed
@@ -1118,7 +1130,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
             else
             {
                need_init = false;
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                   {} // dwa 10/20/2000 - warning suppression for MWCW
                if(restart != last)
                   ++restart;
                _skip_and_inc(clines, last_line, first, restart);
@@ -1134,7 +1147,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
       }
       else
       {
-         for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+         for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+             {} // dwa 10/20/2000 - warning suppression for MWCW
          if(restart != last)
             ++restart;
          _skip_and_inc(clines, last_line, first, restart);
@@ -1207,7 +1221,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
                }
                else
                {
-                  for(int k = 0; (restart != first) && (k < j); ++k, --restart);
+                  for(int k = 0; (restart != first) && (k < j); ++k, --restart)
+                      {} // dwa 10/20/2000 - warning suppression for MWCW
                   if(restart != last)
                      ++restart;
                   _skip_and_inc(clines, last_line, first, restart);
@@ -1250,7 +1265,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
                   else
                   {
                      need_init = false;
-                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                         {} // dwa 10/20/2000 - warning suppression for MWCW
                      if(restart != last)
                         ++restart;
                      _skip_and_inc(clines, last_line, first, restart);
@@ -1267,7 +1283,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
             }
             else
             {
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                   {} // dwa 10/20/2000 - warning suppression for MWCW
                if(restart != last)
                   ++restart;
                _skip_and_inc(clines, last_line, first, restart);
@@ -1337,7 +1354,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
                   else
                   {
                      need_init = false;
-                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                         {} // dwa 10/20/2000 - warning suppression for MWCW
                      if(restart != last)
                         ++restart;
                      _skip_and_inc(clines, last_line, first, restart);
@@ -1353,7 +1371,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
             }
             else
             {
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                   {} // dwa 10/20/2000 - warning suppression for MWCW
                if(restart != last)
                   ++restart;
                _skip_and_inc(clines, last_line, first, restart);
@@ -1411,7 +1430,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
                   else
                   {
                      need_init = false;
-                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                         {} // dwa 10/20/2000 - warning suppression for MWCW
                      if(restart != last)
                         ++restart;
                      _skip_and_inc(clines, last_line, first, restart);
@@ -1427,7 +1447,8 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
             }
             else
             {
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart);
+               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
+                   {} // dwa 10/20/2000 - warning suppression for MWCW
                if(restart != last)
                   ++restart;
                _skip_and_inc(clines, last_line, first, restart);
@@ -1517,6 +1538,7 @@ bool regex_match(iterator first, iterator last, match_results<iterator, Allocato
       m.set_base(first);
       m.set_line(1, first);
    }
+   flags |= match_all; // must match all of input.
    re_detail::_priv_match_data<iterator, Allocator> pd(m);
    iterator restart;
    bool result = re_detail::query_match_aux(first, last, m, e, flags, pd, &restart);
@@ -1528,7 +1550,7 @@ template <class iterator, class charT, class traits, class Allocator2>
 bool regex_match(iterator first, iterator last, const reg_expression<charT, traits, Allocator2>& e, unsigned flags = match_default)
 {
    match_results<iterator> m;
-   return regex_match(first, last, e, flags);
+   return regex_match(first, last, m, e, flags);
 }
 //
 // query_match convenience interfaces:
@@ -1794,3 +1816,4 @@ inline unsigned int regex_grep(bool (*foo)(const match_results<std::basic_string
 
 
 
+

include/boost/re_detail/regex_options.hpp

@@ -2,61 +2,61 @@
 #ifndef BOOST_RE_OPT_H
 #define BOOST_RE_OPT_H
 
-#undef BOOST_RE_AUTO_CONFIGURE
+/* #define BOOST_RE_AUTO_CONFIGURE */
 #ifdef BOOST_RE_AUTO_CONFIGURE
 
 /* Compiler options: */
 
 /* BOOST_NO_STDC_NAMESPACE         C library not in namespace std */
-#undef BOOST_NO_STDC_NAMESPACE
+/* #define BOOST_NO_STDC_NAMESPACE */
 
 /* BOOST_RE_NO_MUTABLE             Disables use of mutable keyword. */
-#undef BOOST_RE_NO_MUTABLE
+/* #define BOOST_RE_NO_MUTABLE */
 
 /* BOOST_RE_INT32_LONG            If 32-bit integers are long */
-#undef BOOST_RE_INT32_LONG
+/* #define BOOST_RE_INT32_LONG */
 
 /* BOOST_RE_NO_TEMPLATE_FRIEND     If template friend declarations are not supported */
-#undef BOOST_RE_NO_TEMPLATE_FRIEND
+/* #define BOOST_RE_NO_TEMPLATE_FRIEND */
 
 /* BOOST_RE_PLATFORM_WINDOWS       Platform is MS Windows. */
-#undef BOOST_RE_PLATFORM_WINDOWS
+/* #define BOOST_RE_PLATFORM_WINDOWS */
 
 /* BOOST_RE_PLATFORM_DOS           Platform if MSDOS. */
-#undef BOOST_RE_PLATFORM_DOS
+/* #define BOOST_RE_PLATFORM_DOS */
 
 /* BOOST_RE_PLATFORM_W32           Platform is MS Win32 */
-#undef BOOST_RE_PLATFORM_W32
+/* #define BOOST_RE_PLATFORM_W32 */
 
 /* BOOST_RE_NO_W32               Disable Win32 support even when present */
-#undef BOOST_RE_NO_W32
+/* #define BOOST_RE_NO_W32 */
 
 /* BOOST_RE_NO_BOOL                If bool is not a distict type. */
-#undef BOOST_RE_NO_BOOL
+/* #define BOOST_RE_NO_BOOL */
 
 /* BOOST_RE_NO_WCHAR_H             If there is no <wchar.h> */
-#undef BOOST_RE_NO_WCHAR_H
+/* #define BOOST_RE_NO_WCHAR_H */
 
 /* BOOST_RE_NO_WCTYPE_H            If there is no <wctype.h> */
-#undef BOOST_RE_NO_WCTYPE_H
+/* #define BOOST_RE_NO_WCTYPE_H */
 
 /* BOOST_RE_NO_WCSTRING            If there are no wcslen and wcsncmp functions available. */
-#undef BOOST_RE_NO_WCSTRING
+/* #define BOOST_RE_NO_WCSTRING */
 
 /* BOOST_RE_NO_SWPRINTF            If there is no swprintf available. */
-#undef BOOST_RE_NO_SWPRINTF
+/* #define BOOST_RE_NO_SWPRINTF */
 
 /* BOOST_RE_NO_WSPRINTF            If there is no wsprintf available. */
-#undef BOOST_RE_NO_WSPRINTF
+/* #define BOOST_RE_NO_WSPRINTF */
 
 /* BOOST_RE_NO_MEMBER_TEMPLATES    If member function templates or nested template classes are not allowed. */
-#undef BOOST_RE_NO_MEMBER_TEMPLATES
+/* #define BOOST_RE_NO_MEMBER_TEMPLATES */
 
 /* BOOST_RE_NO_TEMPLATE_RETURNS    If template functions based on return type are not supported. */
-#undef BOOST_RE_NO_TEMPLATE_RETURNS
+/* #define BOOST_RE_NO_TEMPLATE_RETURNS */
 
 /* BOOST_RE_NO_PARTIAL_FUNC_SPEC   If partial template function specialisation is not supported */
-#undef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+/* #define BOOST_RE_NO_PARTIAL_FUNC_SPEC */
 
 /* BOOST_RE_NO_INT64               If 64bit integers are not supported. */
 /* BOOST_RE_INT64t                 The type of a 64-bit signed integer if available. */
@@ -69,80 +69,80 @@
                       4 = int64_t
                       5 = long long
                       6 = __int64 */
-#undef BOOST_RE_INT64_T_0
-#undef BOOST_RE_INT64_T_1
-#undef BOOST_RE_INT64_T_2
-#undef BOOST_RE_INT64_T_3
-#undef BOOST_RE_INT64_T_4
-#undef BOOST_RE_INT64_T_5
-#undef BOOST_RE_INT64_T_6
+/* #define BOOST_RE_INT64_T_0 */
+/* #define BOOST_RE_INT64_T_1 */
+/* #define BOOST_RE_INT64_T_2 */
+/* #define BOOST_RE_INT64_T_3 */
+/* #define BOOST_RE_INT64_T_4 */
+/* #define BOOST_RE_INT64_T_5 */
+/* #define BOOST_RE_INT64_T_6 */
 
 /* BOOST_RE_NO_CAT                 Define if the compiler does not support POSIX style
                              message categories (catopen catgets catclose). */
-#undef BOOST_RE_NO_CAT
+/* #define BOOST_RE_NO_CAT */
 
 /* BOOST_RE_THREADS                Define if the compiler supports multiple threads in
                              the current translation mode. */
-#undef BOOST_RE_THREADS
+/* #define BOOST_RE_THREADS */
 
 /* BOOST_RE_NESTED_TEMPLATE_DECL   Defaults to template, the standard prefix when accessing
                              nested template classes, can be redefined to nothing if
                              the compiler does not support this. */
-#undef BOOST_RE_NESTED_TEMPLATE_DECL
+/* #define BOOST_RE_NESTED_TEMPLATE_DECL */
 
 /* BOOST_RE_NO_TEMPLATE_INST       If explicit template instantiation with the "template class X<T>"
                              syntax is not supported */
-#undef BOOST_RE_NO_TEMPLATE_INST
+/* #define BOOST_RE_NO_TEMPLATE_INST */
 
 /* BOOST_RE_NO_TEMPLATE_MERGE      If template in separate translation units don't merge at link time */
-#undef BOOST_RE_NO_TEMPLATE_MERGE
+/* #define BOOST_RE_NO_TEMPLATE_MERGE */
 
 /* BOOST_RE_NO_TEMPLATE_MERGE_A    If template merging from library archives is not supported */
-#undef BOOST_RE_NO_TEMPLATE_MERGE_A
+/* #define BOOST_RE_NO_TEMPLATE_MERGE_A */
 
 /* BOOST_RE_NO_TEMPLATE_SWITCH_MERGE If merging of templates containing switch statements is not supported */
-#undef BOOST_RE_NO_TEMPLATE_SWITCH_MERGE
+/* #define BOOST_RE_NO_TEMPLATE_SWITCH_MERGE */
 
 /* BOOST_RE_CALL                   Optionally define a calling convention for C++ functions */
-#undef BOOST_RE_CALL
+/* #define BOOST_RE_CALL */
 
 /* BOOST_RE_CCALL                  Optionally define a calling convention for C functions */
-#undef BOOST_RE_CCALL
+/* #define BOOST_RE_CCALL */
 
 /* BOOST_RE_SIZEOF_SHORT           sizeof(short) */
-#undef BOOST_RE_SIZEOF_SHORT
+/* #define BOOST_RE_SIZEOF_SHORT */
 
 /* BOOST_RE_SIZEOF_INT             sizeof(int) */
-#undef BOOST_RE_SIZEOF_INT
+/* #define BOOST_RE_SIZEOF_INT */
 
 /* BOOST_RE_SIZEOF_LONG            sizeof(long) */
-#undef BOOST_RE_SIZEOF_LONG
+/* #define BOOST_RE_SIZEOF_LONG */
 
 /* BOOST_RE_SIZEOF_WCHAR_T         sizeof(wchar_t) */
-#undef BOOST_RE_SIZEOF_WCHAR_T
+/* #define BOOST_RE_SIZEOF_WCHAR_T */
 
 
 /* STL options: */
 
 /* BOOST_RE_NO_EXCEPTION_H         Define if you do not a compliant <exception>
                              header file. */
-#undef BOOST_RE_NO_EXCEPTION_H
+/* #define BOOST_RE_NO_EXCEPTION_H */
 
 /* BOOST_RE_NO_ITERATOR_H          Define if you do not have a version of <iterator>. */
-#undef BOOST_RE_NO_ITERATOR_H
+/* #define BOOST_RE_NO_ITERATOR_H */
 
 /* BOOST_RE_NO_MEMORY_H            Define if <memory> does not fully comply with the
                              latest standard, and is not auto-recognised,
                              that means nested template classes
                              which hardly any compilers support at present. */
-#undef BOOST_RE_NO_MEMORY_H
+/* #define BOOST_RE_NO_MEMORY_H */
 
 /* BOOST_RE_NO_LOCALE_H            Define if there is no verion of the standard
                              <locale> header available. */
-#undef BOOST_RE_NO_LOCALE_H
+/* #define BOOST_RE_NO_LOCALE_H */
 
 /* BOOST_RE_NO_STL                 Disables the use of any supporting STL code. */
-#undef BOOST_RE_NO_STL
+/* #define BOOST_RE_NO_STL */
 
 /* BOOST_RE_NO_NOT_EQUAL           Disables the generation of operator!= if this
                              clashes with the STL version. */
@@ -150,39 +150,39 @@
 /* BOOST_RE_NO_STRING_DEF_ARGS     Define if std::basic_string<charT> not allowed - in
                              other words if the template is missing its required
                       default arguments. */
-#undef BOOST_RE_NO_STRING_DEF_ARGS
+/* #define BOOST_RE_NO_STRING_DEF_ARGS */
 
 /* BOOST_RE_USE_ALGO               If <algo.h> not <algorithm> is present */
-#undef BOOST_RE_USE_ALGO
+/* #define BOOST_RE_USE_ALGO */
 
 /* BOOST_RE_OLD_IOSTREAM           If the new iostreamm classes are not available */
-#undef BOOST_RE_OLD_IOSTREAM
+/* #define BOOST_RE_OLD_IOSTREAM */
 
 /* BOOST_RE_DISTANCE_T             For std::distance:
                              0 = NA
                       1 = std::distance(i, j, n)
                       2 = n = std::distance(i, j) */
-#undef BOOST_RE_DISTANCE_T_0
-#undef BOOST_RE_DISTANCE_T_1
-#undef BOOST_RE_DISTANCE_T_2
+/* #define BOOST_RE_DISTANCE_T_0 */
+/* #define BOOST_RE_DISTANCE_T_1 */
+/* #define BOOST_RE_DISTANCE_T_2 */
 
 /* BOOST_RE_ITERATOR_T             Defines generic standard iterator type if available, use this as
                              a shortcut to define all the other iterator types.
                              1 = std::iterator<std::tag_type, T, D, T*, T&>
                       2 = std::iterator<std::tag_type, T, D> */
-#undef BOOST_RE_ITERATOR_T_0
-#undef BOOST_RE_ITERATOR_T_1
-#undef BOOST_RE_ITERATOR_T_2
+/* #define BOOST_RE_ITERATOR_T_0 */
+/* #define BOOST_RE_ITERATOR_T_1 */
+/* #define BOOST_RE_ITERATOR_T_2 */
 
 /* BOOST_RE_OI_T                   For output iterators:
                              0 = NA
                       1 = std::iterator<std::output_iterator_tag, T, D, T*, T&>
                       2 = std::iterator<std::output_iterator_tag, T, D>
                       3 = std::output_iterator */
-#undef BOOST_RE_OI_T_0
-#undef BOOST_RE_OI_T_1
-#undef BOOST_RE_OI_T_2
-#undef BOOST_RE_OI_T_3
+/* #define BOOST_RE_OI_T_0 */
+/* #define BOOST_RE_OI_T_1 */
+/* #define BOOST_RE_OI_T_2 */
+/* #define BOOST_RE_OI_T_3 */
 
 /* BOOST_RE_II_T                   For input iterators:
                              0 = NA
@@ -190,11 +190,11 @@
                       2 = std::iterator<std::input_iterator_tag, T, D>
                       3 = std::input_iterator<T, D>
                       4 = std::input_iterator<T> */
-#undef BOOST_RE_II_T_0
-#undef BOOST_RE_II_T_1
-#undef BOOST_RE_II_T_2
-#undef BOOST_RE_II_T_3
-#undef BOOST_RE_II_T_4
+/* #define BOOST_RE_II_T_0 */
+/* #define BOOST_RE_II_T_1 */
+/* #define BOOST_RE_II_T_2 */
+/* #define BOOST_RE_II_T_3 */
+/* #define BOOST_RE_II_T_4 */
 
 
 /* BOOST_RE_FI_T                   For forward iterators:
@@ -202,34 +202,34 @@
                       1 = std::iterator<std::forward_iterator_tag, T, D, T*, T&>
                       2 = std::iterator<std::forward_iterator_tag, T, D>
                       3 = std::forward_iterator<T, D> */
-#undef BOOST_RE_FI_T_0
-#undef BOOST_RE_FI_T_1
-#undef BOOST_RE_FI_T_2
-#undef BOOST_RE_FI_T_3
+/* #define BOOST_RE_FI_T_0 */
+/* #define BOOST_RE_FI_T_1 */
+/* #define BOOST_RE_FI_T_2 */
+/* #define BOOST_RE_FI_T_3 */
 
 /* BOOST_RE_BI_T                   For bidirectional iterators:
                              0 = NA
                       1 = std::iterator<std::bidirectional_iterator_tag, T, D, T*, T&>
                       2 = std::iterator<std::bidirectional_iterator_tag, T, D>
                       3 = std::bidirectional_iterator<T, D> */
-#undef BOOST_RE_BI_T_0
-#undef BOOST_RE_BI_T_1
-#undef BOOST_RE_BI_T_2
-#undef BOOST_RE_BI_T_3
+/* #define BOOST_RE_BI_T_0 */
+/* #define BOOST_RE_BI_T_1 */
+/* #define BOOST_RE_BI_T_2 */
+/* #define BOOST_RE_BI_T_3 */
 
 /* BOOST_RE_RI_T                   For random access iterators:
                              0 = NA
                              1 = std::iterator<std::random_access_iterator_tag, T, D, T*, T&>
                       2 = std::iterator<std::random_access_iterator_tag, T, D>
                       3 = std::random_access_iterator<T, D> */
-#undef BOOST_RE_RI_T_0
-#undef BOOST_RE_RI_T_1
-#undef BOOST_RE_RI_T_2
-#undef BOOST_RE_RI_T_3
+/* #define BOOST_RE_RI_T_0 */
+/* #define BOOST_RE_RI_T_1 */
+/* #define BOOST_RE_RI_T_2 */
+/* #define BOOST_RE_RI_T_3 */
 
 /* BOOST_RE_NO_OI_ASSIGN           If output iterators ostream_iterator<>, back_insert_iterator<> and 
                              front_insert_iterator<> do not have assignment operators */
-#undef BOOST_RE_NO_OI_ASSIGN
+/* #define BOOST_RE_NO_OI_ASSIGN */
 
 
 #ifdef BOOST_RE_INT64_T_0

include/boost/re_detail/regex_raw_buffer.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_raw_buffer.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Raw character buffer for regex code.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
@@ -120,7 +120,7 @@ private:
       typename alloc_inst_type::pointer last;
       alloc_data(const Allocator& a) : alloc_inst_type(a){}
    } alloc_inst;
-   raw_storage<Allocator>::pointer start, end;
+   pointer start, end;
 public:
 
    raw_storage(const Allocator& a = Allocator());

include/boost/re_detail/regex_split.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_split.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Implements regex_split and associated functions.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
@@ -71,7 +71,7 @@ bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
       // output sub-expressions only:
       for(unsigned i = 1; i < what.size(); ++i)
       {
-         (*p_out) = static_cast<string_type>(what[i]);
+         *(*p_out) = static_cast<string_type>(what[i]);
          ++(*p_out);
          return --*p_max;
       }
@@ -82,7 +82,7 @@ bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
       const sub_match<iterator_type>& sub = what[-1];
       if((sub.first != sub.second) || (*p_max != initial_max))
       {
-         (*p_out) = static_cast<string_type>(sub);
+         *(*p_out) = static_cast<string_type>(sub);
          ++(*p_out);
          return --*p_max;
       }
@@ -115,9 +115,10 @@ std::size_t regex_split(OutputIterator out,
    // than whitespace:
    if(max_split && (last != s.end()) && (e.mark_count() == 1))
    {
-      out = std::basic_string<charT, Traits1, Alloc1>((ci_t)last, (ci_t)s.end());
+      *out = std::basic_string<charT, Traits1, Alloc1>((ci_t)last, (ci_t)s.end());
       ++out;
       last = s.end();
+      --max_split;
    }
    //
    // delete from the string everything that has been processed so far:

include/boost/re_detail/regex_stack.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_stack.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Implements customised internal regex stacks.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
@@ -72,7 +72,7 @@ private:
    };
 
    data alloc_inst;
-   mutable node* stack;
+   mutable node* m_stack;
    mutable node* unused;
    node base;
    size_type block_size;
@@ -96,51 +96,51 @@ public:
 
    bool BOOST_RE_CALL empty()
    {
-      return (stack->start == stack->end) && (stack->next == 0);
+      return (m_stack->start == m_stack->end) && (m_stack->next == 0);
    }
 
    bool BOOST_RE_CALL good()
    {
-      return (stack->start != stack->end) || (stack->next != 0);
+      return (m_stack->start != m_stack->end) || (m_stack->next != 0);
    }
 
    T& BOOST_RE_CALL peek()
    {
-      if(stack->start == stack->end)
+      if(m_stack->start == m_stack->end)
          pop_aux();
-      return *stack->end;
+      return *m_stack->end;
    }
 
    const T& BOOST_RE_CALL peek()const
    {
-      if(stack->start == stack->end)
+      if(m_stack->start == m_stack->end)
          pop_aux();
-      return *stack->end;
+      return *m_stack->end;
    }
 
    void BOOST_RE_CALL pop()
    {
-      if(stack->start == stack->end)
+      if(m_stack->start == m_stack->end)
          pop_aux();
-      jm_destroy(stack->end);
-      ++(stack->end);
+      jm_destroy(m_stack->end);
+      ++(m_stack->end);
    }
 
    void BOOST_RE_CALL pop(T& t)
    {
-      if(stack->start == stack->end)
+      if(m_stack->start == m_stack->end)
          pop_aux();
-      t = *stack->end;
-      jm_destroy(stack->end);
-      ++(stack->end);
+      t = *m_stack->end;
+      jm_destroy(m_stack->end);
+      ++(m_stack->end);
    }
 
    void BOOST_RE_CALL push(const T& t)
    {
-      if(stack->end == stack->last)
+      if(m_stack->end == m_stack->last)
          push_aux();
-      --(stack->end);
-      jm_construct(stack->end, t);
+      --(m_stack->end);
+      jm_construct(m_stack->end, t);
    }
 
 };
@@ -151,7 +151,7 @@ jstack<T, Allocator>::jstack(size_type n, const Allocator& a)
 {
   unused = 0;
   block_size = n;
-  stack = &base;
+  m_stack = &base;
   base.last = reinterpret_cast<T*>(alloc_inst.buf);
   base.end = base.start = base.last + 16;
   base.next = 0;
@@ -166,14 +166,14 @@ void BOOST_RE_CALL jstack<T, Allocator>::push_aux()
    {
       new_node = unused;
       unused = new_node->next;
-      new_node->next = stack;
-      stack = new_node;
+      new_node->next = m_stack;
+      m_stack = new_node;
    }
    else
    {
       new_node = get_node();
-      new_node->next = stack;
-      stack = new_node;
+      new_node->next = m_stack;
+      m_stack = new_node;
    }
 }
 
@@ -182,9 +182,9 @@ void BOOST_RE_CALL jstack<T, Allocator>::pop_aux()const
 {
    // make sure that we have a valid item
    // on TOS:
-   jm_assert(stack->next);
-   register node* p = stack;
-   stack = p->next;
+   jm_assert(m_stack->next);
+   register node* p = m_stack;
+   m_stack = p->next;
    p->next = unused;
    unused = p;
 }
@@ -201,10 +201,10 @@ jstack<T, Allocator>::~jstack()
       unused = unused->next;
       alloc_inst.deallocate((unsigned char*)condemned, sizeof(node) + sizeof(T) * block_size);
    }
-   while(stack != &base)
+   while(m_stack != &base)
    {
-      condemned = stack;
-      stack = stack->next;
+      condemned = m_stack;
+      m_stack = m_stack->next;
       alloc_inst.deallocate((unsigned char*)condemned, sizeof(node) + sizeof(T) * block_size);
    }
 }

include/boost/re_detail/regex_synch.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_synch.hpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Thread synchronisation for regex code.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.

include/boost/regex.h

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex.h
-  *   VERSION      3.00
+  *   VERSION      3.02
   *   DESCRIPTION: Declares POSIX API functions
   */
 
@@ -54,6 +54,11 @@ using boost::REG_ASSERT;
 using boost::REG_INVARG;
 using boost::REG_ATOI;
 using boost::REG_ITOA;
+
+using boost::REG_NOTBOL;
+using boost::REG_NOTEOL;
+using boost::REG_STARTEND;
+
 using boost::reg_comp_flags;
 using boost::reg_exec_flags;
 using boost::regcompA;
@@ -93,3 +98,4 @@ using boost::reg_errcode_t;
 #endif // __cplusplus
 
 #endif // BOOST_RE_REGEX_H
+

include/boost/regex.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex.cpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Declares boost::reg_expression<> and associated
   *                functions and classes. This header is the main
   *                entry point for the template regex code.
@@ -741,7 +741,7 @@ struct sub_match
       }
       return result;
    }
-   #ifndef BOOST_OLD_REGEX_H
+   #ifdef BOOST_OLD_REGEX_H
    //
    // the following are deprecated, do not use!!
    //
@@ -774,7 +774,7 @@ struct sub_match
    }
 };
 
-#ifndef BOOST_OLD_REGEX_H
+#ifdef BOOST_OLD_REGEX_H
 namespace re_detail{
 template <class iterator, class charT>
 int do_toi(iterator i, iterator j, char c, int radix)
@@ -849,16 +849,16 @@ public:
 protected:
    typedef BOOST_RE_MAYBE_TYPENAME REBIND_TYPE(char, Allocator) c_alloc;
    
-   struct reference : public c_alloc
+   struct c_reference : public c_alloc
    {
       unsigned int cmatches;
       unsigned count;
       sub_match<iterator> head, tail, null;
       unsigned int lines;
       iterator line_pos, base;
-      reference(const Allocator& a) : c_alloc(a) {  }
+      c_reference(const Allocator& a) : c_alloc(a) {  }
 
-      bool operator==(const reference& that)const
+      bool operator==(const c_reference& that)const
       {
          return (cmatches == that.cmatches) &&
                   (count == that.count) &&
@@ -867,11 +867,11 @@ protected:
                   (lines == that.lines) &&
                   (base == that.base);
       }
-      bool operator!=(const reference& that)const
+      bool operator!=(const c_reference& that)const
       { return !(*this == that); }
    };
 
-   reference* ref;
+   c_reference* ref;
 
    void BOOST_RE_CALL cow();
 
@@ -898,13 +898,14 @@ public:
 
    size_type BOOST_RE_CALL size()const
    {
-      return (*this)[0].matched ? ref->cmatches : 0;
+      //return (*this)[0].matched ? ref->cmatches : 0;
+      return ref->cmatches;
    }
 
    const sub_match<iterator>& BOOST_RE_CALL operator[](int n) const
    {
       if((n >= 0) && ((unsigned int)n < ref->cmatches))
-         return *(sub_match<iterator>*)((char*)ref + sizeof(reference) + sizeof(sub_match<iterator>)*n);
+         return *(sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>)*n);
       return (n == -1) ? ref->head : (n == -2) ? ref->tail : ref->null;
    }
 
@@ -956,7 +957,7 @@ public:
 
    void swap(match_results_base& that)
    {
-      reference* t = that.ref;
+      c_reference* t = that.ref;
       that.ref = ref;
       ref = t;
    }
@@ -987,8 +988,8 @@ public:
    void BOOST_RE_CALL set_second(iterator i, size_t pos)
    {
       cow();
-      ((sub_match<iterator>*)((char*)ref + sizeof(reference) + sizeof(sub_match<iterator>) * pos))->second = i;
-      ((sub_match<iterator>*)((char*)ref + sizeof(reference) + sizeof(sub_match<iterator>) * pos))->matched = true;
+      ((sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>) * pos))->second = i;
+      ((sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>) * pos))->matched = true;
       if(pos == 0)
       {
          ref->tail.first = i;
@@ -1032,7 +1033,7 @@ template <class iterator, class Allocator>
 void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_first(iterator i, size_t pos)
 {
    cow();
-   ((sub_match<iterator>*)((char*)ref + sizeof(reference) + sizeof(sub_match<iterator>) * pos))->first = i;
+   ((sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>) * pos))->first = i;
    if(pos == 0)
    {
       ref->head.second = i;
@@ -1056,10 +1057,10 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_first(iterator i
 template <class iterator, class Allocator>
 match_results_base<iterator, Allocator>::match_results_base(const Allocator& a)
 {
-   ref = (reference*)c_alloc(a).allocate(sizeof(sub_match<iterator>) + sizeof(reference));
+   ref = (c_reference*)c_alloc(a).allocate(sizeof(sub_match<iterator>) + sizeof(c_reference));
    try
    {
-      new (ref) reference(a);
+      new (ref) c_reference(a);
       ref->cmatches = 1;
       ref->count = 1;
       // construct the sub_match<iterator>:
@@ -1075,7 +1076,7 @@ match_results_base<iterator, Allocator>::match_results_base(const Allocator& a)
    }
    catch(...)
    { 
-      c_alloc(a).deallocate((char*)(void*)ref, sizeof(sub_match<iterator>) + sizeof(reference)); 
+      c_alloc(a).deallocate((char*)(void*)ref, sizeof(sub_match<iterator>) + sizeof(c_reference)); 
       throw; 
    }
 }
@@ -1114,7 +1115,7 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::free()
          ++p1;
       }
       jm_destroy(ref);
-      a.deallocate((char*)(void*)ref, sizeof(sub_match<iterator>) * ref->cmatches + sizeof(reference));
+      a.deallocate((char*)(void*)ref, sizeof(sub_match<iterator>) * ref->cmatches + sizeof(c_reference));
    }
 }
 
@@ -1141,10 +1142,10 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_size(size_type n
 {
    if(ref->cmatches != n)
    {
-      reference* newref = (reference*)ref->allocate(sizeof(sub_match<iterator>) * n + sizeof(reference));
+      c_reference* newref = (c_reference*)ref->allocate(sizeof(sub_match<iterator>) * n + sizeof(c_reference));
       try
       {
-         new (newref) reference(*ref);
+         new (newref) c_reference(*ref);
          newref->count = 1;
          newref->cmatches = n;
          sub_match<iterator>* p1, *p2;
@@ -1174,7 +1175,7 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_size(size_type n
       }
       catch(...)
       { 
-         ref->deallocate((char*)(void*)newref, sizeof(sub_match<iterator>) * n + sizeof(reference)); 
+         ref->deallocate((char*)(void*)newref, sizeof(sub_match<iterator>) * n + sizeof(c_reference)); 
          throw; 
       }
    }
@@ -1185,9 +1186,9 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_size(size_type n
 {
    if(ref->cmatches != n)
    {
-      reference* newref = (reference*)ref->allocate(sizeof(sub_match<iterator>) * n + sizeof(reference));;
+      c_reference* newref = (c_reference*)ref->allocate(sizeof(sub_match<iterator>) * n + sizeof(c_reference));;
       try{
-         new (newref) reference(*ref);
+         new (newref) c_reference(*ref);
          newref->count = 1;
          newref->cmatches = n;
          sub_match<iterator>* p1 = (sub_match<iterator>*)(newref+1);
@@ -1216,7 +1217,7 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_size(size_type n
       }
       catch(...)
       { 
-         ref->deallocate((char*)(void*)newref, sizeof(sub_match<iterator>) * n + sizeof(reference)); 
+         ref->deallocate((char*)(void*)newref, sizeof(sub_match<iterator>) * n + sizeof(c_reference)); 
          throw; 
       }
    }
@@ -1291,9 +1292,9 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::cow()
 {
    if(ref->count > 1)
    {
-      reference* newref = (reference*)ref->allocate(sizeof(sub_match<iterator>) * ref->cmatches + sizeof(reference));
+      c_reference* newref = (c_reference*)ref->allocate(sizeof(sub_match<iterator>) * ref->cmatches + sizeof(c_reference));
       try{
-         new (newref) reference(*ref);
+         new (newref) c_reference(*ref);
          newref->count = 1;
          sub_match<iterator>* p1 = (sub_match<iterator>*)(newref+1);
          sub_match<iterator>* p2 = p1 + newref->cmatches;
@@ -1322,7 +1323,7 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::cow()
       }
       catch(...)
       { 
-         ref->deallocate((char*)(void*)newref, sizeof(sub_match<iterator>) * ref->cmatches + sizeof(reference)); 
+         ref->deallocate((char*)(void*)newref, sizeof(sub_match<iterator>) * ref->cmatches + sizeof(c_reference)); 
          throw; 
       }
    }
@@ -1369,11 +1370,11 @@ match_results<iterator, Allocator>::match_results(const match_results<iterator,
    : re_detail::match_results_base<iterator, Allocator>(false)
 {
    this->ref =
-      reinterpret_cast<typename re_detail::match_results_base<iterator, Allocator>::reference *>
+      reinterpret_cast<typename re_detail::match_results_base<iterator, Allocator>::c_reference *>
          (m.ref->allocate(sizeof(sub_match<iterator>) * m.ref->cmatches +
-                          sizeof(typename re_detail::match_results_base<iterator, Allocator>::reference)));
+                          sizeof(typename re_detail::match_results_base<iterator, Allocator>::c_reference)));
    try{
-      new (this->ref) typename re_detail::match_results_base<iterator, Allocator>::reference(*m.ref);
+      new (this->ref) typename re_detail::match_results_base<iterator, Allocator>::c_reference(*m.ref);
       this->ref->count = 1;
       sub_match<iterator>* p1 = (sub_match<iterator>*)(this->ref+1);
       sub_match<iterator>* p2 = p1 + this->ref->cmatches;
@@ -1400,7 +1401,7 @@ match_results<iterator, Allocator>::match_results(const match_results<iterator,
    }
    catch(...)
    { 
-      m.ref->deallocate((char*)(void*)this->ref, sizeof(sub_match<iterator>) * m.ref->cmatches + sizeof(typename re_detail::match_results_base<iterator, Allocator>::reference));
+      m.ref->deallocate((char*)(void*)this->ref, sizeof(sub_match<iterator>) * m.ref->cmatches + sizeof(typename re_detail::match_results_base<iterator, Allocator>::c_reference));
       throw; 
    }
 }

include/boost/regex_traits.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex.cpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Declares regular expression traits classes.
   */
 
@@ -149,6 +149,11 @@ public:
    };
    static std::string set_message_catalogue(const std::string& s);
 protected:
+#if defined(__MWERKS__) && __MWERKS__ <= 0x6000
+   friend class c_regex_traits<char>;
+   friend class c_regex_traits<wchar_t>;
+#endif 
+
    static char regex_message_catalogue[200];
    enum syntax_map_size
    {
@@ -174,6 +179,7 @@ public:
 template<>
 class BOOST_RE_IX_DECL c_regex_traits<char> : public re_detail::c_traits_base
 {
+   typedef re_detail::c_traits_base base_type;
 public:
    typedef char char_type;
    typedef unsigned char uchar_type;
@@ -258,6 +264,7 @@ private:
 template<>
 class BOOST_RE_IX_DECL c_regex_traits<wchar_t> : public re_detail::c_traits_base
 {
+   typedef re_detail::c_traits_base base_type;
 public:
    typedef wchar_t char_type;
    typedef unsigned short uchar_type;
@@ -379,6 +386,7 @@ class w32_regex_traits;
 template<>
 class BOOST_RE_IX_DECL w32_regex_traits<char> : public re_detail::w32_traits_base
 {
+   typedef re_detail::w32_traits_base base_type;
 public:
    typedef char char_type;
    typedef unsigned char uchar_type;
@@ -453,6 +461,7 @@ private:
 template<>
 class BOOST_RE_IX_DECL w32_regex_traits<wchar_t> : public re_detail::w32_traits_base
 {
+   typedef re_detail::w32_traits_base base_type;
 public:
    typedef wchar_t char_type;
    typedef unsigned short uchar_type;
@@ -578,6 +587,7 @@ class cpp_regex_traits;
 template<>
 class BOOST_RE_IX_DECL cpp_regex_traits<char> : public re_detail::cpp_regex_traits_base
 {
+   typedef re_detail::cpp_regex_traits_base base_type;
 private:
    re_detail::message_data<char>* pmd;
    const unsigned char* psyntax;
@@ -662,6 +672,7 @@ public:
 template<>
 class BOOST_RE_IX_DECL cpp_regex_traits<wchar_t> : public re_detail::cpp_regex_traits_base
 {
+   typedef re_detail::cpp_regex_traits_base base_type;
 public:
    typedef wchar_t char_type;
    typedef unsigned short uchar_type;

index.htm

@@ -17,12 +17,13 @@ content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
 
 <table border="0" cellpadding="7" cellspacing="0" width="100%">
     <tr>
-        <td valign="top" width="50%"><h3><img src="../../c++boost.gif"
-        alt="C++ Boost" width="277" height="86"></h3>
+        <td valign="top" width="50%"><h3><img
+        src="../../c++boost.gif" alt="C++ Boost" width="277"
+        height="86"></h3>
         </td>
         <td valign="top" width="50%"><h3 align="center">Regex++,
         Index.</h3>
-        <p><i>(version 3.01, 18 April 2000)</i> </p>
+        <p><i>(version 3.02, 18 April 2000)</i> </p>
         <pre><i>Copyright (c) 1998-2000
 Dr John Maddock
 
@@ -56,8 +57,7 @@ It is provided &quot;as is&quot; without express or implied warranty.</i></pre>
             </li>
             <li>Class <a
                 href="template_class_ref.htm#regex_char_traits">char_regex_traits</a></li>
-            <li>Class <a
-                href="template_class_ref.htm#match_results">match_results</a>
+            <li>Class <a href="template_class_ref.htm#reg_match">match_results</a>
             </li>
             <li>Algorithm <a
                 href="template_class_ref.htm#query_match">regex_match</a>
@@ -136,4 +136,3 @@ It is provided &quot;as is&quot; without express or implied warranty.</i></pre>
 John Maddock</i></a><i> 1998-2000 all rights reserved.</i> </p>
 </body>
 </html>
-

introduction.htm

@@ -1,29 +1,21 @@
-<html>
+<HTML>
+<HEAD>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=windows-1252">
+<META NAME="Generator" CONTENT="Microsoft Word 97">
+<TITLE>regex++, Introduction</TITLE>
+<META NAME="keywords" CONTENT="regex++, regular expressions, regular expression library, C++">
+<META NAME="Template" CONTENT="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
+</HEAD>
+<BODY LINK="#0000ff" VLINK="#800080" BGCOLOR="#ffffff">
 
-<head>
-<meta http-equiv="Content-Type"
-content="text/html; charset=iso-8859-1">
-<meta name="keywords"
-content="regex++, regular expressions, regular expression library, C++">
-<meta name="Template"
-content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
-<meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
-<title>regex++, Introduction</title>
-</head>
-
-<body bgcolor="#FFFFFF" link="#0000FF" vlink="#800080">
-
-<p>&nbsp; </p>
-
-<table border="0" cellpadding="7" cellspacing="0" width="100%">
-    <tr>
-        <td valign="top" width="50%"><h3><img src="../../c++boost.gif"
-        alt="C++ Boost" width="277" height="86"></h3>
-        </td>
-        <td valign="top" width="50%"><h3 align="center">Regex++,
-        Introduction.</h3>
-        <p><i>(version 3.01, 18 April 2000)</i> </p>
-        <pre><i>Copyright (c) 1998-2000
+<P>&nbsp; </P>
+<TABLE CELLSPACING=0 BORDER=0 CELLPADDING=7 WIDTH=624>
+<TR><TD WIDTH="50%" VALIGN="TOP">
+<H3><IMG SRC="../../c++boost.gif" WIDTH=276 HEIGHT=86 ALT="C++ Boost"></H3></TD>
+<TD WIDTH="50%" VALIGN="TOP">
+<H3 ALIGN="CENTER">Regex++, Introduction.</H3>
+<I><P>(version 3.02, 18 April 2000)</I> </P>
+<I><PRE>Copyright (c) 1998-2000
 Dr John Maddock
 
 Permission to use, copy, modify, distribute and sell this software
@@ -32,393 +24,123 @@ provided that the above copyright notice appear in all copies and
 that both that copyright notice and this permission notice appear
 in supporting documentation.&nbsp; Dr John Maddock makes no representations
 about the suitability of this software for any purpose.&nbsp;&nbsp;
-It is provided &quot;as is&quot; without express or implied warranty.</i></pre>
-        </td>
-    </tr>
-</table>
+It is provided "as is" without express or implied warranty.</PRE></I></TD>
+</TR>
+</TABLE>
 
-<hr>
+<P><HR></P>
+<I><H3><A NAME="intro"></A>Introduction</H3>
+</I><P>Regular expressions are a form of pattern-matching that are often used in text processing; many users will be familiar with the Unix utilities <I>grep</I>, <I>sed</I> and <I>awk</I>, and the programming language <I>perl</I>, each of which make extensive use of regular expressions. Traditionally C++ users have been limited to the POSIX C API's for manipulating regular expressions, and while regex++ does provide these API's, they do not represent the best way to use the library. For example regex++ can cope with wide character strings, or search and replace operations (in a manner analogous to either sed or perl), something that traditional C libraries can not do.</P>
+<P>The class <A HREF="template_class_ref.htm#reg_expression">boost::reg_expression</A> is the key class in this library; it represents a "machine readable" regular expression, and is very closely modelled on std::basic_string, think of it as a string plus the actual state-machine required by the regular expression algorithms. Like std::basic_string there are two typedefs that are almost always the means by which this class is referenced:</P>
+<B><PRE>namespace </B>boost{
 
-<h3><a name="intro"></a><i>Introduction</i></h3>
+<B>template</B> &lt;<B>class</B> charT, 
+<B>          class</B> traits = regex_traits&lt;charT&gt;, 
+          <B>class</B> Allocator = std::allocator&lt;charT&gt; &gt;
+<B>class</B> reg_expression;
 
-<p>Regular expressions are a form of pattern-matching that are
-often used in text processing; many users will be familiar with
-the Unix utilities <i>grep</i>, <i>sed</i> and <i>awk</i>, and
-the programming language <i>perl</i>, each of which make
-extensive use of regular expressions. Traditionally C++ users
-have been limited to the POSIX C API's for manipulating regular
-expressions, and while regex++ does provide these API's, they do
-not represent the best way to use the library. For example regex++
-can cope with wide character strings, or search and replace
-operations (in a manner analogous to either sed or perl),
-something that traditional C libraries can not do.</p>
+<B>typedef</B> reg_expression&lt;<B>char</B>&gt; regex;
+<B>typedef</B> reg_expression&lt;<B>wchar_t&gt;</B> wregex;
 
-<p>The class <a href="template_class_ref.htm#reg_expression">boost::reg_expression</a>
-is the key class in this library; it represents a &quot;machine
-readable&quot; regular expression, and is very closely modelled
-on std::basic_string, think of it as a string plus the actual
-state-machine required by the regular expression algorithms. Like
-std::basic_string there are two typedefs that are almost always
-the means by which this class is referenced:</p>
-
-<pre><b>namespace </b>boost{
-
-<b>template</b> &lt;<b>class</b> charT, <b>
-          class</b> traits = regex_traits&lt;charT&gt;, 
-          <b>class</b> Allocator = std::allocator&lt;charT&gt; &gt;
-<b>class</b> reg_expression;
-
-<b>typedef</b> reg_expression&lt;<b>char</b>&gt; regex;
-<b>typedef</b> reg_expression&lt;<b>wchar_t&gt;</b> wregex;
-
-}</pre>
-
-<p>To see how this library can be used, imagine that we are
-writing a credit card processing application. Credit card numbers
-generally come as a string of 16-digits, separated into groups of
-4-digits, and separated by either a space or a hyphen. Before
-storing a credit card number in a database (not necessarily
-something your customers will appreciate!), we may want to verify
-that the number is in the correct format. To match any digit we
-could use the regular expression [0-9], however ranges of
-characters like this are actually locale dependent. Instead we
-should use the POSIX standard form [[:digit:]], or the regex++
-and perl shorthand for this \d (note that many older libraries
-tended to be hard-coded to the C-locale, consequently this was
-not an issue for them). That leaves us with the following regular
-expression to validate credit card number formats:</p>
-
-<p>(\d{4}[- ]){3}\d</p>
-
-<p>Here the parenthesis act to group (and mark for future
-reference) sub-expressions, and the {4} means &quot;repeat
-exactly 4 times&quot;. This is an example of the extended regular
-expression syntax used by perl, awk and egrep. Regex++ also
-supports the older &quot;basic&quot; syntax used by sed and grep,
-but this is generally less useful, unless you already have some
-basic regular expressions that you need to reuse.</p>
-
-<p>Now lets take that expression and place it in some C++ code to
-validate the format of a credit card number:</p>
-
-<pre><b>bool</b> validate_card_format(<b>const</b> std::string s)
+}</PRE>
+<P>To see how this library can be used, imagine that we are writing a credit card processing application. Credit card numbers generally come as a string of 16-digits, separated into groups of 4-digits, and separated by either a space or a hyphen. Before storing a credit card number in a database (not necessarily something your customers will appreciate!), we may want to verify that the number is in the correct format. To match any digit we could use the regular expression [0-9], however ranges of characters like this are actually locale dependent. Instead we should use the POSIX standard form [[:digit:]], or the regex++ and perl shorthand for this \d (note that many older libraries tended to be hard-coded to the C-locale, consequently this was not an issue for them). That leaves us with the following regular expression to validate credit card number formats:</P>
+<P>(\d{4}[- ]){3}\d</P>
+<P>Here the parenthesis act to group (and mark for future reference) sub-expressions, and the {4} means "repeat exactly 4 times". This is an example of the extended regular expression syntax used by perl, awk and egrep. Regex++ also supports the older "basic" syntax used by sed and grep, but this is generally less useful, unless you already have some basic regular expressions that you need to reuse.</P>
+<P>Now lets take that expression and place it in some C++ code to validate the format of a credit card number:</P>
+<B><PRE>bool</B> validate_card_format(<B>const</B> std::string s)
 {
-   <b>static</b> <b>const</b> <a
-href="template_class_ref.htm#reg_expression">boost::regex</a> e(&quot;(\\d{4}[- ]){3}\\d{4}&quot;);
-   <b>return</b> <a href="template_class_ref.htm#query_match">regex_match</a>(s, e);
-}</pre>
+   <B>static</B> <B>const</B> <A HREF="template_class_ref.htm#reg_expression">boost::regex</A> e("(\\d{4}[- ]){3}\\d{4}");
+   <B>return</B> <A HREF="template_class_ref.htm#query_match">regex_match</A>(s, e);
+}</PRE>
+<P>Note how we had to add some extra escapes to the expression: remember that the escape is seen once by the C++ compiler, before it gets to be seen by the regular expression engine, consequently escapes in regular expressions have to be doubled up when embedding them in C/C++ code.</P>
+<P>Those of you who are familiar with credit card processing, will have realised that while the format used above is suitable for human readable card numbers, it does not represent the format required by online credit card systems; these require the number as a string of 16 (or possibly 15) digits, without any intervening spaces. What we need is a means to convert easily between the two formats, and this is where search and replace comes in. Those who are familiar with the utilities <I>sed</I> and <I>perl</I> will already be ahead here; we need two strings - one a regular expression - the other a "<A HREF="format_string.htm">format string</A>" that provides a description of the text to replace the match with. In regex++ this search and replace operation is performed with the algorithm regex_merge, for our credit card example we can write two algorithms like this to provide the format conversions:</P>
+<PRE>
+<I>// match any format with the regular expression:
+</I><B>const</B> boost::regex e("\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z");
+<B>const</B> std::string machine_format("\\1\\2\\3\\4");
+<B>const</B> std::string human_format("\\1-\\2-\\3-\\4");
 
-<p>Note how we had to add some extra escapes to the expression:
-remember that the escape is seen once by the C++ compiler, before
-it gets to be seen by the regular expression engine, consequently
-escapes in regular expressions have to be doubled up when
-embedding them in C/C++ code.</p>
-
-<p>Those of you who are familiar with credit card processing,
-will have realised that while the format used above is suitable
-for human readable card numbers, it does not represent the format
-required by online credit card systems; these require the number
-as a string of 16 (or possibly 15) digits, without any
-intervening spaces. What we need is a means to convert easily
-between the two formats, and this is where search and replace
-comes in. Those who are familiar with the utilities <i>sed</i>
-and <i>perl</i> will already be ahead here; we need two strings -
-one a regular expression - the other a &quot;<a
-href="format_string.htm">format string</a>&quot; that provides a
-description of the text to replace the match with. In regex++
-this search and replace operation is performed with the algorithm
-regex_merge, for our credit card example we can write two
-algorithms like this to provide the format conversions:</p>
-
-<pre>
-<i>// match any format with the regular expression:</i>
-<b>const</b> boost::regex e(&quot;\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z&quot;);
-<b>const</b> std::string machine_format(&quot;\\1\\2\\3\\4&quot;);
-<b>const</b> std::string human_format(&quot;\\1-\\2-\\3-\\4&quot;);
-
-std::string machine_readable_card_number(<b>const</b> std::string s)
+std::string machine_readable_card_number(<B>const</B> std::string s)
 {
-   <b>return</b> <a href="template_class_ref.htm#reg_merge">regex_merge</a>(s, e, machine_format, boost::match_default | boost::format_sed);
+   <B>return</B> <A HREF="template_class_ref.htm#reg_merge">regex_merge</A>(s, e, machine_format, boost::match_default | boost::format_sed);
 }
 
-std::string human_readable_card_number(<b>const</b> std::string s)
+std::string human_readable_card_number(<B>const</B> std::string s)
 {
-   <b>return</b> <a href="template_class_ref.htm#reg_merge">regex_merge</a>(s, e, human_format, boost::match_default | boost::format_sed);
-}</pre>
+   <B>return</B> <A HREF="template_class_ref.htm#reg_merge">regex_merge</A>(s, e, human_format, boost::match_default | boost::format_sed);
+}</PRE>
+<P>Here we've used marked sub-expressions in the regular expression to split out the four parts of the card number as separate fields, the format string then uses the sed-like syntax to replace the matched text with the reformatted version.</P>
+<P>In the examples above, we haven't directly manipulated the results of a regular expression match, however in general the result of a match contains a number of sub-expression matches in addition to the overall match. When the library needs to report a regular expression match it does so using an instance of the class <A HREF="template_class_ref.htm#reg_match">match_results</A>, as before there are typedefs of this class for the two most common cases: </P>
+<B><PRE>namespace </B>boost{
+<B>typedef</B> match_results&lt;<B>const</B> <B>char</B>*&gt; cmatch;
+<B>typedef</B> match_results&lt;<B>const</B> <B>wchar_t</B>*&gt; wcmatch;
+}</PRE>
+<P>The algorithms <A HREF="template_class_ref.htm#reg_search">regex_search</A> and <A HREF="template_class_ref.htm#reg_grep">regex_grep</A> (i.e. finding all matches in a string) make use of match_results to report what matched.</P>
+<P>Note that these algorithms are not restricted to searching regular C-strings, any bidirectional iterator type can be searched, allowing for the possibility of seamlessly searching almost any kind of data. </P>
+<P>For search and replace operations in addition to the algorithm <A HREF="template_class_ref.htm#reg_merge">regex_merge</A> that we have already seen, the algorithm <A HREF="template_class_ref.htm#reg_format">regex_format</A> takes the result of a match and a format string, and produces a new string by merging the two.</P>
+<P>For those that dislike templates, there is a high level wrapper class RegEx that is an encapsulation of the lower level template code - it provides a simplified interface for those that don't need the full power of the library, and supports only narrow characters, and the "extended" regular expression syntax. </P>
+<P>The <A HREF="posix_ref.htm#posix">POSIX API</A> functions: regcomp, regexec, regfree and regerror, are available in both narrow character and Unicode versions, and are provided for those who need compatibility with these API's. </P>
+<P>Finally, note that the library now has run-time <A HREF="appendix.htm#localisation">localization</A> support, and recognizes the full POSIX regular expression syntax - including advanced features like multi-character collating elements and equivalence classes - as well as providing compatibility with other regular expression libraries including GNU and BSD4 regex packages, and to a more limited extent perl 5. </P>
+<I><H3><A NAME="Installation"></A>Installation and Configuration Options</I> </H3>
+<EM><P>[ </EM><I><STRONG>Important</I></STRONG><EM>: If you are upgrading from version 3.02x of this library then you will find a number of changes to the documented header names and library interfaces, existing code should still compile unchanged however - see </EM><A HREF="appendix.htm#upgrade"><FONT COLOR="#0000ff"><EM>Note for Upgraders</FONT></EM></A><EM>. ]</P>
+</EM><P>When you extract the library from its zip file, you must preserve its internal directory structure (for example by using the -d option when extracting). If you didn't do that when extracting, then you'd better stop reading this, delete the files you just extracted, and try again! </P>
+<P>Currently the library will automatically detect and configure itself for Borland, Microsoft and gcc compilers only. The library will also detect the HP, SGI, Rogue Wave, or Microsoft STL implementations. If the STL type is detected, then the library will attempt to extract suitable compiler configuration options from the STL used. Otherwise the library will assume that the compiler is fully compliant with the C++ standard: unless various options are defined to depreciate features not implemented by your compiler. These options are documented in &lt;boost/re_detail/regex_options.hpp&gt;, if you want to add permanent configuration options add them to &lt;boost/re_detail/regex_options.hpp&gt; which is provided for this purpose - this will allow you to keep your configuration options between library versions by retaining &lt;boost/re_detail/regex_options.hpp&gt;. </P>
+<P>The library will encase all code inside namespace boost. </P>
+<P>Unlike some other template libraries, this library consists of a mixture of template code (in the headers) and static code and data (in cpp files). Consequently it is necessary to build the library's support code into a library or archive file before you can use it, instructions for specific platforms are as follows: </P>
+<B><P>Borland C++ Builder:</B> </P>
 
-<p>Here we've used marked sub-expressions in the regular
-expression to split out the four parts of the card number as
-separate fields, the format string then uses the sed-like syntax
-to replace the matched text with the reformatted version.</p>
-
-<p>In the examples above, we haven't directly manipulated the
-results of a regular expression match, however in general the
-result of a match contains a number of sub-expression matches in
-addition to the overall match. When the library needs to report a
-regular expression match it does so using an instance of the
-class <a href="template_class_ref.htm#reg_match">match_results</a>,
-as before there are typedefs of this class for the two most
-common cases: </p>
-
-<pre><b>namespace </b>boost{
-<b>typedef</b> match_results&lt;<b>const</b> <b>char</b>*&gt; cmatch;
-<b>typedef</b> match_results&lt;<b>const</b> <b>wchar_t</b>*&gt; wcmatch;
-}</pre>
-
-<p>The algorithms <a href="template_class_ref.htm#reg_search">regex_search</a>
-and <a href="template_class_ref.htm#reg_grep">regex_grep</a> (i.e.
-finding all matches in a string) make use of match_results to
-report what matched.</p>
-
-<p>Note that these algorithms are not restricted to searching
-regular C-strings, any bidirectional iterator type can be
-searched, allowing for the possibility of seamlessly searching
-almost any kind of data. </p>
-
-<p>For search and replace operations in addition to the algorithm
-<a href="template_class_ref.htm#reg_merge">regex_merge</a> that
-we have already seen, the algorithm <a
-href="template_class_ref.htm#reg_format">regex_format</a> takes
-the result of a match and a format string, and produces a new
-string by merging the two.</p>
-
-<p>For those that dislike templates, there is a high level
-wrapper class RegEx that is an encapsulation of the lower level
-template code - it provides a simplified interface for those that
-don't need the full power of the library, and supports only
-narrow characters, and the &quot;extended&quot; regular
-expression syntax. </p>
-
-<p>The <a href="posix_ref.htm#posix">POSIX API</a> functions:
-regcomp, regexec, regfree and regerror, are available in both
-narrow character and Unicode versions, and are provided for those
-who need compatibility with these API's. </p>
-
-<p>Finally, note that the library now has run-time <a
-href="appendix.htm#localisation">localization</a> support, and
-recognizes the full POSIX regular expression syntax - including
-advanced features like multi-character collating elements and
-equivalence classes - as well as providing compatibility with
-other regular expression libraries including GNU and BSD4 regex
-packages, and to a more limited extent perl 5. </p>
-
-<h3><a name="Installation"></a><i>Installation and Configuration
-Options</i> </h3>
-
-<p><em>[ </em><em><strong>Important</strong></em><em>: If you are
-upgrading from version 2.x of this library then you will find a
-number of changes to the documented header names and library
-interfaces, existing code should still compile unchanged however
-- see </em><a href="appendix.htm#upgrade"><em>Note for Upgraders</em></a><em>.
-]</em></p>
-
-<p>When you extract the library from its zip file, you must
-preserve its internal directory structure (for example by using
-the -d option when extracting). If you didn't do that when
-extracting, then you'd better stop reading this, delete the files
-you just extracted, and try again! </p>
-
-<p>Currently the library will automatically detect and configure
-itself for Borland, Microsoft and gcc compilers only. The library
-will also detect the HP, SGI, Rogue Wave, or Microsoft STL
-implementations. If the STL type is detected, then the library
-will attempt to extract suitable compiler configuration options
-from the STL used. Otherwise the library will assume that the
-compiler is fully compliant with the C++ standard: unless various
-options are defined to depreciate features not implemented by
-your compiler. These options are documented in &lt;boost/re_detail/regex_options.hpp&gt;,
-if you want to add permanent configuration options add them to
-&lt;boost/re_detail/regex_options.hpp&gt; which is provided for
-this purpose - this will allow you to keep your configuration
-options between library versions by retaining &lt;boost/re_detail/regex_options.hpp&gt;.
-</p>
-
-<p>The library will encase all code inside namespace boost. </p>
-
-<p>Unlike some other template libraries, this library consists of
-a mixture of template code (in the headers) and static code and
-data (in cpp files). Consequently it is necessary to build the
-library's support code into a library or archive file before you
-can use it, instructions for specific platforms are as follows: </p>
-
-<p><b>Borland C++ Builder:</b> </p>
-
-<ul>
-    <li>Open up a console window and change to the &lt;boost&gt;\libs\regex\lib
-        directory.</li>
-    <li>Select the appropriate makefile (bcb4.mak for C++ Builder
-        4, bcb5.mak for C++ Builder 5, and bcc55.mak for the 5.5
-        command line tools).</li>
-    <li>Invoke the makefile (pass the full path to your version
-        of make if you have more than one version installed, the
-        makefile relies on the path to make to obtain your C++
-        Builder installation directory and tools) for example:</li>
-</ul>
-
-<pre>make -fbcb5.mak</pre>
-
-<p>The build process will build a variety of .lib and .dll files
-(the exact number depends upon the version of Borland's tools you
-are using) the .lib and dll files will be in a sub-directory
-called bcb4 or bcb5 depending upon the makefile used. To install
-the libraries into your development system use:</p>
-
-<p>make -fbcb5.mak install</p>
-
-<p>library files will be copied to &lt;BCROOT&gt;/lib and the dll's
-to &lt;BCROOT&gt;/bin, where &lt;BCROOT&gt; corresponds to the
-install path of your Borland C++ tools. </p>
-
-<p>You may also remove tempory files created during the build
-process (excluding lib and dll files) by using:</p>
-
-<p>make -fbcb5.mak clean</p>
-
-<p>Finally when you use regex++ it is only necessary for you to
-add the &lt;boost&gt; root director to your list of include
-directories for that project. It is not necessary for you to
-manually add a .lib file to the project; the headers will
-automatically select the correct .lib file for your build mode
-and tell the linker to include it. There is one caveat however:
-the library can not tell the difference between VCL and non-VCL
-enabled builds when building a GUI application from the command
-line, if you build from the command line with the 5.5 command
-line tools then you must define the pre-processor symbol _NO_VCL
-in order to ensure that the correct link libraries are selected:
-the C++ Builder IDE normally sets this automatically. Hint, users
-of the 5.5 command line tools may want to add a -D_NO_VCL to bcc32.cfg
-in order to set this option permanently. <br>
-&nbsp; <br>
-&nbsp; </p>
-
-<p><b>Microsoft Visual C++ 6</b> </p>
-
-<p>You need version 6 of MSVC to build this library. If you are
-using VC5 then you may want to look at one of the previous
-releases of this <a
-href="http://ourworld.compuserve.com/homepages/john_maddock/regexpp.htm">library</a>
-</p>
-
-<p>Open up a command prompt, which has the necessary MSVC
-environment variables defined (for example by using the batch
-file Vcvars32.bat installed by the Visual Studio installation),
-and change to the &lt;boost&gt;\libs\regex\lib directory. </p>
-
-<p>Select the correct makefile - vc6.mak for &quot;vanilla&quot;
-Visual C++ 6 or vc6-stlport.mak if you are using STLPort.</p>
-
-<p>Invoke the makefile like this:</p>
-
-<p>make -fvc6.mak</p>
-
-<p>You will now have a collaction of lib and dll files in a
-&quot;vc6&quot; subdirectory, to install these into your
-development system use:</p>
-
-<p>make -fvc6.mak install</p>
-
-<p>The lib files will be copied to your &lt;VC6&gt;\lib directory
-and the dll files to &lt;VC6&gt;\bin, where &lt;VC6&gt; is the
-root of your Visual C++ 6 installation.</p>
-
-<p>You can delete all the temporary files created during the
-build (excluding lib and dll files) using:</p>
-
-<p>make -fvc6.mak clean </p>
-
-<p>Finally when you use regex++ it is only necessary for you to
-add the &lt;boost&gt; root directory to your list of include
-directories for that project. It is not necessary for you to
-manually add a .lib file to the project; the headers will
-automatically select the correct .lib file for your build mode
-and tell the linker to include it. </p>
-
-<p>Note: if you have replaced the C++ standard library that comes
-with VC6, then when you build the library you must ensure that
-the environment variables &quot;INCLUDE&quot; and &quot;LIB&quot;
-have been updated to reflect the include and library paths for
-the new library - see vcvars32.bat (part of your Visual Studio
-installation) for more details. </p>
-
-<p>If you are building with the full STLPort v4, then use the vc6-stlport.mak
-file provided (The full STLPort libraries appear not to support
-single-thread static builds). <br>
-&nbsp; <br>
-&nbsp; </p>
-
-<p><b>GCC(2.95)</b> </p>
-
-<p>There is a conservative makefile for the g++ compiler. From
-the command prompt change to the &lt;boost&gt;\libs\regex\lib
-directory and type: </p>
-
-<p>make -f gcc.mak </p>
-
-<p>At the end of the build process you should have a gcc sub-directory
-containing release and debug versions of the library (libregex++.a
-and libregex++debug.a). When you build projects that use regex++,
-you will need to add the boost install directory to your list of
-include paths and add &lt;boost&gt;/libs/gcc/regex++ to your list
-of library files. </p>
-
-<p>Otherwise: run configure, this will set up the headers and
-generate makefiles, from the command prompt change to the &lt;boost&gt;\libs\regex
-directory and type: </p>
-
-<pre><tt>configure
-make</tt></pre>
-
-<p>Other make options include: </p>
-
-<p>Make jgrep: builds the jgrep demo. </p>
-
-<p>Make test: builds and runs the regression tests. </p>
-
-<p>Make timer: builds the timer demo program. </p>
-
-<p>Note: gcc2.95.x on Win32 is only supported as cygwin and <b><i>not</i></b>
-mingw32 (sorry but compiler related bugs prevent this). </p>
-
-<p><b>Other compilers:</b> </p>
-
-<p>Run configure, this will set up the headers and generate
-makefiles: from the command prompt change to the &lt;boost&gt;\libs\regex
-directory and type: </p>
-
-<pre><tt>configure
-make</tt></pre>
-
-<p>Other make options include: </p>
-
-<p>Make jgrep: builds the jgrep demo. </p>
-
-<p>Make test: builds and runs the regression tests. </p>
-
-<p>Make timer: builds the timer demo program. </p>
-
-<p><b>Troubleshooting:</b> </p>
-
-<p>If make fails after running configure, you may need to
-manually disable some options: configure uses simple tests to
-determine what features your compiler supports, it does not
-stress the compiler's internals to any degree as the actual regex++
-code can do. Other compiler features may be implemented (and
-therefore detected by configure) but known to be buggy, again in
-this case it may be necessary to disable the feature in order to
-compile regex++ to stable code. The output file from configure is
-&lt;boost&gt;/boost/re_detail/regex_options.hpp, this file lists
-all the macros that can be defined to configure regex++ along
-with a description to illustrate their usage, experiment changing
-options in regex_options.hpp one at a time until you achieve the
-effect you require. If you mail me questions about configure
-output, be sure to include both regex_options.hpp and config.log
-with your message. <br>
-</p>
-
-<hr>
-
-<p><i>Copyright </i><a href="mailto:John_Maddock@compuserve.com"><i>Dr
-John Maddock</i></a><i> 1998-2000 all rights reserved.</i> </p>
-</body>
-</html>
+<UL>
+<LI>Open up a console window and change to the &lt;boost&gt;\libs\regex\lib directory. </LI>
+<LI>Select the appropriate makefile (bcb4.mak for C++ Builder 4, bcb5.mak for C++ Builder 5, and bcc55.mak for the 5.5 command line tools). </LI>
+<LI>Invoke the makefile (pass the full path to your version of make if you have more than one version installed, the makefile relies on the path to make to obtain your C++ Builder installation directory and tools) for example: </LI></UL>
 
+<PRE>make -fbcb5.mak</PRE>
+<P>The build process will build a variety of .lib and .dll files (the exact number depends upon the version of Borland's tools you are using) the .lib and dll files will be in a sub-directory called bcb4 or bcb5 depending upon the makefile used. To install the libraries into your development system use:</P>
+<P>make -fbcb5.mak install</P>
+<P>library files will be copied to &lt;BCROOT&gt;/lib and the dll's to &lt;BCROOT&gt;/bin, where &lt;BCROOT&gt; corresponds to the install path of your Borland C++ tools. </P>
+<P>You may also remove temporary files created during the build process (excluding lib and dll files) by using:</P>
+<P>make -fbcb5.mak clean</P>
+<P>Finally when you use regex++ it is only necessary for you to add the &lt;boost&gt; root director to your list of include directories for that project. It is not necessary for you to manually add a .lib file to the project; the headers will automatically select the correct .lib file for your build mode and tell the linker to include it. There is one caveat however: the library can not tell the difference between VCL and non-VCL enabled builds when building a GUI application from the command line, if you build from the command line with the 5.5 command line tools then you must define the pre-processor symbol _NO_VCL in order to ensure that the correct link libraries are selected: the C++ Builder IDE normally sets this automatically. Hint, users of the 5.5 command line tools may want to add a -D_NO_VCL to bcc32.cfg in order to set this option permanently. <BR>
+&nbsp; <BR>
+&nbsp; </P>
+<B><P>Microsoft Visual C++ 6</B> </P>
+<P>You need version 6 of MSVC to build this library. If you are using VC5 then you may want to look at one of the previous releases of this <A HREF="http://ourworld.compuserve.com/homepages/john_maddock/regexpp.htm">library</A> </P>
+<P>Open up a command prompt, which has the necessary MSVC environment variables defined (for example by using the batch file Vcvars32.bat installed by the Visual Studio installation), and change to the &lt;boost&gt;\libs\regex\lib directory. </P>
+<P>Select the correct makefile - vc6.mak for "vanilla" Visual C++ 6 or vc6-stlport.mak if you are using STLPort.</P>
+<P>Invoke the makefile like this:</P>
+<P>nmake -fvc6.mak</P>
+<P>You will now have a collection of lib and dll files in a "vc6" subdirectory, to install these into your development system use:</P>
+<P>nmake -fvc6.mak install</P>
+<P>The lib files will be copied to your &lt;VC6&gt;\lib directory and the dll files to &lt;VC6&gt;\bin, where &lt;VC6&gt; is the root of your Visual C++ 6 installation.</P>
+<P>You can delete all the temporary files created during the build (excluding lib and dll files) using:</P>
+<P>nmake -fvc6.mak clean </P>
+<P>Finally when you use regex++ it is only necessary for you to add the &lt;boost&gt; root directory to your list of include directories for that project. It is not necessary for you to manually add a .lib file to the project; the headers will automatically select the correct .lib file for your build mode and tell the linker to include it. </P>
+<P>Note: if you have replaced the C++ standard library that comes with VC6, then when you build the library you must ensure that the environment variables "INCLUDE" and "LIB" have been updated to reflect the include and library paths for the new library - see vcvars32.bat (part of your Visual Studio installation) for more details. </P>
+<P>If you are building with the full STLPort v4, then use the vc6-stlport.mak file provided (The full STLPort libraries appear not to support single-thread static builds). <BR>
+&nbsp; <BR>
+&nbsp; </P>
+<B><P>GCC(2.95)</B> </P>
+<P>There is a conservative makefile for the g++ compiler. From the command prompt change to the &lt;boost&gt;/libs/regex/lib directory and type: </P>
+<P>make -fgcc.mak </P>
+<P>At the end of the build process you should have a gcc sub-directory containing release and debug versions of the library (libregex++.a and libregex++debug.a). When you build projects that use regex++, you will need to add the boost install directory to your list of include paths and add &lt;boost&gt;/libs/gcc/regex++ to your list of library files. </P>
+<P>Otherwise: run configure, this will set up the headers and generate makefiles, from the command prompt change to the &lt;boost&gt;/libs/regex directory and type: </P>
+<TT><PRE>configure
+make</PRE>
+</TT><P>Other make options include: </P>
+<P>make jgrep: builds the jgrep demo. </P>
+<P>make test: builds and runs the regression tests. </P>
+<P>make timer: builds the timer demo program. </P>
+<P>Note: gcc2.95.x on Win32 is only supported as cygwin and <B><I>not</B></I> mingw32 (sorry but compiler related bugs prevent this). </P>
+<B><P>Other compilers:</B> </P>
+<P>Run configure, this will set up the headers and generate makefiles: from the command prompt change to the &lt;boost&gt;/libs/regex directory and type: </P>
+<TT><PRE>configure
+make</PRE>
+</TT><P>Other make options include: </P>
+<P>make jgrep: builds the jgrep demo. </P>
+<P>make test: builds and runs the regression tests. </P>
+<P>make timer: builds the timer demo program. </P>
+<B><P>Troubleshooting:</B> </P>
+<P>If make fails after running configure, you may need to manually disable some options: configure uses simple tests to determine what features your compiler supports, it does not stress the compiler's internals to any degree as the actual regex++ code can do. Other compiler features may be implemented (and therefore detected by configure) but known to be buggy, again in this case it may be necessary to disable the feature in order to compile regex++ to stable code. The output file from configure is &lt;boost&gt;/boost/re_detail/regex_options.hpp, this file lists all the macros that can be defined to configure regex++ along with a description to illustrate their usage, experiment changing options in regex_options.hpp one at a time until you achieve the effect you require. If you mail me questions about configure output, be sure to include both regex_options.hpp and config.log with your message. </P>
+<P><HR></P>
+<I><P>Copyright </I><A HREF="mailto:John_Maddock@compuserve.com"><I>Dr John Maddock</I></A><I> 1998-2000 all rights reserved.</I> </P></BODY>
+</HTML>

lib/bc55.mak

@@ -52,57 +52,57 @@ bcb5 :
 ########################################################
 bcb5\bcb5re300\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300 : 
@@ -126,57 +126,57 @@ bcb5\bcb5re300.lib : bcb5\bcb5re300\c_regex_traits.obj bcb5\bcb5re300\c_regex_tr
 ########################################################
 bcb5\bcb5re300m\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300m\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300m\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300m\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300m\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300m\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300m\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300m\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300m\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300m\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300m\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300m : 
@@ -200,57 +200,57 @@ bcb5\bcb5re300m.lib : bcb5\bcb5re300m\c_regex_traits.obj bcb5\bcb5re300m\c_regex
 ########################################################
 bcb5\bcb5re300lm\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300lm\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300lm\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300lm\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300lm\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300lm\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300lm\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300lm\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300lm :
@@ -267,7 +267,7 @@ bcb5\bcb5re300lm.lib : bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_re
 	bcc32 @&&|
 -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300lm.dll  bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_regex_traits_common.obj bcb5\bcb5re300lm\cpp_regex_traits.obj bcb5\bcb5re300lm\cregex.obj bcb5\bcb5re300lm\fileiter.obj bcb5\bcb5re300lm\posix_api.obj bcb5\bcb5re300lm\regex.obj bcb5\bcb5re300lm\regex_debug.obj bcb5\bcb5re300lm\regex_synch.obj bcb5\bcb5re300lm\w32_regex_traits.obj bcb5\bcb5re300lm\wide_posix_api.obj $(XLFLAGS)
 |
-	implib bcb5\bcb5re300lm.lib -c bcb5\bcb5re300lm.dll
+	implib -c bcb5\bcb5re300lm.lib bcb5\bcb5re300lm.dll
 
 ########################################################
 #
@@ -276,57 +276,57 @@ bcb5\bcb5re300lm.lib : bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_re
 ########################################################
 bcb5\bcb5re300l\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300l\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300l\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300l\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300l\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300l\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300l\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300l\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300l :
@@ -343,5 +343,5 @@ bcb5\bcb5re300l.lib : bcb5\bcb5re300l\c_regex_traits.obj bcb5\bcb5re300l\c_regex
 	bcc32 @&&|
 -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300l.dll  bcb5\bcb5re300l\c_regex_traits.obj bcb5\bcb5re300l\c_regex_traits_common.obj bcb5\bcb5re300l\cpp_regex_traits.obj bcb5\bcb5re300l\cregex.obj bcb5\bcb5re300l\fileiter.obj bcb5\bcb5re300l\posix_api.obj bcb5\bcb5re300l\regex.obj bcb5\bcb5re300l\regex_debug.obj bcb5\bcb5re300l\regex_synch.obj bcb5\bcb5re300l\w32_regex_traits.obj bcb5\bcb5re300l\wide_posix_api.obj $(XLFLAGS)
 |
-	implib bcb5\bcb5re300l.lib -c bcb5\bcb5re300l.dll
+	implib -c bcb5\bcb5re300l.lib bcb5\bcb5re300l.dll
 

lib/bcb4.mak

@@ -55,57 +55,57 @@ bcb4 :
 ########################################################
 bcb4\bcb4re300\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb4\bcb4re300\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb4\bcb4re300\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb4\bcb4re300\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\cregex.obj ../src/cregex.cpp
 |
 
 bcb4\bcb4re300\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb4\bcb4re300\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb4\bcb4re300\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\regex.obj ../src/regex.cpp
 |
 
 bcb4\bcb4re300\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb4\bcb4re300\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb4\bcb4re300\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb4\bcb4re300\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb4\bcb4re300 : 
@@ -129,57 +129,57 @@ bcb4\bcb4re300.lib : bcb4\bcb4re300\c_regex_traits.obj bcb4\bcb4re300\c_regex_tr
 ########################################################
 bcb4\bcb4re300m\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb4\bcb4re300m\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb4\bcb4re300m\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb4\bcb4re300m\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\cregex.obj ../src/cregex.cpp
 |
 
 bcb4\bcb4re300m\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb4\bcb4re300m\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb4\bcb4re300m\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\regex.obj ../src/regex.cpp
 |
 
 bcb4\bcb4re300m\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb4\bcb4re300m\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb4\bcb4re300m\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb4\bcb4re300m\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300m\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb4\bcb4re300m : 
@@ -203,57 +203,57 @@ bcb4\bcb4re300m.lib : bcb4\bcb4re300m\c_regex_traits.obj bcb4\bcb4re300m\c_regex
 ########################################################
 bcb4\bcb4re300v\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb4\bcb4re300v\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb4\bcb4re300v\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb4\bcb4re300v\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\cregex.obj ../src/cregex.cpp
 |
 
 bcb4\bcb4re300v\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb4\bcb4re300v\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb4\bcb4re300v\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\regex.obj ../src/regex.cpp
 |
 
 bcb4\bcb4re300v\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb4\bcb4re300v\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb4\bcb4re300v\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb4\bcb4re300v\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb4\bcb4re300v\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb4\bcb4re300v : 
@@ -277,57 +277,57 @@ bcb4\bcb4re300v.lib : bcb4\bcb4re300v\c_regex_traits.obj bcb4\bcb4re300v\c_regex
 ########################################################
 bcb4\bcb4re300lv\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb4\bcb4re300lv\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb4\bcb4re300lv\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb4\bcb4re300lv\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\cregex.obj ../src/cregex.cpp
 |
 
 bcb4\bcb4re300lv\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb4\bcb4re300lv\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb4\bcb4re300lv\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\regex.obj ../src/regex.cpp
 |
 
 bcb4\bcb4re300lv\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb4\bcb4re300lv\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb4\bcb4re300lv\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb4\bcb4re300lv\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lv\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb4\bcb4re300lv :
@@ -344,7 +344,7 @@ bcb4\bcb4re300lv.lib : bcb4\bcb4re300lv\c_regex_traits.obj bcb4\bcb4re300lv\c_re
 	bcc32 @&&|
 -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb4\bcb4re300lv.dll  bcb4\bcb4re300lv\c_regex_traits.obj bcb4\bcb4re300lv\c_regex_traits_common.obj bcb4\bcb4re300lv\cpp_regex_traits.obj bcb4\bcb4re300lv\cregex.obj bcb4\bcb4re300lv\fileiter.obj bcb4\bcb4re300lv\posix_api.obj bcb4\bcb4re300lv\regex.obj bcb4\bcb4re300lv\regex_debug.obj bcb4\bcb4re300lv\regex_synch.obj bcb4\bcb4re300lv\w32_regex_traits.obj bcb4\bcb4re300lv\wide_posix_api.obj $(XLFLAGS)
 |
-	implib bcb4\bcb4re300lv.lib -c bcb4\bcb4re300lv.dll
+	implib -c bcb4\bcb4re300lv.lib bcb4\bcb4re300lv.dll
 
 ########################################################
 #
@@ -353,57 +353,57 @@ bcb4\bcb4re300lv.lib : bcb4\bcb4re300lv\c_regex_traits.obj bcb4\bcb4re300lv\c_re
 ########################################################
 bcb4\bcb4re300lm\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb4\bcb4re300lm\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb4\bcb4re300lm\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb4\bcb4re300lm\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\cregex.obj ../src/cregex.cpp
 |
 
 bcb4\bcb4re300lm\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb4\bcb4re300lm\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb4\bcb4re300lm\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\regex.obj ../src/regex.cpp
 |
 
 bcb4\bcb4re300lm\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb4\bcb4re300lm\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb4\bcb4re300lm\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb4\bcb4re300lm\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb4\bcb4re300lm :
@@ -420,7 +420,7 @@ bcb4\bcb4re300lm.lib : bcb4\bcb4re300lm\c_regex_traits.obj bcb4\bcb4re300lm\c_re
 	bcc32 @&&|
 -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb4\bcb4re300lm.dll  bcb4\bcb4re300lm\c_regex_traits.obj bcb4\bcb4re300lm\c_regex_traits_common.obj bcb4\bcb4re300lm\cpp_regex_traits.obj bcb4\bcb4re300lm\cregex.obj bcb4\bcb4re300lm\fileiter.obj bcb4\bcb4re300lm\posix_api.obj bcb4\bcb4re300lm\regex.obj bcb4\bcb4re300lm\regex_debug.obj bcb4\bcb4re300lm\regex_synch.obj bcb4\bcb4re300lm\w32_regex_traits.obj bcb4\bcb4re300lm\wide_posix_api.obj $(XLFLAGS)
 |
-	implib bcb4\bcb4re300lm.lib -c bcb4\bcb4re300lm.dll
+	implib -c bcb4\bcb4re300lm.lib bcb4\bcb4re300lm.dll
 
 ########################################################
 #
@@ -429,57 +429,57 @@ bcb4\bcb4re300lm.lib : bcb4\bcb4re300lm\c_regex_traits.obj bcb4\bcb4re300lm\c_re
 ########################################################
 bcb4\bcb4re300l\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb4\bcb4re300l\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb4\bcb4re300l\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb4\bcb4re300l\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\cregex.obj ../src/cregex.cpp
 |
 
 bcb4\bcb4re300l\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb4\bcb4re300l\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb4\bcb4re300l\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\regex.obj ../src/regex.cpp
 |
 
 bcb4\bcb4re300l\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb4\bcb4re300l\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb4\bcb4re300l\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb4\bcb4re300l\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb4\bcb4re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb4\bcb4re300l :
@@ -496,5 +496,5 @@ bcb4\bcb4re300l.lib : bcb4\bcb4re300l\c_regex_traits.obj bcb4\bcb4re300l\c_regex
 	bcc32 @&&|
 -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb4\bcb4re300l.dll  bcb4\bcb4re300l\c_regex_traits.obj bcb4\bcb4re300l\c_regex_traits_common.obj bcb4\bcb4re300l\cpp_regex_traits.obj bcb4\bcb4re300l\cregex.obj bcb4\bcb4re300l\fileiter.obj bcb4\bcb4re300l\posix_api.obj bcb4\bcb4re300l\regex.obj bcb4\bcb4re300l\regex_debug.obj bcb4\bcb4re300l\regex_synch.obj bcb4\bcb4re300l\w32_regex_traits.obj bcb4\bcb4re300l\wide_posix_api.obj $(XLFLAGS)
 |
-	implib bcb4\bcb4re300l.lib -c bcb4\bcb4re300l.dll
+	implib -c bcb4\bcb4re300l.lib bcb4\bcb4re300l.dll
 

lib/bcb5.mak

@@ -55,57 +55,57 @@ bcb5 :
 ########################################################
 bcb5\bcb5re300\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -tWM- -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300 : 
@@ -129,57 +129,57 @@ bcb5\bcb5re300.lib : bcb5\bcb5re300\c_regex_traits.obj bcb5\bcb5re300\c_regex_tr
 ########################################################
 bcb5\bcb5re300m\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300m\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300m\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300m\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300m\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300m\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300m\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300m\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300m\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300m\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300m\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -tWM -D_NO_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300m\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300m : 
@@ -203,57 +203,57 @@ bcb5\bcb5re300m.lib : bcb5\bcb5re300m\c_regex_traits.obj bcb5\bcb5re300m\c_regex
 ########################################################
 bcb5\bcb5re300v\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300v\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300v\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300v\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300v\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300v\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300v\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300v\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300v\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300v\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300v\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -tWM -tWV -DJM_USE_VCL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; $(XCFLAGS) -obcb5\bcb5re300v\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300v : 
@@ -277,57 +277,57 @@ bcb5\bcb5re300v.lib : bcb5\bcb5re300v\c_regex_traits.obj bcb5\bcb5re300v\c_regex
 ########################################################
 bcb5\bcb5re300lv\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300lv\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300lv\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300lv\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300lv\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300lv\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300lv\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300lv\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300lv\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300lv\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300lv\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lv\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300lv :
@@ -344,7 +344,7 @@ bcb5\bcb5re300lv.lib : bcb5\bcb5re300lv\c_regex_traits.obj bcb5\bcb5re300lv\c_re
 	bcc32 @&&|
 -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300lv.dll  bcb5\bcb5re300lv\c_regex_traits.obj bcb5\bcb5re300lv\c_regex_traits_common.obj bcb5\bcb5re300lv\cpp_regex_traits.obj bcb5\bcb5re300lv\cregex.obj bcb5\bcb5re300lv\fileiter.obj bcb5\bcb5re300lv\posix_api.obj bcb5\bcb5re300lv\regex.obj bcb5\bcb5re300lv\regex_debug.obj bcb5\bcb5re300lv\regex_synch.obj bcb5\bcb5re300lv\w32_regex_traits.obj bcb5\bcb5re300lv\wide_posix_api.obj $(XLFLAGS)
 |
-	implib bcb5\bcb5re300lv.lib -c bcb5\bcb5re300lv.dll
+	implib -c bcb5\bcb5re300lv.lib bcb5\bcb5re300lv.dll
 
 ########################################################
 #
@@ -353,57 +353,57 @@ bcb5\bcb5re300lv.lib : bcb5\bcb5re300lv\c_regex_traits.obj bcb5\bcb5re300lv\c_re
 ########################################################
 bcb5\bcb5re300lm\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300lm\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300lm\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300lm\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300lm\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300lm\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300lm\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300lm\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300lm :
@@ -420,7 +420,7 @@ bcb5\bcb5re300lm.lib : bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_re
 	bcc32 @&&|
 -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300lm.dll  bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_regex_traits_common.obj bcb5\bcb5re300lm\cpp_regex_traits.obj bcb5\bcb5re300lm\cregex.obj bcb5\bcb5re300lm\fileiter.obj bcb5\bcb5re300lm\posix_api.obj bcb5\bcb5re300lm\regex.obj bcb5\bcb5re300lm\regex_debug.obj bcb5\bcb5re300lm\regex_synch.obj bcb5\bcb5re300lm\w32_regex_traits.obj bcb5\bcb5re300lm\wide_posix_api.obj $(XLFLAGS)
 |
-	implib bcb5\bcb5re300lm.lib -c bcb5\bcb5re300lm.dll
+	implib -c bcb5\bcb5re300lm.lib bcb5\bcb5re300lm.dll
 
 ########################################################
 #
@@ -429,57 +429,57 @@ bcb5\bcb5re300lm.lib : bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_re
 ########################################################
 bcb5\bcb5re300l\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300l\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\cregex.obj ../src/cregex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300l\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\fileiter.obj ../src/fileiter.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300l\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\posix_api.obj ../src/posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300l\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex.obj ../src/regex.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300l\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex_debug.obj ../src/regex_debug.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300l\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex_synch.obj ../src/regex_synch.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300l\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(XCFLAGS) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(XCFLAGS) -obcb5\bcb5re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300l :
@@ -496,5 +496,5 @@ bcb5\bcb5re300l.lib : bcb5\bcb5re300l\c_regex_traits.obj bcb5\bcb5re300l\c_regex
 	bcc32 @&&|
 -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../; -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300l.dll  bcb5\bcb5re300l\c_regex_traits.obj bcb5\bcb5re300l\c_regex_traits_common.obj bcb5\bcb5re300l\cpp_regex_traits.obj bcb5\bcb5re300l\cregex.obj bcb5\bcb5re300l\fileiter.obj bcb5\bcb5re300l\posix_api.obj bcb5\bcb5re300l\regex.obj bcb5\bcb5re300l\regex_debug.obj bcb5\bcb5re300l\regex_synch.obj bcb5\bcb5re300l\w32_regex_traits.obj bcb5\bcb5re300l\wide_posix_api.obj $(XLFLAGS)
 |
-	implib bcb5\bcb5re300l.lib -c bcb5\bcb5re300l.dll
+	implib -c bcb5\bcb5re300l.lib bcb5\bcb5re300l.dll
 

lib/gcc.mak

@@ -9,17 +9,16 @@
 #
 
 #
-# Add additional compiler options here:
+# compiler options for release build:
 #
-XCFLAGS=
+C1=-c -O2 -I../../../
 #
-# add additional linker flags here:
+# compiler options for debug build:
 #
-XLFLAGS=
+C2=-c -g -I../../../
 #
-# add additional static-library creation flags here:
-#
-XSFLAGS=
+# compiler options for link:
+LINK=
 
 
 
@@ -42,37 +41,37 @@ install : all
 #
 ########################################################
 gcc/regex++/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/c_regex_traits.o -c -O2 -I../../../ $(XCFLAGS) ../src/c_regex_traits.cpp
+	g++ -o gcc/regex++/c_regex_traits.o $(C1) $(XCFLAGS) ../src/c_regex_traits.cpp
 
 gcc/regex++/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/c_regex_traits_common.o -c -O2 -I../../../ $(XCFLAGS) ../src/c_regex_traits_common.cpp
+	g++ -o gcc/regex++/c_regex_traits_common.o $(C1) $(XCFLAGS) ../src/c_regex_traits_common.cpp
 
 gcc/regex++/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/cpp_regex_traits.o -c -O2 -I../../../ $(XCFLAGS) ../src/cpp_regex_traits.cpp
+	g++ -o gcc/regex++/cpp_regex_traits.o $(C1) $(XCFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/regex++/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/cregex.o -c -O2 -I../../../ $(XCFLAGS) ../src/cregex.cpp
+	g++ -o gcc/regex++/cregex.o $(C1) $(XCFLAGS) ../src/cregex.cpp
 
 gcc/regex++/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/fileiter.o -c -O2 -I../../../ $(XCFLAGS) ../src/fileiter.cpp
+	g++ -o gcc/regex++/fileiter.o $(C1) $(XCFLAGS) ../src/fileiter.cpp
 
 gcc/regex++/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/posix_api.o -c -O2 -I../../../ $(XCFLAGS) ../src/posix_api.cpp
+	g++ -o gcc/regex++/posix_api.o $(C1) $(XCFLAGS) ../src/posix_api.cpp
 
 gcc/regex++/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/regex.o -c -O2 -I../../../ $(XCFLAGS) ../src/regex.cpp
+	g++ -o gcc/regex++/regex.o $(C1) $(XCFLAGS) ../src/regex.cpp
 
 gcc/regex++/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/regex_debug.o -c -O2 -I../../../ $(XCFLAGS) ../src/regex_debug.cpp
+	g++ -o gcc/regex++/regex_debug.o $(C1) $(XCFLAGS) ../src/regex_debug.cpp
 
 gcc/regex++/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/regex_synch.o -c -O2 -I../../../ $(XCFLAGS) ../src/regex_synch.cpp
+	g++ -o gcc/regex++/regex_synch.o $(C1) $(XCFLAGS) ../src/regex_synch.cpp
 
 gcc/regex++/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/w32_regex_traits.o -c -O2 -I../../../ $(XCFLAGS) ../src/w32_regex_traits.cpp
+	g++ -o gcc/regex++/w32_regex_traits.o $(C1) $(XCFLAGS) ../src/w32_regex_traits.cpp
 
 gcc/regex++/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++/wide_posix_api.o -c -O2 -I../../../ $(XCFLAGS) ../src/wide_posix_api.cpp
+	g++ -o gcc/regex++/wide_posix_api.o $(C1) $(XCFLAGS) ../src/wide_posix_api.cpp
 
 gcc/regex++ : 
 	mkdir -p gcc/regex++
@@ -81,7 +80,7 @@ regex++_clean :
 	rm -f gcc/regex++/*.o
 
 ./gcc/libregex++.a : gcc/regex++/c_regex_traits.o gcc/regex++/c_regex_traits_common.o gcc/regex++/cpp_regex_traits.o gcc/regex++/cregex.o gcc/regex++/fileiter.o gcc/regex++/posix_api.o gcc/regex++/regex.o gcc/regex++/regex_debug.o gcc/regex++/regex_synch.o gcc/regex++/w32_regex_traits.o gcc/regex++/wide_posix_api.o
-	ar -r $(XSFLAGS) gcc/libregex++.a  gcc/regex++/c_regex_traits.o gcc/regex++/c_regex_traits_common.o gcc/regex++/cpp_regex_traits.o gcc/regex++/cregex.o gcc/regex++/fileiter.o gcc/regex++/posix_api.o gcc/regex++/regex.o gcc/regex++/regex_debug.o gcc/regex++/regex_synch.o gcc/regex++/w32_regex_traits.o gcc/regex++/wide_posix_api.o
+	ar -r $(LINK) gcc/libregex++.a  gcc/regex++/c_regex_traits.o gcc/regex++/c_regex_traits_common.o gcc/regex++/cpp_regex_traits.o gcc/regex++/cregex.o gcc/regex++/fileiter.o gcc/regex++/posix_api.o gcc/regex++/regex.o gcc/regex++/regex_debug.o gcc/regex++/regex_synch.o gcc/regex++/w32_regex_traits.o gcc/regex++/wide_posix_api.o
 
 ########################################################
 #
@@ -89,37 +88,37 @@ regex++_clean :
 #
 ########################################################
 gcc/regex++debug/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/c_regex_traits.o -c -I../../../ -g $(XCFLAGS) ../src/c_regex_traits.cpp
+	g++ -o gcc/regex++debug/c_regex_traits.o $(C2) $(XCFLAGS) ../src/c_regex_traits.cpp
 
 gcc/regex++debug/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/c_regex_traits_common.o -c -I../../../ -g $(XCFLAGS) ../src/c_regex_traits_common.cpp
+	g++ -o gcc/regex++debug/c_regex_traits_common.o $(C2) $(XCFLAGS) ../src/c_regex_traits_common.cpp
 
 gcc/regex++debug/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/cpp_regex_traits.o -c -I../../../ -g $(XCFLAGS) ../src/cpp_regex_traits.cpp
+	g++ -o gcc/regex++debug/cpp_regex_traits.o $(C2) $(XCFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/regex++debug/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/cregex.o -c -I../../../ -g $(XCFLAGS) ../src/cregex.cpp
+	g++ -o gcc/regex++debug/cregex.o $(C2) $(XCFLAGS) ../src/cregex.cpp
 
 gcc/regex++debug/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/fileiter.o -c -I../../../ -g $(XCFLAGS) ../src/fileiter.cpp
+	g++ -o gcc/regex++debug/fileiter.o $(C2) $(XCFLAGS) ../src/fileiter.cpp
 
 gcc/regex++debug/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/posix_api.o -c -I../../../ -g $(XCFLAGS) ../src/posix_api.cpp
+	g++ -o gcc/regex++debug/posix_api.o $(C2) $(XCFLAGS) ../src/posix_api.cpp
 
 gcc/regex++debug/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/regex.o -c -I../../../ -g $(XCFLAGS) ../src/regex.cpp
+	g++ -o gcc/regex++debug/regex.o $(C2) $(XCFLAGS) ../src/regex.cpp
 
 gcc/regex++debug/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/regex_debug.o -c -I../../../ -g $(XCFLAGS) ../src/regex_debug.cpp
+	g++ -o gcc/regex++debug/regex_debug.o $(C2) $(XCFLAGS) ../src/regex_debug.cpp
 
 gcc/regex++debug/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/regex_synch.o -c -I../../../ -g $(XCFLAGS) ../src/regex_synch.cpp
+	g++ -o gcc/regex++debug/regex_synch.o $(C2) $(XCFLAGS) ../src/regex_synch.cpp
 
 gcc/regex++debug/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/w32_regex_traits.o -c -I../../../ -g $(XCFLAGS) ../src/w32_regex_traits.cpp
+	g++ -o gcc/regex++debug/w32_regex_traits.o $(C2) $(XCFLAGS) ../src/w32_regex_traits.cpp
 
 gcc/regex++debug/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	g++ -o gcc/regex++debug/wide_posix_api.o -c -I../../../ -g $(XCFLAGS) ../src/wide_posix_api.cpp
+	g++ -o gcc/regex++debug/wide_posix_api.o $(C2) $(XCFLAGS) ../src/wide_posix_api.cpp
 
 gcc/regex++debug : 
 	mkdir -p gcc/regex++debug
@@ -128,5 +127,7 @@ regex++debug_clean :
 	rm -f gcc/regex++debug/*.o
 
 ./gcc/libregex++debug.a : gcc/regex++debug/c_regex_traits.o gcc/regex++debug/c_regex_traits_common.o gcc/regex++debug/cpp_regex_traits.o gcc/regex++debug/cregex.o gcc/regex++debug/fileiter.o gcc/regex++debug/posix_api.o gcc/regex++debug/regex.o gcc/regex++debug/regex_debug.o gcc/regex++debug/regex_synch.o gcc/regex++debug/w32_regex_traits.o gcc/regex++debug/wide_posix_api.o
-	ar -r $(XSFLAGS) gcc/libregex++debug.a  gcc/regex++debug/c_regex_traits.o gcc/regex++debug/c_regex_traits_common.o gcc/regex++debug/cpp_regex_traits.o gcc/regex++debug/cregex.o gcc/regex++debug/fileiter.o gcc/regex++debug/posix_api.o gcc/regex++debug/regex.o gcc/regex++debug/regex_debug.o gcc/regex++debug/regex_synch.o gcc/regex++debug/w32_regex_traits.o gcc/regex++debug/wide_posix_api.o
+	ar -r $(LINK) gcc/libregex++debug.a  gcc/regex++debug/c_regex_traits.o gcc/regex++debug/c_regex_traits_common.o gcc/regex++debug/cpp_regex_traits.o gcc/regex++debug/cregex.o gcc/regex++debug/fileiter.o gcc/regex++debug/posix_api.o gcc/regex++debug/regex.o gcc/regex++debug/regex_debug.o gcc/regex++debug/regex_synch.o gcc/regex++debug/w32_regex_traits.o gcc/regex++debug/wide_posix_api.o
+
+
 

makefile_gen

@@ -223,9 +223,15 @@ EOF
 #
 ###############################################################
 
+gcc_shared="no"
+
 function gcc_gen_lib()
 {
-	all_dep="$all_dep $subdir $subdir/$libname ./$subdir/lib$libname.a"
+          if test "$gcc_shared" == "yes"; then
+		all_dep="$all_dep $subdir $subdir/$libname ./$subdir/lib$libname.so"
+	else
+		all_dep="$all_dep $subdir $subdir/$libname ./$subdir/lib$libname.a"
+	fi
 #
 # set up section comments:
 	cat >> $tout << EOF
@@ -260,8 +266,13 @@ EOF
 	echo "" >> $tout
 #
 #	 now for the main target for this library:
-	echo ./$subdir/lib$libname.a : $all_obj >> $tout
-	echo "	ar -r \$(XSFLAGS) $subdir/lib$libname.a $all_obj" >> $tout
+          if test "$gcc_shared" == "yes"; then
+		echo ./$subdir/lib$libname.so : $all_obj >> $tout
+		echo "	\$(LINKER) \$(LINK) -o $subdir/lib$libname.so $all_obj" >> $tout
+	else
+		echo ./$subdir/lib$libname.a : $all_obj >> $tout
+		echo "	ar -r \$(LINK) $subdir/lib$libname.a $all_obj" >> $tout
+	fi
 	echo "" >> $tout
 }
 
@@ -278,10 +289,10 @@ function gcc_gen()
 	echo > $iout
 
 	libname="regex++"
-	opts="-c -O2 -I../../../"
+	opts="\$(C1)"
 	gcc_gen_lib
 	libname="regex++debug"
-	opts="-c -I../../../ -g"
+	opts="\$(C2)"
 	gcc_gen_lib
 	
 	
@@ -297,17 +308,80 @@ function gcc_gen()
 #
 
 #
-# Add additional compiler options here:
+# compiler options for release build:
 #
-XCFLAGS=
+C1=-c -O2 -I../../../
 #
-# add additional linker flags here:
+# compiler options for debug build:
 #
-XLFLAGS=
+C2=-c -g -I../../../
 #
-# add additional static-library creation flags here:
+# compiler options for link:
+LINK=
+
+
+EOF
+	echo "" >> $out
+	echo "ALL_HEADER=$header" >> $out
+	echo "" >> $out
+	echo "all : $subdir $all_dep" >> $out
+	echo >> $out
+	echo "$subdir :" >> $out
+	echo "	mkdir -p $subdir" >> $out
+	echo >> $out
+	echo "clean : $all_clean" >> $out
+	echo >> $out
+	echo "install : all" >> $out
+	cat $iout >> $out
+	echo >> $out
+	cat $tout >> $out
+}
+
+function gcc_gen_shared()
+{
+	out="lib/gcc-shared.mak"
+	tout="temp"
+	iout="temp_install"
+	subdir="gcc"
+	all_dep=""
+	all_clean=""
+	echo > $out
+	echo > $tout
+	echo > $iout
+
+	libname="regex++"
+	opts="\$(C1)"
+	gcc_gen_lib
+	libname="regex++debug"
+	opts="\$(C2)"
+	gcc_gen_lib
+	
+	
+	cat > $out << EOF
 #
-XSFLAGS=
+# auto generated makefile for gcc compiler
+#
+# usage:
+# make
+#   brings libraries up to date
+# make clean
+#   deletes temporary object files (but not archives).
+#
+
+#
+# compiler options for release build:
+#
+C1=-c -O2 -I../../../ -fPIC
+#
+# compiler options for debug build:
+#
+C2=-c -g -I../../../ -fPIC
+#
+# compiler options for link:
+LINK=-shared
+#
+# Linker to use:
+LINKER=ld
 
 
 EOF
@@ -358,7 +432,7 @@ EOF
 		all_lib_obj="$all_lib_obj +$obj"
 		echo "$obj: $file \$(ALL_HEADER)" >> $tout
 		echo "	bcc32 @&&|" >> $tout
-		echo "-c $opts \$(XCFLAGS) -o$obj $file" >> $tout
+		echo "-c \$(XCFLAGS) $opts \$(XCFLAGS) -o$obj $file" >> $tout
 		echo "|" >> $tout
 		echo "" >> $tout
 	done
@@ -409,7 +483,7 @@ EOF
 		all_obj="$all_obj $obj"
 		echo "$obj: $file \$(ALL_HEADER)" >> $tout
 		echo "	bcc32 @&&|" >> $tout
-		echo "-c $opts \$(XCFLAGS) -o$obj $file" >> $tout
+		echo "-c \$(XCFLAGS) $opts \$(XCFLAGS) -o$obj $file" >> $tout
 		echo "|" >> $tout
 		echo "" >> $tout
 	done
@@ -434,7 +508,7 @@ EOF
 	echo "	bcc32 @&&|" >> $tout
 	echo "$opts -e$subdir\\$libname.dll $all_obj \$(XLFLAGS)" >> $tout
 	echo "|" >> $tout
-	echo "	implib $subdir\\$libname.lib -c $subdir\\$libname.dll" >> $tout
+	echo "	implib -c $subdir\\$libname.lib $subdir\\$libname.dll" >> $tout
 	echo "" >> $tout
 }
 
@@ -577,6 +651,8 @@ vc6_gen
 #
 # generate gcc makefile:
 gcc_gen
+gcc_shared="yes"
+gcc_gen_shared
 #
 # generate C++ Builder 4 files:
 out="lib/bcb4.mak"
@@ -608,3 +684,8 @@ rm -f $tout $iout
 
 
 
+
+
+
+
+

posix_ref.htm

@@ -20,7 +20,7 @@
 <H3> Regex++, POSIX API Reference.</H3>
 </CENTER>
 <CENTER>
-<I>(version 3.01, 18 April 2000)</I> 
+<I>(version 3.02, 18 April 2000)</I> 
 </CENTER>
 <PRE><I>Copyright (c) 1998-2000
 Dr John Maddock

src/c_regex_traits.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         c_regex_traits.cpp
-  *   VERSION      3.01
+  *   VERSION      3.02
   *   DESCRIPTION: Implements the c_regex_traits<charT> traits class
   */
 
@@ -37,14 +37,6 @@
 #include <nl_types.h>
 #endif
 
-#if defined(BOOST_MSVC)
-namespace std{
-   using ::setlocale;
-   using ::wcstombs;
-   using ::mbstowcs;
-}
-#endif
-
 namespace{
 
 //
@@ -559,7 +551,7 @@ bool BOOST_RE_CALL c_regex_traits<wchar_t>::lookup_collatename(std::basic_string
    scoped_array<char> buf(new char[len]);
    strnarrow(buf.get(), len, s.c_str());
    std::string t_out;
-   bool result = re_detail::c_traits_base::do_lookup_collate(t_out, buf.get());
+   bool result = base_type::do_lookup_collate(t_out, buf.get());
    if(t_out.size() == 0) result = false;
    if(result)
    {
@@ -781,7 +773,7 @@ bool BOOST_RE_CALL c_regex_traits<wchar_t>::do_lookup_collate(std::basic_string<
    scoped_array<char> buf(new char[len]);
    strnarrow(buf.get(), len, s.c_str());
    std::string t_out;
-   bool result =  re_detail::c_traits_base::do_lookup_collate(t_out, buf.get());
+   bool result = base_type::do_lookup_collate(t_out, buf.get());
    if(result)
    {
       len = strwiden((wchar_t*)0, 0, t_out.c_str());
@@ -999,7 +991,7 @@ c_regex_traits<wchar_t> c_regex_traits<wchar_t>::init_;
 unsigned int BOOST_RE_CALL c_regex_traits<wchar_t>::strnarrow(char *s1, unsigned int len, const wchar_t *s2)
 {
    BOOST_RE_GUARD_STACK
-   unsigned int size = wcslen(s2) + 1;
+   unsigned int size = std::wcslen(s2) + 1;
    if(size > len)
       return size;
    return std::wcstombs(s1, s2, len);
@@ -1008,7 +1000,7 @@ unsigned int BOOST_RE_CALL c_regex_traits<wchar_t>::strnarrow(char *s1, unsigned
 unsigned int BOOST_RE_CALL c_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsigned int len, const char *s2)
 {
    BOOST_RE_GUARD_STACK
-   unsigned int size = strlen(s2) + 1;
+   unsigned int size = std::strlen(s2) + 1;
    if(size > len)
       return size;
    size = std::mbstowcs(s1, s2, len);

src/c_regex_traits_common.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        c_regex_traits_common.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements common code and data for the
   *                c_regex_traits<charT> traits classes.
   */

src/cpp_regex_traits.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        c_regex_traits.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements the cpp_regex_traits<charT> traits class
   */
 #include <clocale>
@@ -31,14 +31,9 @@
 
 #ifndef BOOST_RE_NO_LOCALE_H
 
-#ifdef BOOST_MSVC
-#pragma warning(disable:4786)
-namespace std
-{ 
-   using ::abs; 
-   using ::mbstate_t;
-}
-#endif
+# ifdef BOOST_MSVC
+#  pragma warning(disable:4786)
+#  endif
 
 namespace{
    const unsigned int re_classes_max = 14;
@@ -185,9 +180,10 @@ message_data<char>::message_data(const std::locale& l, const std::string& regex_
    : is(&sbuf)
 {
    is.imbue(l);
+#ifndef BOOST_RE_NO_MESSAGES
    const std::messages<char>* pm = &BOOST_RE_USE_FACET(l, std::messages<char>);
    std::messages<char>::catalog cat = regex_message_catalogue.size() ? pm->open(regex_message_catalogue, l) : -1;
-
+#endif
    std::memset(syntax_map, cpp_regex_traits<char>::syntax_char, 256);
    unsigned int i;
    scoped_array<char> a;
@@ -203,14 +199,17 @@ message_data<char>::message_data(const std::locale& l, const std::string& regex_
       }
       re_get_default_message(a.get(), array_size, i+100);
       std::string s = a.get();
+#ifndef BOOST_RE_NO_MESSAGES
       if((int)cat >= 0)
          s = pm->get(cat, 0, i+100, s);
+#endif
       for(unsigned int j = 0; j < s.size(); ++j)
       {
          syntax_map[s[j]] = (unsigned char)(i);
       }
    }
 
+#ifndef BOOST_RE_NO_MESSAGES
    // load any custom collate names:
    std::string c1, c2;
    i = 400;
@@ -232,6 +231,7 @@ message_data<char>::message_data(const std::locale& l, const std::string& regex_
       ++i;
       c2 = pm->get(cat, 0, i, c1);
    }
+#endif
 /*
    std::string n("zero");
    std::map<std::string, std::string, std::less<std::string > >::const_iterator pos = collating_elements.find(n);
@@ -249,6 +249,7 @@ message_data<char>::message_data(const std::locale& l, const std::string& regex_
 */
    std::string m;
    std::string s;
+#ifndef BOOST_RE_NO_MESSAGES
    if((int)cat >= 0)
    {
       for(i = 0; i < re_classes_max; ++i)
@@ -263,9 +264,10 @@ message_data<char>::message_data(const std::locale& l, const std::string& regex_
          error_strings[i] = s;
       }
    }
-   
+
    if((int)cat >= 0)
       pm->close(cat);
+#endif
 }
 
 std::string cpp_regex_traits_base::set_message_catalogue(const std::string& l)
@@ -509,7 +511,11 @@ std::wstring BOOST_RE_CALL to_wide(const std::string& is, const std::codecvt<wch
 template <>
 struct message_data<wchar_t>
 {
+#ifndef BOOST_RE_NO_MESSAGES
    typedef std::messages<wchar_t>::string_type string_type;
+#else
+   typedef std::wstring string_type;
+#endif
 
    string_type name;
 
@@ -538,9 +544,10 @@ message_data<wchar_t>::message_data(const std::locale& l, const std::string& reg
    syntax_map m;
    typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_type;
    const cvt_type& cvt = BOOST_RE_USE_FACET(l, cvt_type);
+#ifndef BOOST_RE_NO_MESSAGES
    const std::messages<wchar_t>& msgs = BOOST_RE_USE_FACET(l, std::messages<wchar_t>);
    std::messages<wchar_t>::catalog cat = regex_message_catalogue.size() ? msgs.open(regex_message_catalogue, l) : -1;
-
+#endif
    scoped_array<char> a;
    unsigned array_size = 0;
    unsigned new_size;
@@ -557,8 +564,10 @@ message_data<wchar_t>::message_data(const std::locale& l, const std::string& reg
       re_get_default_message(a.get(), array_size, i+100);
       std::string ns = a.get();
       string_type s = to_wide(ns, cvt);
+#ifndef BOOST_RE_NO_MESSAGES
       if((int)cat >= 0)
          s = BOOST_RE_USE_FACET(l, std::messages<wchar_t>).get(cat, 0, i+100, s);
+#endif
       for(unsigned int j = 0; j < s.size(); ++j)
       {
          if((s[j] <= UCHAR_MAX) && (s[j] >= 0))
@@ -572,6 +581,7 @@ message_data<wchar_t>::message_data(const std::locale& l, const std::string& reg
       }
    }
 
+#ifndef BOOST_RE_NO_MESSAGES
    // load any custom collate names:
    string_type c1, c2;
    i = 400;
@@ -612,6 +622,7 @@ message_data<wchar_t>::message_data(const std::locale& l, const std::string& reg
 
    if((int)cat >= 0)
       msgs.close(cat);
+#endif      
 }
 
 } // namespace re_detail
@@ -781,7 +792,7 @@ unsigned int BOOST_RE_CALL cpp_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsi
    std::string s(s2);
    std::wstring ws = re_detail::to_wide(s2, *pcdv);
    if(len > ws.size())
-      wcscpy(s1, ws.c_str());
+      std::wcscpy(s1, ws.c_str());
    return ws.size()+1;
 }
 

src/cregex.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        cregex.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements high level class boost::RexEx
   */
 #include <boost/cregex.hpp>

src/fileiter.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        fileiter.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements file io primitives + directory searching for class boost::RegEx.
   */
 

src/posix_api.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        posix_api.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements the Posix API wrappers.
   */
 

src/primary_transform.hpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        primary_transform.hpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Heuristically determines the sort string format in use
   *                by the current locale.
   */

src/regex.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        regex.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Misc boost::regbase member funnctions.
   */
 
@@ -32,8 +32,8 @@ namespace boost{
 // that dll builds contain the Virtual table for these
 // types - this ensures that exceptions can be thrown
 // from the dll and caught in an exe.
-bad_pattern::~bad_pattern(){}
-bad_expression::~bad_expression(){}
+bad_pattern::~bad_pattern() throw() {}
+bad_expression::~bad_expression() throw() {}
 
 regbase::regbase()
    : _flags(regbase::failbit){}

src/regex_debug.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        regex_debug.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Misc. debugging helpers.
   */
 
@@ -24,13 +24,17 @@
 #include <boost/re_detail/regex_config.hpp>
 #include <boost/re_detail/regex_raw_buffer.hpp>
 #include <boost/regex.hpp>
-#include <ostream>
 
 #ifdef BOOST_MSVC
 #include <crtdbg.h>
 #endif
 
 #ifdef BOOST_RE_DEBUG
+#ifndef BOOST_RE_OLD_IOSTREAM
+#include <ostream>
+#else 
+#include <ostream.h>
+#endif
 
 namespace boost { namespace re_detail {
 std::ostream& operator<<(std::ostream& s, syntax_element_type x)
@@ -206,3 +210,4 @@ debug_guard::~debug_guard()
 
 #endif
 
+

src/regex_synch.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        regex_synch.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Thread synch helper functions, for regular
   *                expression library.
   */

src/w32_regex_traits.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        w32_regex_traits.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements the w32_regex_traits<charT> traits class
   */
 
@@ -559,7 +559,7 @@ bool BOOST_RE_CALL w32_regex_traits<wchar_t>::lookup_collatename(std::basic_stri
    scoped_array<char> buf(new char[len]);
    strnarrow(buf.get(), len, s.c_str());
    std::string t_out;
-   bool result = re_detail::w32_traits_base::do_lookup_collate(t_out, buf.get());
+   bool result = base_type::do_lookup_collate(t_out, buf.get());
    if(t_out.size() == 0) result = false;
    if(result)
    {
@@ -599,7 +599,7 @@ bool BOOST_RE_CALL w32_regex_traits<wchar_t>::do_lookup_collate(std::basic_strin
    scoped_array<char> buf(new char[len]);
    strnarrow(buf.get(), len, s.c_str());
    std::string t_out;
-   bool result =  re_detail::w32_traits_base::do_lookup_collate(t_out, buf.get());
+   bool result =  base_type::do_lookup_collate(t_out, buf.get());
    if(result)
    {
       len = strwiden((wchar_t*)0, 0, t_out.c_str());
@@ -761,7 +761,7 @@ jm_uintfast32_t BOOST_RE_CALL w32_regex_traits<wchar_t>::lookup_classname(const
    unsigned int len = strnarrow((char*)NULL, 0, s.c_str());
    scoped_array<char> buf(new char[len]);
    strnarrow(buf.get(), len, s.c_str());
-   len =  re_detail::w32_traits_base::do_lookup_class(buf.get());
+   len =  do_lookup_class(buf.get());
    return len;
 }
 

src/wide_posix_api.cpp

@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        wide_posix_api.cpp
-  *   VERSION:     3.00
+  *   VERSION:     3.02
   *   DESCRIPTION: Implements the wide character POSIX API wrappers.
   */
 
@@ -29,16 +29,9 @@
 #ifndef BOOST_RE_NO_WCHAR_H
 #include <cwchar>
 #endif
-#ifndef BOOST_RE_NO_WCTYPE_H
-#include <cwctype>
-#endif
 #include <cstring>
 #include <cstdio>
 
-#if defined(BOOST_RE_NO_SWPRINTF) && !defined(BOOST_RE_NO_WSPRINTF)
-#include <widec.h>
-#endif
-
 namespace boost{
 
 namespace {
@@ -124,7 +117,7 @@ BOOST_RE_IX_DECL unsigned int BOOST_RE_CCALL regerrorW(int code, const regex_tW*
       }
       return result;
    }
-#if !defined(BOOST_RE_NO_SWPRINTF) || !defined(BOOST_RE_NO_WSPRINTF)
+#if !defined(BOOST_RE_NO_SWPRINTF)
    if(code == REG_ATOI)
    {
       wchar_t localbuf[5];
@@ -134,21 +127,13 @@ BOOST_RE_IX_DECL unsigned int BOOST_RE_CCALL regerrorW(int code, const regex_tW*
       {
          if(std::wcscmp(e->re_endp, wnames[i]) == 0)
          {
-#if defined(BOOST_RE_NO_SWPRINTF)
-            wsprintf(localbuf, "%d", i);
-#else
-            std::swprintf(localbuf, L"%d", i);
-#endif
+            std::swprintf(localbuf, 5, L"%d", i);
             if(std::wcslen(localbuf) < buf_size)
                std::wcscpy(buf, localbuf);
             return std::wcslen(localbuf) + 1;
          }
       }
-#if defined(BOOST_RE_NO_SWPRINTF)
-      wsprintf(localbuf, "%d", 0);
-#else
-      std::swprintf(localbuf, L"%d", 0);
-#endif
+      std::swprintf(localbuf, 5, L"%d", 0);
       if(std::wcslen(localbuf) < buf_size)
          std::wcscpy(buf, localbuf);
       return std::wcslen(localbuf) + 1;

syntax.htm

@@ -20,7 +20,7 @@
 <H3> Regex++, Regular Expression Syntax.</H3>
 </CENTER>
 <CENTER>
-<I>(version 3.01, 18 April 2000)</I>
+<I>(version 3.02, 18 April 2000)</I>
 </CENTER>
 <PRE><I>Copyright (c) 1998-2000
 Dr John Maddock

template_class_ref.htm

@@ -21,7 +21,7 @@ content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
         </td>
         <td valign="top" width="50%"><h2 align="center">Regex++,
         Template Class and Algorithm Reference.</h2>
-        <p><i>(version 3.01, 18 April 2000)</i> </p>
+        <p><i>(version 3.02, 18 April 2000)</i> </p>
         <pre><i>Copyright (c) 1998-9
 Dr John Maddock
 
@@ -1534,13 +1534,13 @@ available, or may be available in a more limited form, depending
 upon your compilers capabilities]: </p>
 
 <pre><b>template</b> &lt;<b>class</b> Predicate, <b>class</b> charT, <b>class</b> Allocator, <b>class</b> traits&gt;
-<b>bool</b> regex_grep(Predicate foo,&nbsp;
+<b>unsigned</b> <b>int</b> regex_grep(Predicate foo,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>const</b> charT* str,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>const</b> reg_expression&lt;charT, traits, Allocator&gt;&amp; e,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>unsigned</b> flags = match_default);
 
 <b>template</b> &lt;<b>class</b> Predicate, <b>class</b> ST, <b>class</b> SA, <b>class</b> Allocator, <b>class</b> charT, <b>class</b> traits&gt;
-<b>bool</b> regex_grep(Predicate foo,&nbsp;
+<b>unsigned</b> <b>int</b> regex_grep(Predicate foo,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>const</b> std::basic_string&lt;charT, ST, SA&gt;&amp; s,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>const</b> reg_expression&lt;charT, traits, Allocator&gt;&amp; e,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>unsigned</b> flags = match_default);</pre>
@@ -1595,7 +1595,8 @@ structure, which contains information on what matched, and calls
 the predicate foo, passing the match_results&lt;iterator,
 Allocator&gt; as a single argument. If the predicate returns true,
 then the grep operation continues, otherwise it terminates
-without searching for further matches. </p>
+without searching for further matches. The function returns the
+number of matches found.</p>
 
 <p>The general form of the predicate is: </p>
 
@@ -1659,7 +1660,7 @@ void</b> IndexClasses(map_type&amp; m, <b>const</b> std::string&amp; file)
 &nbsp;&nbsp; std::string::const_iterator start, end; 
 &nbsp;&nbsp; start = file.begin(); 
 &nbsp;&nbsp; end = file.end(); 
-&nbsp;&nbsp; regex_grep(IndexClassesPred(m, start), start, end, expression; 
+&nbsp;&nbsp; regex_grep(IndexClassesPred(m, start), start, end, expression); 
 } </pre>
 
 <p><a href="demo/snippets/snip5.cpp">Example</a>: Use regex_grep

traits_class_ref.htm

@@ -19,7 +19,7 @@
 HEIGHT="86" ALT="C++ Boost"> </H3>
 </TD>
 <TD VALIGN="top" WIDTH="50%"><H3 ALIGN="center">Regex++, Traits Class
-Reference. <I>(version 3.01, 18 April 2000)</I>&nbsp; </H3>
+Reference. <I>(version 3.02, 18 April 2000)</I>&nbsp; </H3>
 <PRE>
 <I>Copyright (c) 1998-2000
 Dr John Maddock