// When compiling, states are *chained* instead of tree- or graph-constructed.
// It's more like structured programs: there's if statement and loop statement.
//
-// For alternative structure(say "a|b"), aka "if statement", two branchs should
-// be constructed. However, these two shall merge to an "end_tag" at the end of
-// this operator:
+// For alternative structure (say "a|b"), aka "if statement", two branches
+// should be constructed. However, these two shall merge to an "end_tag" at
+// the end of this operator:
//
// branch1
// / \
template<typename _TraitsT>
_Compiler<_TraitsT>::
_Compiler(_IterT __b, _IterT __e,
- const _TraitsT& __traits, _FlagT __flags)
+ const typename _TraitsT::locale_type& __loc, _FlagT __flags)
: _M_flags((__flags
& (regex_constants::ECMAScript
| regex_constants::basic
| regex_constants::awk))
? __flags
: __flags | regex_constants::ECMAScript),
- _M_traits(__traits),
- _M_ctype(std::use_facet<_CtypeT>(_M_traits.getloc())),
- _M_scanner(__b, __e, _M_flags, _M_traits.getloc()),
- _M_nfa(_M_flags)
+ _M_scanner(__b, __e, _M_flags, __loc),
+ _M_nfa(make_shared<_RegexT>(__loc, _M_flags)),
+ _M_traits(_M_nfa->_M_traits),
+ _M_ctype(std::use_facet<_CtypeT>(__loc))
{
- _StateSeqT __r(_M_nfa, _M_nfa._M_start());
- __r._M_append(_M_nfa._M_insert_subexpr_begin());
+ _StateSeqT __r(*_M_nfa, _M_nfa->_M_start());
+ __r._M_append(_M_nfa->_M_insert_subexpr_begin());
this->_M_disjunction();
if (!_M_match_token(_ScannerT::_S_token_eof))
__throw_regex_error(regex_constants::error_paren);
__r._M_append(_M_pop());
_GLIBCXX_DEBUG_ASSERT(_M_stack.empty());
- __r._M_append(_M_nfa._M_insert_subexpr_end());
- __r._M_append(_M_nfa._M_insert_accept());
- _M_nfa._M_eliminate_dummy();
+ __r._M_append(_M_nfa->_M_insert_subexpr_end());
+ __r._M_append(_M_nfa->_M_insert_accept());
+ _M_nfa->_M_eliminate_dummy();
}
template<typename _TraitsT>
_StateSeqT __alt1 = _M_pop();
this->_M_alternative();
_StateSeqT __alt2 = _M_pop();
- auto __end = _M_nfa._M_insert_dummy();
+ auto __end = _M_nfa->_M_insert_dummy();
__alt1._M_append(__end);
__alt2._M_append(__end);
- _M_stack.push(_StateSeqT(_M_nfa,
- _M_nfa._M_insert_alt(__alt1._M_start,
- __alt2._M_start, false),
+ // __alt2 is state._M_next, __alt1 is state._M_alt. The executor
+ // executes _M_alt before _M_next, as well as executing left
+ // alternative before right one.
+ _M_stack.push(_StateSeqT(*_M_nfa,
+ _M_nfa->_M_insert_alt(
+ __alt2._M_start, __alt1._M_start, false),
__end));
}
}
_M_stack.push(__re);
}
else
- _M_stack.push(_StateSeqT(_M_nfa, _M_nfa._M_insert_dummy()));
+ _M_stack.push(_StateSeqT(*_M_nfa, _M_nfa->_M_insert_dummy()));
}
template<typename _TraitsT>
_M_assertion()
{
if (_M_match_token(_ScannerT::_S_token_line_begin))
- _M_stack.push(_StateSeqT(_M_nfa, _M_nfa._M_insert_line_begin()));
+ _M_stack.push(_StateSeqT(*_M_nfa, _M_nfa->_M_insert_line_begin()));
else if (_M_match_token(_ScannerT::_S_token_line_end))
- _M_stack.push(_StateSeqT(_M_nfa, _M_nfa._M_insert_line_end()));
+ _M_stack.push(_StateSeqT(*_M_nfa, _M_nfa->_M_insert_line_end()));
else if (_M_match_token(_ScannerT::_S_token_word_bound))
- // _M_value[0] == 'n' means it's negtive, say "not word boundary".
- _M_stack.push(_StateSeqT(_M_nfa, _M_nfa.
+ // _M_value[0] == 'n' means it's negative, say "not word boundary".
+ _M_stack.push(_StateSeqT(*_M_nfa, _M_nfa->
_M_insert_word_bound(_M_value[0] == 'n')));
else if (_M_match_token(_ScannerT::_S_token_subexpr_lookahead_begin))
{
if (!_M_match_token(_ScannerT::_S_token_subexpr_end))
__throw_regex_error(regex_constants::error_paren);
auto __tmp = _M_pop();
- __tmp._M_append(_M_nfa._M_insert_accept());
+ __tmp._M_append(_M_nfa->_M_insert_accept());
_M_stack.push(
_StateSeqT(
- _M_nfa,
- _M_nfa._M_insert_lookahead(__tmp._M_start, __neg)));
+ *_M_nfa,
+ _M_nfa->_M_insert_lookahead(__tmp._M_start, __neg)));
}
else
return false;
{
__init();
auto __e = _M_pop();
- _StateSeqT __r(_M_nfa, _M_nfa._M_insert_repeat(_S_invalid_state_id,
- __e._M_start, __neg));
+ _StateSeqT __r(*_M_nfa,
+ _M_nfa->_M_insert_repeat(_S_invalid_state_id,
+ __e._M_start, __neg));
__e._M_append(__r);
_M_stack.push(__r);
}
{
__init();
auto __e = _M_pop();
- __e._M_append(_M_nfa._M_insert_repeat(_S_invalid_state_id,
- __e._M_start, __neg));
+ __e._M_append(_M_nfa->_M_insert_repeat(_S_invalid_state_id,
+ __e._M_start, __neg));
_M_stack.push(__e);
}
else if (_M_match_token(_ScannerT::_S_token_opt))
{
__init();
auto __e = _M_pop();
- auto __end = _M_nfa._M_insert_dummy();
- _StateSeqT __r(_M_nfa, _M_nfa._M_insert_repeat(_S_invalid_state_id,
- __e._M_start, __neg));
+ auto __end = _M_nfa->_M_insert_dummy();
+ _StateSeqT __r(*_M_nfa,
+ _M_nfa->_M_insert_repeat(_S_invalid_state_id,
+ __e._M_start, __neg));
__e._M_append(__end);
__r._M_append(__end);
_M_stack.push(__r);
if (!_M_match_token(_ScannerT::_S_token_dup_count))
__throw_regex_error(regex_constants::error_badbrace);
_StateSeqT __r(_M_pop());
- _StateSeqT __e(_M_nfa, _M_nfa._M_insert_dummy());
+ _StateSeqT __e(*_M_nfa, _M_nfa->_M_insert_dummy());
long __min_rep = _M_cur_int_value(10);
bool __infi = false;
long __n;
if (__infi)
{
auto __tmp = __r._M_clone();
- _StateSeqT __s(_M_nfa,
- _M_nfa._M_insert_repeat(_S_invalid_state_id,
- __tmp._M_start, __neg));
+ _StateSeqT __s(*_M_nfa,
+ _M_nfa->_M_insert_repeat(_S_invalid_state_id,
+ __tmp._M_start, __neg));
__tmp._M_append(__s);
__e._M_append(__s);
}
{
if (__n < 0)
__throw_regex_error(regex_constants::error_badbrace);
- auto __end = _M_nfa._M_insert_dummy();
+ auto __end = _M_nfa->_M_insert_dummy();
// _M_alt is the "match more" branch, and _M_next is the
// "match less" one. Switch _M_alt and _M_next of all created
- // nodes. This is a hacking but IMO works well.
+ // nodes. This is a hack but IMO works well.
std::stack<_StateIdT> __stack;
for (long __i = 0; __i < __n; ++__i)
{
auto __tmp = __r._M_clone();
- auto __alt = _M_nfa._M_insert_repeat(__tmp._M_start,
- __end, __neg);
+ auto __alt = _M_nfa->_M_insert_repeat(__tmp._M_start,
+ __end, __neg);
__stack.push(__alt);
- __e._M_append(_StateSeqT(_M_nfa, __alt, __tmp._M_end));
+ __e._M_append(_StateSeqT(*_M_nfa, __alt, __tmp._M_end));
}
__e._M_append(__end);
while (!__stack.empty())
{
- auto& __tmp = _M_nfa[__stack.top()];
+ auto& __tmp = (*_M_nfa)[__stack.top()];
__stack.pop();
swap(__tmp._M_next, __tmp._M_alt);
}
else if (_M_try_char())
__INSERT_REGEX_MATCHER(_M_insert_char_matcher);
else if (_M_match_token(_ScannerT::_S_token_backref))
- _M_stack.push(_StateSeqT(_M_nfa, _M_nfa.
+ _M_stack.push(_StateSeqT(*_M_nfa, _M_nfa->
_M_insert_backref(_M_cur_int_value(10))));
else if (_M_match_token(_ScannerT::_S_token_quoted_class))
__INSERT_REGEX_MATCHER(_M_insert_character_class_matcher);
else if (_M_match_token(_ScannerT::_S_token_subexpr_no_group_begin))
{
- _StateSeqT __r(_M_nfa, _M_nfa._M_insert_dummy());
+ _StateSeqT __r(*_M_nfa, _M_nfa->_M_insert_dummy());
this->_M_disjunction();
if (!_M_match_token(_ScannerT::_S_token_subexpr_end))
__throw_regex_error(regex_constants::error_paren);
}
else if (_M_match_token(_ScannerT::_S_token_subexpr_begin))
{
- _StateSeqT __r(_M_nfa, _M_nfa._M_insert_subexpr_begin());
+ _StateSeqT __r(*_M_nfa, _M_nfa->_M_insert_subexpr_begin());
this->_M_disjunction();
if (!_M_match_token(_ScannerT::_S_token_subexpr_end))
__throw_regex_error(regex_constants::error_paren);
__r._M_append(_M_pop());
- __r._M_append(_M_nfa._M_insert_subexpr_end());
+ __r._M_append(_M_nfa->_M_insert_subexpr_end());
_M_stack.push(__r);
}
else if (!_M_bracket_expression())
_Compiler<_TraitsT>::
_M_insert_any_matcher_ecma()
{
- _M_stack.push(_StateSeqT(_M_nfa,
- _M_nfa._M_insert_matcher
+ _M_stack.push(_StateSeqT(*_M_nfa,
+ _M_nfa->_M_insert_matcher
(_AnyMatcher<_TraitsT, true, __icase, __collate>
(_M_traits))));
}
_Compiler<_TraitsT>::
_M_insert_any_matcher_posix()
{
- _M_stack.push(_StateSeqT(_M_nfa,
- _M_nfa._M_insert_matcher
+ _M_stack.push(_StateSeqT(*_M_nfa,
+ _M_nfa->_M_insert_matcher
(_AnyMatcher<_TraitsT, false, __icase, __collate>
(_M_traits))));
}
_Compiler<_TraitsT>::
_M_insert_char_matcher()
{
- _M_stack.push(_StateSeqT(_M_nfa,
- _M_nfa._M_insert_matcher
+ _M_stack.push(_StateSeqT(*_M_nfa,
+ _M_nfa->_M_insert_matcher
(_CharMatcher<_TraitsT, __icase, __collate>
(_M_value[0], _M_traits))));
}
(_M_ctype.is(_CtypeT::upper, _M_value[0]), _M_traits);
__matcher._M_add_character_class(_M_value, false);
__matcher._M_ready();
- _M_stack.push(_StateSeqT(_M_nfa,
- _M_nfa._M_insert_matcher(std::move(__matcher))));
+ _M_stack.push(_StateSeqT(*_M_nfa,
+ _M_nfa->_M_insert_matcher(std::move(__matcher))));
}
template<typename _TraitsT>
_M_insert_bracket_matcher(bool __neg)
{
_BracketMatcher<_TraitsT, __icase, __collate> __matcher(__neg, _M_traits);
+ pair<bool, _CharT> __last_char; // Optional<_CharT>
+ __last_char.first = false;
+ if (!(_M_flags & regex_constants::ECMAScript))
+ if (_M_try_char())
+ {
+ __matcher._M_add_char(_M_value[0]);
+ __last_char.first = true;
+ __last_char.second = _M_value[0];
+ }
while (!_M_match_token(_ScannerT::_S_token_bracket_end))
- _M_expression_term(__matcher);
+ _M_expression_term(__last_char, __matcher);
__matcher._M_ready();
- _M_stack.push(_StateSeqT(_M_nfa,
- _M_nfa._M_insert_matcher(std::move(__matcher))));
+ _M_stack.push(_StateSeqT(
+ *_M_nfa,
+ _M_nfa->_M_insert_matcher(std::move(__matcher))));
}
template<typename _TraitsT>
template<bool __icase, bool __collate>
void
_Compiler<_TraitsT>::
- _M_expression_term(_BracketMatcher<_TraitsT, __icase, __collate>& __matcher)
+ _M_expression_term(pair<bool, _CharT>& __last_char,
+ _BracketMatcher<_TraitsT, __icase, __collate>& __matcher)
{
if (_M_match_token(_ScannerT::_S_token_collsymbol))
__matcher._M_add_collating_element(_M_value);
__matcher._M_add_equivalence_class(_M_value);
else if (_M_match_token(_ScannerT::_S_token_char_class_name))
__matcher._M_add_character_class(_M_value, false);
- else if (_M_try_char()) // [a
+ // POSIX doesn't permit '-' as a start-range char (say [a-z--0]),
+ // except when the '-' is the first character in the bracket expression
+ // ([--0]). ECMAScript treats all '-' after a range as a normal character.
+ // Also see above, where _M_expression_term gets called.
+ //
+ // As a result, POSIX rejects [-----], but ECMAScript doesn't.
+ // Boost (1.57.0) always uses POSIX style even in its ECMAScript syntax.
+ // Clang (3.5) always uses ECMAScript style even in its POSIX syntax.
+ //
+ // It turns out that no one reads BNFs ;)
+ else if (_M_try_char())
{
- auto __ch = _M_value[0];
- if (_M_try_char())
+ if (!__last_char.first)
+ {
+ if (_M_value[0] == '-'
+ && !(_M_flags & regex_constants::ECMAScript))
+ __throw_regex_error(regex_constants::error_range);
+ __matcher._M_add_char(_M_value[0]);
+ __last_char.first = true;
+ __last_char.second = _M_value[0];
+ }
+ else
{
- if (_M_value[0] == '-') // [a-
+ if (_M_value[0] == '-')
{
- if (_M_try_char()) // [a-z]
+ if (_M_try_char())
{
- __matcher._M_make_range(__ch, _M_value[0]);
- return;
+ __matcher._M_make_range(__last_char.second , _M_value[0]);
+ __last_char.first = false;
+ }
+ else
+ {
+ if (_M_scanner._M_get_token()
+ != _ScannerT::_S_token_bracket_end)
+ __throw_regex_error(regex_constants::error_range);
+ __matcher._M_add_char(_M_value[0]);
}
- // If the dash is the last character in the bracket
- // expression, it is not special.
- if (_M_scanner._M_get_token()
- != _ScannerT::_S_token_bracket_end)
- __throw_regex_error(regex_constants::error_range);
}
- __matcher._M_add_char(_M_value[0]);
+ else
+ {
+ __matcher._M_add_char(_M_value[0]);
+ __last_char.second = _M_value[0];
+ }
}
- __matcher._M_add_char(__ch);
}
else if (_M_match_token(_ScannerT::_S_token_quoted_class))
__matcher._M_add_character_class(_M_value,
_BracketMatcher<_TraitsT, __icase, __collate>::
_M_apply(_CharT __ch, false_type) const
{
- bool __ret = false;
- if (std::find(_M_char_set.begin(), _M_char_set.end(),
- _M_translator._M_translate(__ch))
- != _M_char_set.end())
- __ret = true;
- else
+ bool __ret = std::binary_search(_M_char_set.begin(), _M_char_set.end(),
+ _M_translator._M_translate(__ch));
+ if (!__ret)
{
auto __s = _M_translator._M_transform(__ch);
for (auto& __it : _M_range_set)
projects / gcc.git / blobdiff