wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-23 21:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add a function to the parser to retrieve the next token"

Browse source
This commit is contained in:
jenkins-bot 2019-03-23 11:10:44 +00:00 committed by Gerrit Code Review
parent f375835ff2 27545422b4
commit 7a6468fa29
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
includes/parser/AbuseFilterParser.php
View file

@ -120,6 +120,16 @@ class AbuseFilterParser {
list( $this->mCur, $this->mPos ) = $this->mTokens[$this->mPos];
}
/**
* Get the next token. This is similar to move() but doesn't change class members,
* allowing to look ahead without rolling back the state.
*
* @return AFPToken
*/
protected function getNextToken() {
return $this->mTokens[$this->mPos][0];
}
/**
* getState() function allows parser state to be rollbacked to several tokens back
* @return AFPParserState
@ -685,15 +695,15 @@ class AbuseFilterParser {
}
$args = [];
$state = $this->getState();
$this->move();
if ( $this->mCur->type !== AFPToken::TBRACE || $this->mCur->value !== ')' ) {
$this->setState( $state );
$next = $this->getNextToken();
if ( $next->type !== AFPToken::TBRACE || $next->value !== ')' ) {
do {
$r = new AFPData();
$this->doLevelSemicolon( $r );
$args[] = $r;
} while ( $this->mCur->type === AFPToken::TCOMMA );
} else {
$this->move();
}
if ( $this->mCur->type !== AFPToken::TBRACE || $this->mCur->value !== ')' ) {
@ -738,15 +748,13 @@ class AbuseFilterParser {
switch ( $this->mCur->type ) {
case AFPToken::TID:
if ( $this->mShortCircuit ) {
$prev = $this->getState();
$this->move();
if ( $this->mCur->type === AFPToken::TSQUAREBRACKET && $this->mCur->value === '[' ) {
$next = $this->getNextToken();
if ( $next->type === AFPToken::TSQUAREBRACKET && $next->value === '[' ) {
// If the variable represented by $tok is an array, don't break already: $result
// would be null and null[idx] will throw. Instead, skip the whole element (T204841)
$this->move();
$idx = new AFPData();
$this->doLevelSemicolon( $idx );
} else {
$this->setState( $prev );
}
break;
}

2
includes/parser/AbuseFilterTokenizer.php
View file

@ -68,7 +68,7 @@ class AbuseFilterTokenizer {
/**
* @param string $code
* @return array
* @return array[]
* @throws AFPException
* @throws AFPUserVisibleException
*/