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

Abuse Filter Parser updates:

Browse source 
* Use strcspn to scan ahead for long regions of uninteresting text in string handling (performance).
* Remove cruft specific to my system in phpTest.php.
* Remove a test that was in incorrect syntax, and useless without adding variable support.
This commit is contained in:
Andrew Garrett 2009-02-11 18:23:21 +00:00
parent bfe57be65d
commit 0880f444b1
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
AbuseFilter.parser.php
View file

@ -743,7 +743,13 @@ class AbuseFilterParser {
return array( $tok, AFPToken::TString, $code, $offset );
}
if( $code[$offset] == '\\' ) {
// Performance: Use a PHP function (implemented in C)
// to scan ahead.
$addLength = strcspn( $code, $type."\\", $offset );
if ($addLength) {
$tok .= substr( $code, $offset, $addLength );
$offset += $addLength;
} elseif( $code[$offset] == '\\' ) {
if( $code[$offset + 1] == '\\' )
$tok .= '\\';
elseif( $code[$offset + 1] == $type )
@ -893,10 +899,6 @@ class AbuseFilterParser {
'unrecognisedtoken', $offset, array( substr( $code, $offset ) ) );
}
protected static function isDigitOrDot( $chr ) {
return ctype_alnum( $chr ) || $chr == '.';
}
protected static function isValidIdSymbol( $chr ) {
return ctype_alnum( $chr ) || $chr == '_';
}

12
phpTest.php
View file

@ -4,7 +4,10 @@
* Runs tests against the PHP parser.
*/
require( '/home/andrew/mediawiki/maintenance/commandLine.inc' );
require_once ( getenv('MW_INSTALL_PATH') !== false
? getenv('MW_INSTALL_PATH')."/maintenance/commandLine.inc"
: dirname( __FILE__ ) . '/../../maintenance/commandLine.inc' );
$tester = new AbuseFilterParser;
wfLoadExtensionMessages( 'AbuseFilter' );
@ -16,9 +19,6 @@ $check = 0;
$pass = 0;
foreach( $tests as $test ) {
if( in_string( 'whitespace.t', $test ) )
continue; // Skip it. Or add preset variables support to the parser
$result = substr($test,0,-2).".r";
$rule = trim(file_get_contents( $test ));
@ -45,6 +45,10 @@ foreach( $tests as $test ) {
}
} catch (AFPException $excep) {
print "-FAILED - exception ".$excep->getMessage()." with input $rule\n";
// export
$vars = var_export( $tester->mTokens, true );
file_put_contents( $test.'.parsed', $vars );
}
}

2
tests/whitespace.t
View file

@ -1,2 +0,0 @@
1 == FOO
FOO=1