regex fixes: retry due to lost connection

[SVN r7968]

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
+r1.exe : tests.cpp regress.cpp parse.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r1.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2.exe : r2.cpp
+r2.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r2.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3.exe : r3.cpp
+r3.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r3.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4.exe : r4.cpp
+r4.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r4.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
+r5.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r5.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
+r6.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r6.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
+r1m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe r1.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp
 
-r2m.exe : r2.cpp
+r2m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe r2.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3m.exe : r3.cpp
+r3m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe r3.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4m.exe : r4.cpp
+r4m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe r4.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
+r5m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe r5.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
+r6m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe r6.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
+r1l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe r1.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
+r2l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe r2.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
+r3l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe r3.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
+r4l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe r4.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
+r5l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe r5.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
+r6l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe r6.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
+r1.exe : tests.cpp regress.cpp parse.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r1.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2.exe : r2.cpp
+r2.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r2.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3.exe : r3.cpp
+r3.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r3.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4.exe : r4.cpp
+r4.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r4.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
+r5.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r5.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
+r6.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r6.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
+r1m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe r1.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp
 
-r2m.exe : r2.cpp
+r2m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe r2.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3m.exe : r3.cpp
+r3m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe r3.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4m.exe : r4.cpp
+r4m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe r4.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
+r5m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe r5.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
+r6m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe r6.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
+r1v.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe r1.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp
 
-r2v.exe : r2.cpp
+r2v.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe r2.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3v.exe : r3.cpp
+r3v.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe r3.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4v.exe : r4.cpp
+r4v.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe r4.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5v.exe : r5.cpp
+r5v.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe r5.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6v.exe : r6.cpp
+r6v.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe r6.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1l.exe : r1.cpp
+r1l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe r1.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
+r2l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe r2.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
+r3l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe r3.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
+r4l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe r4.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
+r5l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe r5.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
+r6l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe r6.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
+r1lm.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe r1.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
+r2lm.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe r2.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
+r3lm.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe r3.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
+r4lm.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe r4.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
+r5lm.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe r5.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
+r6lm.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe r6.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
+r1.exe : tests.cpp regress.cpp parse.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r1.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2.exe : r2.cpp
+r2.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r2.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3.exe : r3.cpp
+r3.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r3.cpp
+	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4.exe : r4.cpp
+r4.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r4.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
+r5.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r5.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
+r6.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) r6.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
+r1m.exe : tests.cpp regress.cpp parse.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe r1.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2m.exe : r2.cpp
+r2m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe r2.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3m.exe : r3.cpp
+r3m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe r3.cpp
+	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4m.exe : r4.cpp
+r4m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe r4.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
+r5m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe r5.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
+r6m.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe r6.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
+r1v.exe : tests.cpp regress.cpp parse.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe r1.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
 
-r2v.exe : r2.cpp
+r2v.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe r2.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp
 
-r3v.exe : r3.cpp
+r3v.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe r3.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp
 
-r4v.exe : r4.cpp
+r4v.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe r4.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r5v.exe : r5.cpp
+r5v.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe r5.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
-r6v.exe : r6.cpp
+r6v.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe r6.cpp
+	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp
 
 
-r1l.exe : r1.cpp
+r1l.exe : tests.cpp regress.cpp parse.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe r1.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
+r2l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe r2.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
+r3l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe r3.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
+r4l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe r4.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
+r5l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe r5.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
+r6l.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe r6.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
+r1lm.exe : tests.cpp regress.cpp parse.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe r1.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
+r2lm.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe r2.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
+r3lm.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe r3.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
+r4lm.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe r4.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
+r5lm.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe r5.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
+r6lm.exe : tests.cpp parse.cpp regress.cpp
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe r6.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

@@ -8,8 +8,9 @@ CXX= g++ -O2 -pedantic -Wall -I../../../../ -I./ -L../../lib/gcc
 total : r2
 	./r2 tests.txt
 
-r2 : r2.cpp
+r2 : tests.cpp parse.cpp regress.cpp
-	$(CXX) -o r2 r2.cpp -lregex++
+	$(CXX) -o r2 tests.cpp parse.cpp regress.cpp -lregex++
+
 
 
 

demo/regress/makefile.in

@@ -11,47 +11,14 @@ total : @ac_regress@
 
 LIBDEP=../../lib/libregex++.a ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp
 
-r1$(EXE) :: r1$(OBJ)
+r1$(EXE) :: tests.cpp parse.cpp regress.cpp
-	$(CXX) -o r1$(EXE) r1$(OBJ) $(LIBS)
+	$(CXX) -o r1$(EXE) $(CXXFLAGS) tests.cpp parse.cpp regress.cpp $(LIBS)
-	./r1 tests.txt test1252.txt
+	./r1 tests.txt
 
