From: Siebrand Mazeland Date: Mon, 21 Apr 2014 17:23:37 +0000 (+0200) Subject: Remove underscore from classes CLDRPluralRule* X-Git-Tag: 1.31.0-rc.0~16122^2 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=603a35fc4e2b9ff7ecff59bb54714c6e28fdfd27;ds=sidebyside 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 --- diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index 500d19f832..fd422faaf3 100644 --- a/RELEASE-NOTES-1.24 +++ b/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. diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index baa95013ae..34e374307c 100644 --- a/includes/AutoLoader.php +++ b/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 diff --git a/languages/utils/CLDRPluralRuleConverter.php b/languages/utils/CLDRPluralRuleConverter.php index 65d57e0d38..50a22c9c1b 100644 --- a/languages/utils/CLDRPluralRuleConverter.php +++ b/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 ); } /** diff --git a/languages/utils/CLDRPluralRuleConverterExpression.php b/languages/utils/CLDRPluralRuleConverterExpression.php new file mode 100644 index 0000000000..2373807509 --- /dev/null +++ b/languages/utils/CLDRPluralRuleConverterExpression.php @@ -0,0 +1,41 @@ +type = $type; + $this->rpn = $rpn; + } + + public function isType( $type ) { + if ( $type === 'range' && ( $this->type === 'range' || $this->type === 'number' ) ) { + return true; + } + if ( $type === $this->type ) { + return true; + } + return false; + } +} diff --git a/languages/utils/CLDRPluralRuleConverterFragment.php b/languages/utils/CLDRPluralRuleConverterFragment.php new file mode 100644 index 0000000000..89ada4f28f --- /dev/null +++ b/languages/utils/CLDRPluralRuleConverterFragment.php @@ -0,0 +1,35 @@ +parser = $parser; + $this->pos = $pos; + $this->length = $length; + $this->end = $pos + $length; + } + + public function error( $message ) { + $text = $this->getText(); + throw new CLDRPluralRuleError( "$message at position " . ( $this->pos + 1 ) . ": \"$text\"" ); + } + + public function getText() { + return substr( $this->parser->rule, $this->pos, $this->length ); + } +} diff --git a/languages/utils/CLDRPluralRuleConverterOperator.php b/languages/utils/CLDRPluralRuleConverterOperator.php new file mode 100644 index 0000000000..2824fc62ae --- /dev/null +++ b/languages/utils/CLDRPluralRuleConverterOperator.php @@ -0,0 +1,114 @@ + 'bbb', + 'and' => 'bbb', + 'is' => 'nnb', + 'is-not' => 'nnb', + 'in' => 'nrb', + 'not-in' => 'nrb', + 'within' => 'nrb', + 'not-within' => 'nrb', + 'mod' => 'nnn', + ',' => 'rrr', + '..' => 'nnr', + ); + + /** + * Map converting from the abbrevation to the full form. + * + * @var array + */ + static $typeSpecMap = array( + 'b' => 'boolean', + 'n' => 'number', + 'r' => 'range', + ); + + /** + * Map for converting the new operators introduced in Rev 33 to the old forms + */ + static $aliasMap = array( + '%' => 'mod', + '!=' => 'not-in', + '=' => 'in' + ); + + /** + * Initialize a new instance of a CLDRPluralRuleConverterOperator object + * + * @param CLDRPluralRuleConverter $parser The parser + * @param string $name The operator name + * @param int $pos The length + * @param int $length + */ + function __construct( $parser, $name, $pos, $length ) { + parent::__construct( $parser, $pos, $length ); + if ( isset( self::$aliasMap[$name] ) ) { + $name = self::$aliasMap[$name]; + } + $this->name = $name; + } + + /** + * Compute 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]; + + $leftType = self::$typeSpecMap[$typeSpec[0]]; + $rightType = self::$typeSpecMap[$typeSpec[1]]; + $resultType = self::$typeSpecMap[$typeSpec[2]]; + + $start = min( $this->pos, $left->pos, $right->pos ); + $end = max( $this->end, $left->end, $right->end ); + $length = $end - $start; + + $newExpr = new CLDRPluralRuleConverterExpression( $this->parser, $resultType, + "{$left->rpn} {$right->rpn} {$this->name}", + $start, $length ); + + if ( !$left->isType( $leftType ) ) { + $newExpr->error( "invalid type for left operand: expected $leftType, got {$left->type}" ); + } + + if ( !$right->isType( $rightType ) ) { + $newExpr->error( "invalid type for right operand: expected $rightType, got {$right->type}" ); + } + return $newExpr; + } +} diff --git a/languages/utils/CLDRPluralRuleConverter_Expression.php b/languages/utils/CLDRPluralRuleConverter_Expression.php deleted file mode 100644 index 8352e725dc..0000000000 --- a/languages/utils/CLDRPluralRuleConverter_Expression.php +++ /dev/null @@ -1,41 +0,0 @@ -type = $type; - $this->rpn = $rpn; - } - - public function isType( $type ) { - if ( $type === 'range' && ( $this->type === 'range' || $this->type === 'number' ) ) { - return true; - } - if ( $type === $this->type ) { - return true; - } - return false; - } -} diff --git a/languages/utils/CLDRPluralRuleConverter_Fragment.php b/languages/utils/CLDRPluralRuleConverter_Fragment.php deleted file mode 100644 index 88795a0bee..0000000000 --- a/languages/utils/CLDRPluralRuleConverter_Fragment.php +++ /dev/null @@ -1,35 +0,0 @@ -parser = $parser; - $this->pos = $pos; - $this->length = $length; - $this->end = $pos + $length; - } - - public function error( $message ) { - $text = $this->getText(); - throw new CLDRPluralRuleError( "$message at position " . ( $this->pos + 1 ) . ": \"$text\"" ); - } - - public function getText() { - return substr( $this->parser->rule, $this->pos, $this->length ); - } -} diff --git a/languages/utils/CLDRPluralRuleConverter_Operator.php b/languages/utils/CLDRPluralRuleConverter_Operator.php deleted file mode 100644 index c42953c70f..0000000000 --- a/languages/utils/CLDRPluralRuleConverter_Operator.php +++ /dev/null @@ -1,114 +0,0 @@ - 'bbb', - 'and' => 'bbb', - 'is' => 'nnb', - 'is-not' => 'nnb', - 'in' => 'nrb', - 'not-in' => 'nrb', - 'within' => 'nrb', - 'not-within' => 'nrb', - 'mod' => 'nnn', - ',' => 'rrr', - '..' => 'nnr', - ); - - /** - * Map converting from the abbrevation to the full form. - * - * @var array - */ - static $typeSpecMap = array( - 'b' => 'boolean', - 'n' => 'number', - 'r' => 'range', - ); - - /** - * Map for converting the new operators introduced in Rev 33 to the old forms - */ - static $aliasMap = array( - '%' => 'mod', - '!=' => 'not-in', - '=' => 'in' - ); - - /** - * Initialize a new instance of a CLDRPluralRuleConverter_Operator object - * - * @param CLDRPluralRuleConverter $parser The parser - * @param string $name The operator name - * @param int $pos The length - * @param int $length - */ - function __construct( $parser, $name, $pos, $length ) { - parent::__construct( $parser, $pos, $length ); - if ( isset( self::$aliasMap[$name] ) ) { - $name = self::$aliasMap[$name]; - } - $this->name = $name; - } - - /** - * 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 - */ - public function operate( $left, $right ) { - $typeSpec = self::$opTypes[$this->name]; - - $leftType = self::$typeSpecMap[$typeSpec[0]]; - $rightType = self::$typeSpecMap[$typeSpec[1]]; - $resultType = self::$typeSpecMap[$typeSpec[2]]; - - $start = min( $this->pos, $left->pos, $right->pos ); - $end = max( $this->end, $left->end, $right->end ); - $length = $end - $start; - - $newExpr = new CLDRPluralRuleConverter_Expression( $this->parser, $resultType, - "{$left->rpn} {$right->rpn} {$this->name}", - $start, $length ); - - if ( !$left->isType( $leftType ) ) { - $newExpr->error( "invalid type for left operand: expected $leftType, got {$left->type}" ); - } - - if ( !$right->isType( $rightType ) ) { - $newExpr->error( "invalid type for right operand: expected $rightType, got {$right->type}" ); - } - return $newExpr; - } -} diff --git a/languages/utils/CLDRPluralRuleEvaluator.php b/languages/utils/CLDRPluralRuleEvaluator.php index 61ab947b32..878982dc09 100644 --- a/languages/utils/CLDRPluralRuleEvaluator.php +++ b/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" ); } diff --git a/languages/utils/CLDRPluralRuleEvaluatorRange.php b/languages/utils/CLDRPluralRuleEvaluatorRange.php new file mode 100644 index 0000000000..8f8945a451 --- /dev/null +++ b/languages/utils/CLDRPluralRuleEvaluatorRange.php @@ -0,0 +1,108 @@ +parts[] = $start; + } else { + $this->parts[] = array( $start, $end ); + } + } + + /** + * Determine if the given number is inside the range. + * + * @param int $number The number to check + * @param bool $integerConstraint If true, also asserts the number is an integer; otherwise, number simply has to be inside the range. + * @return bool True if the number is inside the range; otherwise, false. + */ + function isNumberIn( $number, $integerConstraint = true ) { + foreach ( $this->parts as $part ) { + if ( is_array( $part ) ) { + if ( ( !$integerConstraint || floor( $number ) === (float)$number ) + && $number >= $part[0] && $number <= $part[1] + ) { + return true; + } + } else { + if ( $number == $part ) { + return true; + } + } + } + return false; + } + + /** + * Readable alias for isNumberIn( $number, false ), and the implementation + * of the "within" operator. + * + * @param int $number The number to check + * @return bool True if the number is inside the range; otherwise, false. + */ + function isNumberWithin( $number ) { + return $this->isNumberIn( $number, false ); + } + + /** + * Add another part to this range. + * + * @param CLDRPluralRuleEvaluatorRange|int $other The part to add, either + * a range object itself or a single number. + */ + function add( $other ) { + if ( $other instanceof self ) { + $this->parts = array_merge( $this->parts, $other->parts ); + } else { + $this->parts[] = $other; + } + } + + /** + * Returns the string representation of the rule evaluator range. + * The purpose of this method is to help debugging. + * + * @return string The string representation of the rule evaluator range + */ + function __toString() { + $s = 'Range('; + foreach ( $this->parts as $i => $part ) { + if ( $i ) { + $s .= ', '; + } + if ( is_array( $part ) ) { + $s .= $part[0] . '..' . $part[1]; + } else { + $s .= $part; + } + } + $s .= ')'; + return $s; + } + +} diff --git a/languages/utils/CLDRPluralRuleEvaluator_Range.php b/languages/utils/CLDRPluralRuleEvaluator_Range.php deleted file mode 100644 index 9732b8da81..0000000000 --- a/languages/utils/CLDRPluralRuleEvaluator_Range.php +++ /dev/null @@ -1,108 +0,0 @@ -parts[] = $start; - } else { - $this->parts[] = array( $start, $end ); - } - } - - /** - * Determine if the given number is inside the range. - * - * @param int $number The number to check - * @param bool $integerConstraint If true, also asserts the number is an integer; otherwise, number simply has to be inside the range. - * @return bool True if the number is inside the range; otherwise, false. - */ - function isNumberIn( $number, $integerConstraint = true ) { - foreach ( $this->parts as $part ) { - if ( is_array( $part ) ) { - if ( ( !$integerConstraint || floor( $number ) === (float)$number ) - && $number >= $part[0] && $number <= $part[1] - ) { - return true; - } - } else { - if ( $number == $part ) { - return true; - } - } - } - return false; - } - - /** - * Readable alias for isNumberIn( $number, false ), and the implementation - * of the "within" operator. - * - * @param int $number The number to check - * @return bool True if the number is inside the range; otherwise, false. - */ - function isNumberWithin( $number ) { - return $this->isNumberIn( $number, false ); - } - - /** - * Add another part to this range. - * - * @param CLDRPluralRuleEvaluator_Range|int $other The part to add, either - * a range object itself or a single number. - */ - function add( $other ) { - if ( $other instanceof self ) { - $this->parts = array_merge( $this->parts, $other->parts ); - } else { - $this->parts[] = $other; - } - } - - /** - * Returns the string representation of the rule evaluator range. - * The purpose of this method is to help debugging. - * - * @return string The string representation of the rule evaluator range - */ - function __toString() { - $s = 'Range('; - foreach ( $this->parts as $i => $part ) { - if ( $i ) { - $s .= ', '; - } - if ( is_array( $part ) ) { - $s .= $part[0] . '..' . $part[1]; - } else { - $s .= $part; - } - } - $s .= ')'; - return $s; - } - -}