feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

stripped tabs from files

Browse Source 
[SVN r21011]
This commit is contained in:
John Maddock
2003-11-30 13:06:58 +00:00
parent d19f04af7b
commit 1a50827c46
4 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example/Jamfile
View File

@ -19,7 +19,7 @@ rule regex-test-run ( sources + : input * )
$(input) $(input)
: # test-files : # test-files
: # requirements : # requirements
<threading>multi <threading>multi
: # test name : # test name
] ; ] ;
} }

12
performance/Jamfile
View File

@ -6,22 +6,22 @@ SOURCES = command_line main time_boost time_greta time_localised_boost time_pcre
if $(HS_REGEX_PATH) if $(HS_REGEX_PATH)
{ {
HS_SOURCES = $(HS_REGEX_PATH)/regcomp.c $(HS_REGEX_PATH)/regerror.c $(HS_REGEX_PATH)/regexec.c $(HS_REGEX_PATH)/regfree.c ; HS_SOURCES = $(HS_REGEX_PATH)/regcomp.c $(HS_REGEX_PATH)/regerror.c $(HS_REGEX_PATH)/regexec.c $(HS_REGEX_PATH)/regfree.c ;
POSIX_OPTS = <define>BOOST_HAS_POSIX=1 <include>$(HS_REGEX_PATH) ; POSIX_OPTS = <define>BOOST_HAS_POSIX=1 <include>$(HS_REGEX_PATH) ;
} }
else if $(USE_POSIX) else if $(USE_POSIX)
{ {
POSIX_OPTS = <define>BOOST_HAS_POSIX=1 ; POSIX_OPTS = <define>BOOST_HAS_POSIX=1 ;
} }
if $(PCRE_PATH) if $(PCRE_PATH)
{ {
PCRE_SOURCES = $(PCRE_PATH)/chartables.c $(PCRE_PATH)/get.c $(PCRE_PATH)/pcre.c $(PCRE_PATH)/study.c ; PCRE_SOURCES = $(PCRE_PATH)/chartables.c $(PCRE_PATH)/get.c $(PCRE_PATH)/pcre.c $(PCRE_PATH)/study.c ;
PCRE_OPTS = <define>BOOST_HAS_PCRE=1 <include>$(PCRE_PATH) ; PCRE_OPTS = <define>BOOST_HAS_PCRE=1 <include>$(PCRE_PATH) ;
} }
else if $(USE_PCRE) else if $(USE_PCRE)
{ {
PCRE_OPTS = <define>BOOST_HAS_PCRE=1 <find-library>pcre ; PCRE_OPTS = <define>BOOST_HAS_PCRE=1 <find-library>pcre ;
} }

116
test/auto-link-test/Jamfile
View File

@ -12,82 +12,82 @@ subproject libs/regex/test/auto-link-test ;
import testing ; import testing ;
run run
# sources # sources
<template>../../build/regex-options <template>../../build/regex-options
../regress/parse.cpp ../regress/parse.cpp
../regress/regress.cpp ../regress/regress.cpp
../regress/tests.cpp ../regress/tests.cpp
<lib>../../../test/build/boost_prg_exec_monitor <lib>../../../test/build/boost_prg_exec_monitor
: :
: # input files : # input files
../regress/tests.txt ../regress/tests.txt
: # requirements : # requirements
<library-path>../../../../stage/lib <library-path>../../../../stage/lib
<define>BOOST_LIB_DIAGNOSTIC=1 <define>BOOST_LIB_DIAGNOSTIC=1
: # program name : # program name
regex_regress regex_regress
; ;
run run
# sources # sources
<template>../../build/regex-options <template>../../build/regex-options
../regress/parse.cpp ../regress/parse.cpp
../regress/regress.cpp ../regress/regress.cpp
../regress/tests.cpp ../regress/tests.cpp
<lib>../../../test/build/boost_prg_exec_monitor <lib>../../../test/build/boost_prg_exec_monitor
: :
: # input files : # input files
../regress/tests.txt ../regress/tests.txt
: # requirements : # requirements
<library-path>../../../../stage/lib <library-path>../../../../stage/lib
<define>TEST_UNICODE=1 <define>TEST_UNICODE=1
<define>BOOST_LIB_DIAGNOSTIC=1 <define>BOOST_LIB_DIAGNOSTIC=1
: # program name : # program name
wide_regex_regress wide_regex_regress
; ;
# and now the dll versions: # and now the dll versions:
run run
# sources # sources
<template>../../build/regex-options <template>../../build/regex-options
../regress/parse.cpp ../regress/parse.cpp
../regress/regress.cpp ../regress/regress.cpp
../regress/tests.cpp ../regress/tests.cpp
<lib>../../../test/build/boost_prg_exec_monitor <lib>../../../test/build/boost_prg_exec_monitor
: :
: # input files : # input files
../regress/tests.txt ../regress/tests.txt
: # requirements : # requirements
<library-path>../../../../stage/lib <library-path>../../../../stage/lib
<define>BOOST_ALL_DYN_LINK=1 <define>BOOST_ALL_DYN_LINK=1
<runtime-link>dynamic <runtime-link>dynamic
<define>BOOST_LIB_DIAGNOSTIC=1 <define>BOOST_LIB_DIAGNOSTIC=1
: # program name : # program name
regex_regress_dll regex_regress_dll
; ;
run run
# sources # sources
<template>../../build/regex-options <template>../../build/regex-options
../regress/parse.cpp ../regress/parse.cpp
../regress/regress.cpp ../regress/regress.cpp
../regress/tests.cpp ../regress/tests.cpp
<lib>../../../test/build/boost_prg_exec_monitor <lib>../../../test/build/boost_prg_exec_monitor
: :
: # input files : # input files
../regress/tests.txt ../regress/tests.txt
: # requirements : # requirements
<define>BOOST_ALL_DYN_LINK=1 <define>BOOST_ALL_DYN_LINK=1
<runtime-link>dynamic <runtime-link>dynamic
<library-path>../../../../stage/lib <library-path>../../../../stage/lib
<define>TEST_UNICODE=1 <define>TEST_UNICODE=1
<define>BOOST_LIB_DIAGNOSTIC=1 <define>BOOST_LIB_DIAGNOSTIC=1
: # program name : # program name
wide_regex_regress_dll wide_regex_regress_dll
; ;

