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

regex updates: compatability fixes for Como and sunpro compilers

Browse Source 
[SVN r9642]
This commit is contained in:
John Maddock
2001-03-26 11:09:49 +00:00
parent 1758679bd6
commit b8adb4df00
10 changed files with 119 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,7 @@ struct _fi_find_data
struct _fi_priv_data;
typedef _fi_priv_data* _fi_find_handle;
#define _fi_invalid_handle NULL
#define _fi_invalid_handle 0
#define _fi_dir 1
_fi_find_handle _fi_FindFirstFile(const char* lpFileName, _fi_find_data* lpFindFileData);

40
include/boost/re_detail/regex_compile.hpp
View File

@ -418,7 +418,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_maps()
// always compile the first _map:
std::memset(startmap, 0, 256);
record->can_be_null = 0;
compile_map(record, startmap, NULL, re_detail::mask_all);
compile_map(record, startmap, 0, re_detail::mask_all);
while(record->type != re_detail::syntax_element_match)
{
@ -432,7 +432,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_maps()
else
{
record->can_be_null = 0;
compile_map(record, NULL, &(record->can_be_null), re_detail::mask_all);
compile_map(record, 0, &(record->can_be_null), re_detail::mask_all);
}
record = record->next.p;
}
@ -717,7 +717,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash)
{
fail(REG_ERANGE);
return NULL;
return 0;
}
jm_uintfast32_t id = traits_inst.lookup_classname(base+2, first-2);
if(_flags & regbase::icase)
@ -730,7 +730,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(id == 0)
{
fail(REG_ECTYPE);
return NULL;
return 0;
}
classes.push(id);
started = true;
@ -749,7 +749,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(s.size())goto char_set_literal;
}
fail(REG_ECOLLATE);
return NULL;
return 0;
case traits_type::syntax_equal:
//
// we have an equivalence class [=collating-name=]
@ -774,7 +774,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
}
}
fail(REG_ECOLLATE);
return NULL;
return 0;
case traits_type::syntax_left_word:
if((started == false) && (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) == traits_type::syntax_close_set))
{
@ -782,7 +782,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
return add_simple(0, re_detail::syntax_element_word_start);
}
fail(REG_EBRACK);
return NULL;
return 0;
case traits_type::syntax_right_word:
if((started == false) && (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) == traits_type::syntax_close_set))
{
@ -790,7 +790,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
return add_simple(0, re_detail::syntax_element_word_end);
}
fail(REG_EBRACK);
return NULL;
return 0;
default:
if(started == false)
{
@ -803,12 +803,12 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
}
}
fail(REG_EBRACK);
return NULL;
return 0;
}
if(first == last)
{
fail(REG_EBRACK);
return NULL;
return 0;
}
continue;
}
@ -836,7 +836,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if((singles.empty() == true) || (l != last_single))
{
fail(REG_ERANGE);
return NULL;
return 0;
}
ranges.push(singles.peek());
if(singles.peek().size() <= 1) // leave digraphs and ligatures in place
@ -859,7 +859,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash)
{
fail(REG_ERANGE);
return NULL;
return 0;
}
classes.push(traits_type::char_class_word);
started = true;
@ -870,7 +870,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash)
{
fail(REG_ERANGE);
return NULL;
return 0;
}
classes.push(traits_type::char_class_digit);
started = true;
@ -881,7 +881,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash)
{
fail(REG_ERANGE);
return NULL;
return 0;
}
classes.push(traits_type::char_class_space);
started = true;
@ -892,7 +892,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash)
{
fail(REG_ERANGE);
return NULL;
return 0;
}
classes.push(traits_type::char_class_lower);
started = true;
@ -903,7 +903,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash)
{
fail(REG_ERANGE);
return NULL;
return 0;
}
classes.push(traits_type::char_class_upper);
started = true;
@ -916,7 +916,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
case traits_type::syntax_U:
case traits_type::syntax_L:
fail(REG_EESCAPE);
return NULL;
return 0;
default:
c = parse_escape(first, last);
--first;
@ -957,7 +957,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
++first;
}
if(!done)
return NULL;
return 0;
re_detail::re_syntax_base* result;
if(has_digraphs)
@ -1018,7 +1018,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
#ifdef __BORLANDC__
_flags = f;
#endif
return NULL;
return 0;
}
++cranges;
unsigned len = (re_detail::re_strlen(c1.c_str()) + 1) * sizeof(charT);
@ -1091,7 +1091,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
#ifdef __BORLANDC__
_flags = f;
#endif
return NULL;
return 0;
}
for(unsigned int i = 0; i < 256; ++i)
{

11
include/boost/re_detail/regex_config.hpp
View File

@ -284,6 +284,7 @@ Do not change this file unless you really really have to, add options to
#define BOOST_RE_NESTED_TEMPLATE_DECL
#define BOOST_RE_NO_SWPRINTF
#define BOOST_RE_NO_TEMPLATE_FRIEND
#define BOOST_RE_NO_LOCALE_H
#endif
#if defined(__HP_aCC) || defined(__hpux)
@ -331,6 +332,14 @@ Do not change this file unless you really really have to, add options to
# endif
#endif
#ifdef _REENTRANT
//
// several compilers define _REENTRANT when
// threading support is turned on:
//
#define BOOST_RE_THREADS
#endif
#endif // BOOST_RE_AUTO_CONFIGURE
#ifdef __cplusplus
@ -407,7 +416,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) || defined(__STL_NO_MBSTATE_T)
# if (!defined (__SGI_STL_OWN_IOSTREAMS) && !defined(__STL_USE_NEW_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

2
include/boost/re_detail/regex_synch.hpp
View File

@ -60,7 +60,7 @@ typedef pthread_mutex_t CRITICAL_SECTION;
inline void BOOST_RE_CALL InitializeCriticalSection(CRITICAL_SECTION* ps)
{
pthread_mutex_init(ps, NULL);
pthread_mutex_init(ps, 0);
}
inline void BOOST_RE_CALL DeleteCriticalSection(CRITICAL_SECTION* ps)