Remove underscore from classes CLDRPluralRule*

Part of program to remove underscores from class names. Checked core and 675
extensions for occurrences. All uses are in core in core are updated in this
patch. There are no uses in Gerrit extensions.

Change-Id: Id3ff16710a11ce1909a83b58505b250736a073e8

RELEASE-NOTES-1.24

@@ -33,6 +33,12 @@ changes to languages because of Bugzilla reports.
 * The Special:Search hooks SpecialSearchGo and SpecialSearchResultsAppend
   were removed as they were unused.
 
+==== Renamed classes ====
+* CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression
+* CLDRPluralRuleConverter_Fragment to CLDRPluralRuleConverterFragment
+* CLDRPluralRuleConverter_Operator to CLDRPluralRuleConverterOperator
+* CLDRPluralRuleEvaluator_Range to CLDRPluralRuleEvaluatorRange
+
 == Compatibility ==
 
 MediaWiki 1.24 requires PHP 5.3.2 or later.

includes/AutoLoader.php

@@ -1125,11 +1125,11 @@ $wgAutoloadLocalClasses = array(
 	'Language' => 'languages/Language.php',
 	'LanguageConverter' => 'languages/LanguageConverter.php',
 	'CLDRPluralRuleConverter' => 'languages/utils/CLDRPluralRuleConverter.php',
-	'CLDRPluralRuleConverter_Expression' => 'languages/utils/CLDRPluralRuleConverter_Expression.php',
-	'CLDRPluralRuleConverter_Fragment' => 'languages/utils/CLDRPluralRuleConverter_Fragment.php',
-	'CLDRPluralRuleConverter_Operator' => 'languages/utils/CLDRPluralRuleConverter_Operator.php',
+	'CLDRPluralRuleConverterExpression' => 'languages/utils/CLDRPluralRuleConverterExpression.php',
+	'CLDRPluralRuleConverterFragment' => 'languages/utils/CLDRPluralRuleConverterFragment.php',
+	'CLDRPluralRuleConverterOperator' => 'languages/utils/CLDRPluralRuleConverterOperator.php',
 	'CLDRPluralRuleEvaluator' => 'languages/utils/CLDRPluralRuleEvaluator.php',
-	'CLDRPluralRuleEvaluator_Range' => 'languages/utils/CLDRPluralRuleEvaluator_Range.php',
+	'CLDRPluralRuleEvaluatorRange' => 'languages/utils/CLDRPluralRuleEvaluatorRange.php',
 	'CLDRPluralRuleError' => 'languages/utils/CLDRPluralRuleError.php',
 
 	# maintenance

languages/utils/CLDRPluralRuleConverter.php

@@ -119,13 +119,13 @@ class CLDRPluralRuleConverter {
 
 		// Iterate through all tokens, saving the operators and operands to a
 		// stack per Dijkstra's shunting yard algorithm.
-		/** @var CLDRPluralRuleConverter_Operator $token */
+		/** @var CLDRPluralRuleConverterOperator $token */
 		while ( false !== ( $token = $this->nextToken() ) ) {
 			// In this grammar, there are only binary operators, so every valid
 			// rule string will alternate between operator and operand tokens.
 			$expectOperator = !$expectOperator;
 
-			if ( $token instanceof CLDRPluralRuleConverter_Expression ) {
+			if ( $token instanceof CLDRPluralRuleConverterExpression ) {
 				// Operand
 				if ( $expectOperator ) {
 					$token->error( 'unexpected operand' );
@@ -172,7 +172,7 @@ class CLDRPluralRuleConverter {
 	/**
 	 * Fetch the next token from the input string.
 	 *
-	 * @return CLDRPluralRuleConverter_Fragment The next token
+	 * @return CLDRPluralRuleConverterFragment The next token
 	 */
 	protected function nextToken() {
 		if ( $this->pos >= $this->end ) {
@@ -269,7 +269,7 @@ class CLDRPluralRuleConverter {
 	 * a fragment with rpn and type members describing the result of that
 	 * operation.
 	 *
-	 * @param CLDRPluralRuleConverter_Operator $op
+	 * @param CLDRPluralRuleConverterOperator $op
 	 */
 	protected function doOperation( $op ) {
 		if ( count( $this->operands ) < 2 ) {
@@ -286,10 +286,10 @@ class CLDRPluralRuleConverter {
 	 *
 	 * @param string $text
 	 * @param int $pos
-	 * @return CLDRPluralRuleConverter_Expression The numerical expression
+	 * @return CLDRPluralRuleConverterExpression The numerical expression
 	 */
 	protected function newNumber( $text, $pos ) {
-		return new CLDRPluralRuleConverter_Expression( $this, 'number', $text, $pos, strlen( $text ) );
+		return new CLDRPluralRuleConverterExpression( $this, 'number', $text, $pos, strlen( $text ) );
 	}
 
 	/**
@@ -298,10 +298,10 @@ class CLDRPluralRuleConverter {
 	 * @param string $type
 	 * @param int $pos
 	 * @param int $length
-	 * @return CLDRPluralRuleConverter_Operator The operator
+	 * @return CLDRPluralRuleConverterOperator The operator
 	 */
 	protected function newOperator( $type, $pos, $length ) {
-		return new CLDRPluralRuleConverter_Operator( $this, $type, $pos, $length );
+		return new CLDRPluralRuleConverterOperator( $this, $type, $pos, $length );
 	}
 
 	/**

languages/utils/CLDRPluralRuleConverterExpression.php

@@ -16,7 +16,7 @@
  * messages), the RPN notation used to evaluate it, and the result type for
  * validation.
  */
-class CLDRPluralRuleConverter_Expression extends CLDRPluralRuleConverter_Fragment {
+class CLDRPluralRuleConverterExpression extends CLDRPluralRuleConverterFragment {
 	/** @var string */
 	public $type;
 

languages/utils/CLDRPluralRuleConverterFragment.php

@@ -14,7 +14,7 @@
  * Helper for CLDRPluralRuleConverter.
  * The base class for operators and expressions, describing a region of the input string.
  */
-class CLDRPluralRuleConverter_Fragment {
+class CLDRPluralRuleConverterFragment {
 	public $parser, $pos, $length, $end;
 
 	function __construct( $parser, $pos, $length ) {

languages/utils/CLDRPluralRuleConverterOperator.php

@@ -15,7 +15,7 @@
  * An operator object, representing a region of the input string (for error
  * messages), and the binary operator at that location.
  */
-class CLDRPluralRuleConverter_Operator extends CLDRPluralRuleConverter_Fragment {
+class CLDRPluralRuleConverterOperator extends CLDRPluralRuleConverterFragment {
 	/** @var string The name */
 	public $name;
 
@@ -65,7 +65,7 @@ class CLDRPluralRuleConverter_Operator extends CLDRPluralRuleConverter_Fragment
 	);
 
 	/**
-	 * Initialize a new instance of a CLDRPluralRuleConverter_Operator object
+	 * Initialize a new instance of a CLDRPluralRuleConverterOperator object
 	 *
 	 * @param CLDRPluralRuleConverter $parser The parser
 	 * @param string $name The operator name
@@ -83,9 +83,9 @@ class CLDRPluralRuleConverter_Operator extends CLDRPluralRuleConverter_Fragment
 	/**
 	 * Compute the operation
 	 *
-	 * @param CLDRPluralRuleConverter_Expression $left The left part of the expression
-	 * @param CLDRPluralRuleConverter_Expression $right The right part of the expression
-	 * @return CLDRPluralRuleConverter_Expression The result of the operation
+	 * @param CLDRPluralRuleConverterExpression $left The left part of the expression
+	 * @param CLDRPluralRuleConverterExpression $right The right part of the expression
+	 * @return CLDRPluralRuleConverterExpression The result of the operation
 	 */
 	public function operate( $left, $right ) {
 		$typeSpec = self::$opTypes[$this->name];
@@ -98,7 +98,7 @@ class CLDRPluralRuleConverter_Operator extends CLDRPluralRuleConverter_Fragment
 		$end = max( $this->end, $left->end, $right->end );
 		$length = $end - $start;
 
-		$newExpr = new CLDRPluralRuleConverter_Expression( $this->parser, $resultType,
+		$newExpr = new CLDRPluralRuleConverterExpression( $this->parser, $resultType,
 			"{$left->rpn} {$right->rpn} {$this->name}",
 			$start, $length );
 

languages/utils/CLDRPluralRuleEvaluator.php

@@ -139,8 +139,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 ) {
@@ -166,15 +166,15 @@ class CLDRPluralRuleEvaluator {
 				}
 				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" );
 		}

languages/utils/CLDRPluralRuleEvaluatorRange.php

@@ -12,7 +12,7 @@
 /**
  * Evaluator helper class representing a range list.
  */
-class CLDRPluralRuleEvaluator_Range {
+class CLDRPluralRuleEvaluatorRange {
 	/**
 	 * The parts
 	 *
@@ -21,7 +21,7 @@ class CLDRPluralRuleEvaluator_Range {
 	public $parts = array();
 
 	/**
-	 * Initialize a new instance of CLDRPluralRuleEvaluator_Range
+	 * Initialize a new instance of CLDRPluralRuleEvaluatorRange
 	 *
 	 * @param int $start The start of the range
 	 * @param int|bool $end The end of the range, or false if the range is not bounded.
@@ -72,7 +72,7 @@ class CLDRPluralRuleEvaluator_Range {
 	/**
 	 * Add another part to this range.
 	 *
-	 * @param CLDRPluralRuleEvaluator_Range|int $other The part to add, either
+	 * @param CLDRPluralRuleEvaluatorRange|int $other The part to add, either
 	 *   a range object itself or a single number.
 	 */
 	function add( $other ) {