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 "Allow if without else"

Browse source
This commit is contained in:
jenkins-bot 2019-08-20 20:12:19 +00:00 committed by Gerrit Code Review
parent 5e605aaa62 af7744781f
commit 47838715fa
6 changed files with 28 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/parser/AFPTreeNode.php
View file

@ -23,8 +23,8 @@ class AFPTreeNode {
const ARRAY_APPEND = 'ARRAY_APPEND';
// CONDITIONAL represents both a ternary operator and an if-then-else-end
// construct. The format is (condition, evaluated-if-true,
// evaluated-in-false), all tree nodes.
// construct. The format is (condition, evaluated-if-true, evaluated-in-false).
// The first two are tree nodes, the last one can be a node, or null if there's no else.
const CONDITIONAL = 'CONDITIONAL';
// LOGIC is a logic operator accepted by AFPData::boolOp. The format is

17
includes/parser/AFPTreeParser.php
View file

@ -236,19 +236,12 @@ class AFPTreeParser {
$valueIfTrue = $this->doLevelConditions();
if ( !( $this->mCur->type === AFPToken::TKEYWORD && $this->mCur->value === 'else' ) ) {
throw new AFPUserVisibleException( 'expectednotfound',
$this->mPos,
[
'else',
$this->mCur->type,
$this->mCur->value
]
);
if ( $this->mCur->type === AFPToken::TKEYWORD && $this->mCur->value === 'else' ) {
$this->move();
$valueIfFalse = $this->doLevelConditions();
} else {
$valueIfFalse = null;
}
$this->move();
$valueIfFalse = $this->doLevelConditions();
if ( !( $this->mCur->type === AFPToken::TKEYWORD && $this->mCur->value === 'end' ) ) {
throw new AFPUserVisibleException( 'expectednotfound',

9
includes/parser/AbuseFilterCachingParser.php
View file

@ -240,11 +240,16 @@ class AbuseFilterCachingParser extends AbuseFilterParser {
list( $condition, $valueIfTrue, $valueIfFalse ) = $node->children;
$condition = $this->evalNode( $condition );
if ( $condition->toBool() ) {
$this->discardWithHoisting( $valueIfFalse );
if ( $valueIfFalse !== null ) {
$this->discardWithHoisting( $valueIfFalse );
}
return $this->evalNode( $valueIfTrue );
} else {
$this->discardWithHoisting( $valueIfTrue );
return $this->evalNode( $valueIfFalse );
return $valueIfFalse !== null
? $this->evalNode( $valueIfFalse )
// We assume null as default if the else is missing
: new AFPData( AFPData::DNULL );
}
case AFPTreeNode::ASSIGNMENT:

29
includes/parser/AbuseFilterParser.php
View file

@ -508,7 +508,8 @@ class AbuseFilterParser {
$this->move();
$r1 = new AFPData( AFPData::DEMPTY );
$r2 = new AFPData( AFPData::DEMPTY );
// DNULL is assumed as default in case of a missing else
$r2 = new AFPData( AFPData::DNULL );
$isTrue = $result->toBool();
@ -520,24 +521,16 @@ class AbuseFilterParser {
$this->mShortCircuit = $scOrig;
}
if ( !( $this->mCur->type === AFPToken::TKEYWORD && $this->mCur->value === 'else' ) ) {
throw new AFPUserVisibleException( 'expectednotfound',
$this->mCur->pos,
[
'else',
$this->mCur->type,
$this->mCur->value
]
);
}
$this->move();
if ( $this->mCur->type === AFPToken::TKEYWORD && $this->mCur->value === 'else' ) {
$this->move();
if ( $isTrue ) {
$scOrig = wfSetVar( $this->mShortCircuit, $this->mAllowShort, true );
}
$this->doLevelConditions( $r2 );
if ( $isTrue ) {
$this->mShortCircuit = $scOrig;
if ( $isTrue ) {
$scOrig = wfSetVar( $this->mShortCircuit, $this->mAllowShort, true );
}
$this->doLevelConditions( $r2 );
if ( $isTrue ) {
$this->mShortCircuit = $scOrig;
}
}
if ( !( $this->mCur->type === AFPToken::TKEYWORD && $this->mCur->value === 'end' ) ) {

2
tests/parserTests/conditional-shortcircuit.t
View file

@ -57,8 +57,6 @@ false & (
var9 := 'foo';
if ( 1=== 1 ) then
( false & ( var9 := 'foobar' ) )
else
( 0 )
end;
var1 === 1 &

4
tests/parserTests/ifthen.t
View file

@ -1,2 +1,4 @@
(if 1 then 2 else 3 end) === 2 &
(if false then 2 else 3 end) === 3
(if false then 2 else 3 end) === 3 &
(if true then 3 end) === 3 &
(if false then 3 end) === null