mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX php-peg E_STRICT fixes
This commit is contained in:
parent
2b8e14fdff
commit
0dd4d4386e
6
thirdparty/php-peg/Compiler.php
vendored
6
thirdparty/php-peg/Compiler.php
vendored
@ -273,7 +273,7 @@ class TokenLiteral extends TokenExpressionable {
|
|||||||
parent::__construct( 'literal', "'" . substr($value,1,-1) . "'" );
|
parent::__construct( 'literal', "'" . substr($value,1,-1) . "'" );
|
||||||
}
|
}
|
||||||
|
|
||||||
function match_code() {
|
function match_code( $value ) {
|
||||||
// We inline single-character matches for speed
|
// We inline single-character matches for speed
|
||||||
if ( !$this->contains_expression() && strlen( eval( 'return '. $this->value . ';' ) ) == 1 ) {
|
if ( !$this->contains_expression() && strlen( eval( 'return '. $this->value . ';' ) ) == 1 ) {
|
||||||
return $this->match_fail_conditional( 'substr($this->string,$this->pos,1) == '.$this->value,
|
return $this->match_fail_conditional( 'substr($this->string,$this->pos,1) == '.$this->value,
|
||||||
@ -298,7 +298,7 @@ class TokenRegex extends TokenExpressionable {
|
|||||||
parent::__construct('rx', self::escape($value));
|
parent::__construct('rx', self::escape($value));
|
||||||
}
|
}
|
||||||
|
|
||||||
function match_code() {
|
function match_code( $value ) {
|
||||||
return parent::match_code("'{$this->value}'");
|
return parent::match_code("'{$this->value}'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -309,7 +309,7 @@ class TokenWhitespace extends TokenTerminal {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Call recursion indirectly */
|
/* Call recursion indirectly */
|
||||||
function match_code() {
|
function match_code( $value ) {
|
||||||
$code = parent::match_code( '' ) ;
|
$code = parent::match_code( '' ) ;
|
||||||
return $this->value ? $code->replace( array( 'FAIL' => NULL )) : $code ;
|
return $this->value ? $code->replace( array( 'FAIL' => NULL )) : $code ;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user