X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=languages%2Futils%2FCLDRPluralRuleEvaluator.php;h=7e7208aa9daab9817ac56f5a1be13404f2209042;hb=d78b4eeff8cdf47ba6f5da1257c4a6e9de688316;hp=61ab947b326a87c84ab93f057b1c352085208802;hpb=712aaa6269f370bf21abb080cf5acb05711fef4c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/utils/CLDRPluralRuleEvaluator.php b/languages/utils/CLDRPluralRuleEvaluator.php
index 61ab947b32..7e7208aa9d 100644
--- a/languages/utils/CLDRPluralRuleEvaluator.php
+++ b/languages/utils/CLDRPluralRuleEvaluator.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Parse and evaluate a plural rule.
  *
@@ -30,7 +31,6 @@
  * @file
  * @since 1.20
  */
-
 class CLDRPluralRuleEvaluator {
 	/**
 	 * Evaluate a number against a set of plural rules. If a rule passes,
@@ -42,6 +42,7 @@ class CLDRPluralRuleEvaluator {
 	 */
 	public static function evaluate( $number, array $rules ) {
 		$rules = self::compile( $rules );
+
 		return self::evaluateCompiled( $number, $rules );
 	}
 
@@ -58,6 +59,7 @@ class CLDRPluralRuleEvaluator {
 		foreach ( $rules as &$rule ) {
 			$rule = CLDRPluralRuleConverter::convert( $rule );
 		}
+
 		return $rules;
 	}
 
@@ -75,6 +77,7 @@ class CLDRPluralRuleEvaluator {
 		$number = strval( $number );
 		if ( !preg_match( '/^ -? ( ([0-9]+) (?: \. ([0-9]+) )? )$/x', $number, $m ) ) {
 			wfDebug( __METHOD__ . ": invalid number input, returning 'other'\n" );
+
 			return count( $rules );
 		}
 		if ( !isset( $m[3] ) ) {
@@ -139,8 +142,8 @@ class CLDRPluralRuleEvaluator {
 	 */
 	private static function doOperation( $token, $left, $right ) {
 		if ( in_array( $token, array( 'in', 'not-in', 'within', 'not-within' ) ) ) {
-			if ( !( $right instanceof CLDRPluralRuleEvaluator_Range ) ) {
-				$right = new CLDRPluralRuleEvaluator_Range( $right );
+			if ( !( $right instanceof CLDRPluralRuleEvaluatorRange ) ) {
+				$right = new CLDRPluralRuleEvaluatorRange( $right );
 			}
 		}
 		switch ( $token ) {
@@ -164,17 +167,19 @@ class CLDRPluralRuleEvaluator {
 				if ( is_int( $left ) ) {
 					return (int)fmod( $left, $right );
 				}
+
 				return fmod( $left, $right );
 			case ',':
-				if ( $left instanceof CLDRPluralRuleEvaluator_Range ) {
+				if ( $left instanceof CLDRPluralRuleEvaluatorRange ) {
 					$range = $left;
 				} else {
-					$range = new CLDRPluralRuleEvaluator_Range( $left );
+					$range = new CLDRPluralRuleEvaluatorRange( $left );
 				}
 				$range->add( $right );
+
 				return $range;
 			case '..':
-				return new CLDRPluralRuleEvaluator_Range( $left, $right );
+				return new CLDRPluralRuleEvaluatorRange( $left, $right );
 			default:
 				throw new CLDRPluralRuleError( "Invalid RPN token" );
 		}