boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-13 20:36:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

BeOS5 (intel) fixes

Browse Source 
[SVN r8133]
This commit is contained in:
John Maddock
2000-11-04 11:16:12 +00:00
parent 209636b869
commit fcdbbcff08
3 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
demo/regress/regex_test.cpp
View File

@ -33,9 +33,14 @@
// //
namespace boost{ namespace boost{
#if defined(__GNUC__) && defined(__BEOS__)
#define ra_it const char*
#define test_char_type char
#else
typedef const char* ra_it; typedef const char* ra_it;
typedef char char_type; typedef char test_char_type;
typedef std::basic_string<char_type> test_string_type; #endif
typedef std::basic_string<test_char_type> test_string_type;
bool pred1(const match_results<ra_it>&) bool pred1(const match_results<ra_it>&)
{ return true; } { return true; }
@ -50,57 +55,57 @@ regbase::flag_type f = regbase::escape_in_lists | regbase::char_classes | regbas
| regbase::failbit | regbase::literal | regbase::icase | regbase::nocollate | regbase::basic | regbase::failbit | regbase::literal | regbase::icase | regbase::nocollate | regbase::basic
| regbase::extended | regbase::normal | regbase::emacs | regbase::awk | regbase::grep | regbase::egrep | regbase::sed; | regbase::extended | regbase::normal | regbase::emacs | regbase::awk | regbase::grep | regbase::egrep | regbase::sed;
template class reg_expression<char_type>; template class reg_expression<test_char_type>;
template class sub_match<ra_it>; template class sub_match<ra_it>;
template class match_results<ra_it>; template class match_results<ra_it>;
template bool regex_match(ra_it, template bool regex_match(ra_it,
ra_it, ra_it,
match_results<ra_it>& m, match_results<ra_it>& m,
const reg_expression<char_type>& e, const reg_expression<test_char_type>& e,
unsigned flags); unsigned flags);
template bool regex_match(ra_it, template bool regex_match(ra_it,
ra_it, ra_it,
const reg_expression<char_type>& e, const reg_expression<test_char_type>& e,
unsigned flags); unsigned flags);
template bool regex_search(ra_it, template bool regex_search(ra_it,
ra_it, ra_it,
match_results<ra_it>& m, match_results<ra_it>& m,
const reg_expression<char_type>& e, const reg_expression<test_char_type>& e,
unsigned flags); unsigned flags);
template unsigned int regex_grep(pred1_type, template unsigned int regex_grep(pred1_type,
ra_it, ra_it,
ra_it, ra_it,
const reg_expression<char_type>& e, const reg_expression<test_char_type>& e,
unsigned flags); unsigned flags);
template char_type* regex_format(char_type*, template test_char_type* regex_format(test_char_type*,
const match_results<ra_it>& m, const match_results<ra_it>& m,
const char_type* fmt, const test_char_type* fmt,
unsigned flags); unsigned flags);
template char_type* regex_format(char_type*, template test_char_type* regex_format(test_char_type*,
const match_results<ra_it>& m, const match_results<ra_it>& m,
const test_string_type& fmt, const test_string_type& fmt,
unsigned flags); unsigned flags);
template char_type* regex_merge(char_type*, template test_char_type* regex_merge(test_char_type*,
ra_it, ra_it,
ra_it, ra_it,
const reg_expression<char_type>&, const reg_expression<test_char_type>&,
const char_type*, const test_char_type*,
unsigned int flags); unsigned int flags);
template char_type* regex_merge(char_type*, template test_char_type* regex_merge(test_char_type*,
ra_it, ra_it,
ra_it, ra_it,
const reg_expression<char_type>& e, const reg_expression<test_char_type>& e,
const test_string_type&, const test_string_type&,
unsigned int flags); unsigned int flags);
template std::size_t regex_split(test_string_type*, template std::size_t regex_split(test_string_type*,
test_string_type&, test_string_type&,
const reg_expression<char_type>&, const reg_expression<test_char_type>&,
unsigned flags, unsigned flags,
std::size_t); std::size_t);
template std::size_t regex_split(test_string_type*, template std::size_t regex_split(test_string_type*,
test_string_type& s, test_string_type& s,
const reg_expression<char_type>& e, const reg_expression<test_char_type>& e,
unsigned flags); unsigned flags);
template std::size_t regex_split(test_string_type*, test_string_type&); template std::size_t regex_split(test_string_type*, test_string_type&);
@ -110,50 +115,50 @@ template std::size_t regex_split(test_string_type*, test_string_type&);
// the following prototypes are only available if partial ordering // the following prototypes are only available if partial ordering
// of template functions is supported: // of template functions is supported:
// //
template bool regex_match(const char_type*, template bool regex_match(const test_char_type*,
match_results<const char_type*>& m, match_results<const test_char_type*>& m,
const reg_expression<char_type>& e, const reg_expression<test_char_type>& e,
unsigned flags); unsigned flags);
template bool regex_match(const test_string_type&, template bool regex_match(const test_string_type&,
match_results<test_string_type::const_iterator>&, match_results<test_string_type::const_iterator>&,
const reg_expression<char_type>&, const reg_expression<test_char_type>&,
unsigned flags); unsigned flags);
template bool regex_match(const char_type*, template bool regex_match(const test_char_type*,
const reg_expression<char_type>&, const reg_expression<test_char_type>&,
unsigned flags); unsigned flags);
template bool regex_match(const test_string_type&, template bool regex_match(const test_string_type&,
const reg_expression<char_type>&, const reg_expression<test_char_type>&,
unsigned flags); unsigned flags);
template bool regex_search(const char_type*, template bool regex_search(const test_char_type*,
match_results<const char_type*>&, match_results<const test_char_type*>&,
const reg_expression<char_type>&, const reg_expression<test_char_type>&,
unsigned flags); unsigned flags);
template bool regex_search(const test_string_type&, template bool regex_search(const test_string_type&,
match_results<test_string_type::const_iterator>&, match_results<test_string_type::const_iterator>&,
const reg_expression<char_type>&, const reg_expression<test_char_type>&,
unsigned flags); unsigned flags);
template unsigned int regex_grep(pred1_type, template unsigned int regex_grep(pred1_type,
const char_type*, const test_char_type*,
const reg_expression<char_type>&, const reg_expression<test_char_type>&,
unsigned flags); unsigned flags);
template unsigned int regex_grep(pred2_type, template unsigned int regex_grep(pred2_type,
const test_string_type&, const test_string_type&,
const reg_expression<char_type>&, const reg_expression<test_char_type>&,
unsigned flags); unsigned flags);
template test_string_type regex_format template test_string_type regex_format
(const match_results<test_string_type::const_iterator>& m, (const match_results<test_string_type::const_iterator>& m,
const char_type*, const test_char_type*,
unsigned flags); unsigned flags);
template test_string_type regex_format template test_string_type regex_format
(const match_results<test_string_type::const_iterator>&, (const match_results<test_string_type::const_iterator>&,
const test_string_type&, const test_string_type&,
unsigned flags); unsigned flags);
template test_string_type regex_merge(const test_string_type&, template test_string_type regex_merge(const test_string_type&,
const reg_expression<char_type>&, const reg_expression<test_char_type>&,
const char_type*, const test_char_type*,
unsigned int flags); unsigned int flags);
template test_string_type regex_merge(const test_string_type&, template test_string_type regex_merge(const test_string_type&,
const reg_expression<char_type>&, const reg_expression<test_char_type>&,
const test_string_type&, const test_string_type&,
unsigned int flags); unsigned int flags);

5
demo/regress/regress.h
View File

@ -287,6 +287,11 @@ struct debug_iterator : public BOOST_RE_RA_ITERATOR(T, std::ptrdiff_t)
bool operator<(const self& x) const { bool operator<(const self& x) const {
return (cur < x.cur); 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) #if defined(__SGI_STL_PORT) && (__SGI_STL_PORT >= 0x400)

23
include/boost/re_detail/fileiter.hpp
View File

@ -250,6 +250,12 @@ public:
assert(node < file->_last); assert(node < file->_last);
return file ? *(*node + sizeof(int) + offset) : char(0); 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++ ();
mapfile_iterator operator++ (int); mapfile_iterator operator++ (int);
mapfile_iterator& operator-- (); mapfile_iterator& operator-- ();
@ -280,8 +286,25 @@ public:
{ {
return i.position() < j.position(); 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 + (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 mapfile_iterator operator - (const mapfile_iterator& i, long off);
friend inline long operator - (const mapfile_iterator& i, const mapfile_iterator& j) friend inline long operator - (const mapfile_iterator& i, const mapfile_iterator& j)
{ {