Permalink
Browse files

Merge pull request #61 from 9072997/master

Group name must start with a non-digit in PCRE 8.34+
  • Loading branch information...
2 parents d8d169d + 8a4e507 commit e991874f444b6015675b6f73506d3ad29031b984 @hxw hxw committed May 4, 2016
@@ -542,7 +542,9 @@ function getBaseRegex() {
$magic = MagicWord::get( $name );
$case = intval( $magic->isCaseSensitive() );
foreach ( $magic->getSynonyms() as $i => $syn ) {
- $group = "(?P<{$i}_{$name}>" . preg_quote( $syn, '/' ) . ')';
+ // Group name must start with a non-digit in PCRE 8.34+
+ $it = strtr( $i, '0123456789', 'abcdefghij' );
+ $group = "(?P<{$it}_{$name}>" . preg_quote( $syn, '/' ) . ')';
if ( $this->baseRegex[$case] === '' ) {
$this->baseRegex[$case] = $group;
} else {
@@ -96,7 +96,6 @@ simulate-makefile: simulate-files
simulate-makefile: simulate simulate-files qmake-project
cd "${SIMULATE_DIR}" && \
qmake CONFIG+="qt warn_on thread debug" \
- QMAKE_CXXFLAGS_WARN_ON+='-Werror' QMAKE_CFLAGS_WARN_ON+='-Werror' \
QMAKE_CXXFLAGS+='-DGRIFO_SIMULATOR=1' QMAKE_CFLAGS+='-DGRIFO_SIMULATOR=1' \
QMAKE_LIBS+='-lrt'

0 comments on commit e991874

Please sign in to comment.