26
test/regress/tests.cpp
View File

@ -3,12 +3,12 @@
* Copyright (c) 1998-2002 * Copyright (c) 1998-2002
* Dr John Maddock * Dr John Maddock
* *
* Use, modification and distribution are subject to the * Use, modification and distribution are subject to the
* Boost Software License, Version 1.0. (See accompanying file * Boost Software License, Version 1.0. (See accompanying file
* LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
* *
*/ */
/* /*
* *
* FILE tests.cpp * FILE tests.cpp
@ -170,7 +170,7 @@ bool grep_test_predicate<iterator, Alloc>::operator()(const boost::match_results
// check $`: // check $`:
start = m[-1].first - base; start = m[-1].first - base;
end = m[-1].second - base; end = m[-1].second - base;
if(match_id && if(match_id &&
( (end != matches[match_id]) || (start != matches[match_id - 1]) ) ( (end != matches[match_id]) || (start != matches[match_id - 1]) )
) )
{ {
@ -204,7 +204,7 @@ bool grep_test_predicate<iterator, Alloc>::operator()(const boost::match_results
cout << "regex++ grep error in line(): found " << start << " expected " << end << endl; cout << "regex++ grep error in line(): found " << start << " expected " << end << endl;
} }
*/ */
// //
// now check line_start() // now check line_start()
/* don't check this, it's not supported in the new algorithm.... /* don't check this, it's not supported in the new algorithm....
start = m.line_start() - base; start = m.line_start() - base;
@ -242,8 +242,8 @@ void cpp_tests(const basic_regex<C, T, A>& e, bool recurse = true)
} }
return; return;
} }
if(recurse) if(recurse)
{ {
// copy and assign test: // copy and assign test:
@ -257,7 +257,7 @@ void cpp_tests(const basic_regex<C, T, A>& e, bool recurse = true)
cpp_tests(e3, false); cpp_tests(e3, false);
#endif #endif
} }
if(e.error_code()) if(e.error_code())
{ {
// verify that we don't expect expression to compile // verify that we don't expect expression to compile
@ -304,7 +304,7 @@ void cpp_tests(const basic_regex<C, T, A>& e, bool recurse = true)
if(m[0].matched) if(m[0].matched)
{ {
begin_error(); begin_error();
cout << "regex++ API result mismatch, found full match when partial match was expected: found (" cout << "regex++ API result mismatch, found full match when partial match was expected: found ("
<< (m[0].first - x) << "," << << (m[0].first - x) << "," <<
(m[0].second - x) << ")" << endl; (m[0].second - x) << ")" << endl;
} }
@ -556,8 +556,8 @@ void cpp_tests(const basic_regex<C, T, A>& e, bool recurse = true)
unsigned int hl_match_id; unsigned int hl_match_id;
bool bool
#if defined(__BORLANDC__) || defined(BOOST_MSVC) #if (defined(__BORLANDC__) || defined(BOOST_MSVC)) && !defined(BOOST_DISABLE_WIN32)
__cdecl __cdecl
#endif #endif
hl_grep_test_proc(const RegEx& e) hl_grep_test_proc(const RegEx& e)
@ -591,7 +591,7 @@ hl_grep_test_proc(const RegEx& e)
end = start + e.Length(-1); end = start + e.Length(-1);
if(start == -1) if(start == -1)
{ {
if(hl_match_id && if(hl_match_id &&
( matches[hl_match_id] != matches[hl_match_id - 1] ) ( matches[hl_match_id] != matches[hl_match_id - 1] )
) )
{ {
@ -606,7 +606,7 @@ hl_grep_test_proc(const RegEx& e)
} }
else else
{ {
if(hl_match_id && if(hl_match_id &&
( (end != matches[hl_match_id]) || (start != matches[hl_match_id - 1]) ) ( (end != matches[hl_match_id]) || (start != matches[hl_match_id - 1]) )
) )
{ {