-r2$(EXE) ::  r2$(OBJ)
+r2$(EXE) ::  tests.cpp parse.cpp regress.cpp
-	$(CXX) -o r2$(EXE) r2$(OBJ) $(LIBS)
+	$(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/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/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,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.01
+  *   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{
+
+typedef const char* ra_it;
+typedef char 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/regress/sunpro.mak

@@ -13,11 +13,11 @@ all: r2 r5
 %.o : %.cpp 
 	$(CXX) -c -o $@ $(CPP_FLAGS) $<
 
-r2 : r2.o
+r2 : tests.cpp parse.cpp regress.cpp
-	$(CXX) -o $@  $(CPP_FLAGS) r2.o -L../../lib -lregex++
+	$(CXX) -o $@  $(CPP_FLAGS) tests.cpp parse.cpp regress.cpp -L../../lib -lregex++
 
-r5 : r5.o
+r5 : tests.cpp parse.cpp regress.cpp
-	$(CXX) -o $@  $(CPP_FLAGS) r5.o -L../../lib -lregex++
+	$(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/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
+r1m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT -o r1m.exe $(CFLAGS) r1.cpp $(LFLAGS)
+	cl /MT /D_MT -o r1m.exe $(CFLAGS) -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2m.exe : r2.cpp
+r2m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT $(CFLAGS) -o r2m.exe r2.cpp $(LFLAGS)
+	cl /MT /D_MT $(CFLAGS) -o r2m.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3m.exe : r3.cpp
+r3m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT $(CFLAGS) -o r3m.exe r3.cpp $(LFLAGS)
+	cl /MT /D_MT $(CFLAGS) -o r3m.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4m.exe : r4.cpp
+r4m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT $(CFLAGS) -o r4m.exe r4.cpp $(LFLAGS)
+	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
+r5m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT $(CFLAGS) -o r5m.exe r5.cpp $(LFLAGS)
+	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
+r6m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT $(CFLAGS) -o r6m.exe r6.cpp $(LFLAGS)
+	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
+r1l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r1l.exe r1.cpp $(LFLAGS)
+	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
+r2l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r2l.exe r2.cpp $(LFLAGS)
+	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
+r3l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r3l.exe r3.cpp $(LFLAGS)
+	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
+r4l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r4l.exe r4.cpp $(LFLAGS)
+	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
+r5l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r5l.exe r5.cpp $(LFLAGS)
+	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
+r6l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r6l.exe r6.cpp $(LFLAGS)
+	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
+r1md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r1md.exe r1.cpp $(LFLAGS)
+	cl /MTd /D_MT $(CFLAGS) -o r1md.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2md.exe : r2.cpp
+r2md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r2md.exe r2.cpp $(LFLAGS)
+	cl /MTd /D_MT $(CFLAGS) -o r2md.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3md.exe : r3.cpp
+r3md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r3md.exe r3.cpp $(LFLAGS)
+	cl /MTd /D_MT $(CFLAGS) -o r3md.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4md.exe : r4.cpp
+r4md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r4md.exe r4.cpp $(LFLAGS)
+	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
+r5md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r5md.exe r5.cpp $(LFLAGS)
+	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
+r6md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT /D_DEBUG $(CFLAGS) -o r6md.exe r6.cpp $(LFLAGS)
+	cl /MTd /D_MT $(CFLAGS) -o r6md.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 /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)
 
 
+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
+r1.exe : tests.cpp parse.cpp regress.cpp
-	cl /ML $(CFLAGS) r1.cpp $(LFLAGS)
+	cl /ML $(CFLAGS) -o r1.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2.exe : r2.cpp
+r2.exe : tests.cpp parse.cpp regress.cpp
-	cl /ML $(CFLAGS) r2.cpp $(LFLAGS)
+	cl /ML $(CFLAGS) -o r2.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3.exe : r3.cpp
+r3.exe : tests.cpp parse.cpp regress.cpp
-	cl /ML $(CFLAGS) r3.cpp $(LFLAGS)
+	cl /ML $(CFLAGS) -o r3.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4.exe : r4.cpp
+r4.exe : tests.cpp parse.cpp regress.cpp
-	cl /ML $(CFLAGS) r4.cpp $(LFLAGS)
+	cl /ML $(CFLAGS) -o r4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r5.exe : r5.cpp
+r5.exe : tests.cpp parse.cpp regress.cpp
-	cl /ML $(CFLAGS) r5.cpp $(LFLAGS)
+	cl /ML $(CFLAGS) -o r5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r6.exe : r6.cpp
+r6.exe : tests.cpp parse.cpp regress.cpp
-	cl /ML $(CFLAGS) r6.cpp $(LFLAGS)
+	cl /ML $(CFLAGS) -o r6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 	
 
-r1m.exe : r1.cpp
+r1m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT -o r1m.exe $(CFLAGS) r1.cpp $(LFLAGS)
+	cl /MT /D_MT -o r1m.exe $(CFLAGS) -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2m.exe : r2.cpp
+r2m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT $(CFLAGS) -o r2m.exe r2.cpp $(LFLAGS)
+	cl /MT /D_MT $(CFLAGS) -o r2m.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3m.exe : r3.cpp
+r3m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT $(CFLAGS) -o r3m.exe r3.cpp $(LFLAGS)
+	cl /MT /D_MT $(CFLAGS) -o r3m.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4m.exe : r4.cpp
+r4m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT $(CFLAGS) -o r4m.exe r4.cpp $(LFLAGS)
+	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
+r5m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT $(CFLAGS) -o r5m.exe r5.cpp $(LFLAGS)
+	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
+r6m.exe : tests.cpp parse.cpp regress.cpp
-	cl /MT /D_MT $(CFLAGS) -o r6m.exe r6.cpp $(LFLAGS)
+	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
+r1l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r1l.exe r1.cpp $(LFLAGS)
+	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
+r2l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r2l.exe r2.cpp $(LFLAGS)
+	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
+r3l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r3l.exe r3.cpp $(LFLAGS)
+	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
+r4l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r4l.exe r4.cpp $(LFLAGS)
+	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
+r5l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r5l.exe r5.cpp $(LFLAGS)
+	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
+r6l.exe : tests.cpp parse.cpp regress.cpp
-	cl /MD /D_MT /D_DLL $(CFLAGS) -o r6l.exe r6.cpp $(LFLAGS)
+	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
+r1d.exe : tests.cpp parse.cpp regress.cpp
-	cl /MLd $(CFLAGS) -o r1d.exe r1.cpp $(LFLAGS)
+	cl /MLd $(CFLAGS) -o r1d.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2d.exe : r2.cpp
+r2d.exe : tests.cpp parse.cpp regress.cpp
-	cl /MLd $(CFLAGS) -o r2d.exe r2.cpp $(LFLAGS)
+	cl /MLd $(CFLAGS) -o r2d.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3d.exe : r3.cpp
+r3d.exe : tests.cpp parse.cpp regress.cpp
-	cl /MLd $(CFLAGS) -o r3d.exe r3.cpp $(LFLAGS)
+	cl /MLd $(CFLAGS) -o r3d.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4d.exe : r4.cpp
+r4d.exe : tests.cpp parse.cpp regress.cpp
-	cl /MLd $(CFLAGS) -o r4d.exe r4.cpp $(LFLAGS)
+	cl /MLd $(CFLAGS) -o r4d.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r5d.exe : r5.cpp
+r5d.exe : tests.cpp parse.cpp regress.cpp
-	cl /MLd $(CFLAGS) -o r5d.exe r5.cpp $(LFLAGS)
+	cl /MLd $(CFLAGS) -o r5d.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r6d.exe : r6.cpp
+r6d.exe : tests.cpp parse.cpp regress.cpp
-	cl /MLd $(CFLAGS) -o r6d.exe r6.cpp $(LFLAGS)
+	cl /MLd $(CFLAGS) -o r6d.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
 
-r1md.exe : r1.cpp
+r1md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r1md.exe r1.cpp $(LFLAGS)
+	cl /MTd /D_MT $(CFLAGS) -o r1md.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r2md.exe : r2.cpp
+r2md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r2md.exe r2.cpp $(LFLAGS)
+	cl /MTd /D_MT $(CFLAGS) -o r2md.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r3md.exe : r3.cpp
+r3md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r3md.exe r3.cpp $(LFLAGS)
+	cl /MTd /D_MT $(CFLAGS) -o r3md.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
 
-r4md.exe : r4.cpp
+r4md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r4md.exe r4.cpp $(LFLAGS)
+	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
+r5md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r5md.exe r5.cpp $(LFLAGS)
+	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
+r6md.exe : tests.cpp parse.cpp regress.cpp
-	cl /MTd /D_MT $(CFLAGS) -o r6md.exe r6.cpp $(LFLAGS)
+	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.01
+  *   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"
+

template_class_ref.htm

@@ -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>