Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

I18N: Add a class_exists() check to Plural_Forms class for consistency with other POMO library classes.

Browse Source 
Follow-up to [41722].

Fixes #50881.
Built from https://develop.svn.wordpress.org/trunk@48769


git-svn-id: http://core.svn.wordpress.org/trunk@48531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-08-10 11:33:09 +00:00
parent 18cd7519e1
commit 113acf42d5
2 changed files with 297 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

590
wp-includes/pomo/plural-forms.php
View File

@ -5,340 +5,342 @@
* *
* @since 4.9.0 * @since 4.9.0
*/ */
class Plural_Forms { if ( ! class_exists( 'Plural_Forms', false ) ) :
/** class Plural_Forms {
* Operator characters. /**
* * Operator characters.
* @since 4.9.0 *
* @var string OP_CHARS Operator characters. * @since 4.9.0
*/ * @var string OP_CHARS Operator characters.
const OP_CHARS = '|&><!=%?:'; */
const OP_CHARS = '|&><!=%?:';
/** /**
* Valid number characters. * Valid number characters.
* *
* @since 4.9.0 * @since 4.9.0
* @var string NUM_CHARS Valid number characters. * @var string NUM_CHARS Valid number characters.
*/ */
const NUM_CHARS = '0123456789'; const NUM_CHARS = '0123456789';
/** /**
* Operator precedence. * Operator precedence.
* *
* Operator precedence from highest to lowest. Higher numbers indicate * Operator precedence from highest to lowest. Higher numbers indicate
* higher precedence, and are executed first. * higher precedence, and are executed first.
* *
* @see https://en.wikipedia.org/wiki/Operators_in_C_and_C%2B%2B#Operator_precedence * @see https://en.wikipedia.org/wiki/Operators_in_C_and_C%2B%2B#Operator_precedence
* *
* @since 4.9.0 * @since 4.9.0
* @var array $op_precedence Operator precedence from highest to lowest. * @var array $op_precedence Operator precedence from highest to lowest.
*/ */
protected static $op_precedence = array( protected static $op_precedence = array(
'%' => 6, '%' => 6,
'<' => 5, '<' => 5,
'<=' => 5, '<=' => 5,
'>' => 5, '>' => 5,
'>=' => 5, '>=' => 5,
'==' => 4, '==' => 4,
'!=' => 4, '!=' => 4,
'&&' => 3, '&&' => 3,
'||' => 2, '||' => 2,
'?:' => 1, '?:' => 1,
'?' => 1, '?' => 1,
'(' => 0, '(' => 0,
')' => 0, ')' => 0,
); );
/** /**
* Tokens generated from the string. * Tokens generated from the string.
* *
* @since 4.9.0 * @since 4.9.0
* @var array $tokens List of tokens. * @var array $tokens List of tokens.
*/ */
protected $tokens = array(); protected $tokens = array();
/** /**
* Cache for repeated calls to the function. * Cache for repeated calls to the function.
* *
* @since 4.9.0 * @since 4.9.0
* @var array $cache Map of $n => $result * @var array $cache Map of $n => $result
*/ */
protected $cache = array(); protected $cache = array();
/** /**
* Constructor. * Constructor.
* *
* @since 4.9.0 * @since 4.9.0
* *
* @param string $str Plural function (just the bit after `plural=` from Plural-Forms) * @param string $str Plural function (just the bit after `plural=` from Plural-Forms)
*/ */
public function __construct( $str ) { public function __construct( $str ) {
$this->parse( $str ); $this->parse( $str );
} }
/** /**
* Parse a Plural-Forms string into tokens. * Parse a Plural-Forms string into tokens.
* *
* Uses the shunting-yard algorithm to convert the string to Reverse Polish * Uses the shunting-yard algorithm to convert the string to Reverse Polish
* Notation tokens. * Notation tokens.
* *
* @since 4.9.0 * @since 4.9.0
* *
* @param string $str String to parse. * @param string $str String to parse.
*/ */
protected function parse( $str ) { protected function parse( $str ) {
$pos = 0; $pos = 0;
$len = strlen( $str ); $len = strlen( $str );
// Convert infix operators to postfix using the shunting-yard algorithm. // Convert infix operators to postfix using the shunting-yard algorithm.
$output = array(); $output = array();
$stack = array(); $stack = array();
while ( $pos < $len ) { while ( $pos < $len ) {
$next = substr( $str, $pos, 1 ); $next = substr( $str, $pos, 1 );
switch ( $next ) { switch ( $next ) {
// Ignore whitespace. // Ignore whitespace.
case ' ': case ' ':
case "\t": case "\t":
$pos++; $pos++;
break;
// Variable (n).
case 'n':
$output[] = array( 'var' );
$pos++;
break;
// Parentheses.
case '(':
$stack[] = $next;
$pos++;
break;
case ')':
$found = false;
while ( ! empty( $stack ) ) {
$o2 = $stack[ count( $stack ) - 1 ];
if ( '(' !== $o2 ) {
$output[] = array( 'op', array_pop( $stack ) );
continue;
}
// Discard open paren.
array_pop( $stack );
$found = true;
break; break;
}
if ( ! $found ) { // Variable (n).
throw new Exception( 'Mismatched parentheses' ); case 'n':
} $output[] = array( 'var' );
$pos++;
break;
$pos++; // Parentheses.
break; case '(':
$stack[] = $next;
$pos++;
break;
// Operators. case ')':
case '|': $found = false;
case '&': while ( ! empty( $stack ) ) {
case '>': $o2 = $stack[ count( $stack ) - 1 ];
case '<': if ( '(' !== $o2 ) {
case '!': $output[] = array( 'op', array_pop( $stack ) );
case '=': continue;
case '%':
case '?':
$end_operator = strspn( $str, self::OP_CHARS, $pos );
$operator = substr( $str, $pos, $end_operator );
if ( ! array_key_exists( $operator, self::$op_precedence ) ) {
throw new Exception( sprintf( 'Unknown operator "%s"', $operator ) );
}
while ( ! empty( $stack ) ) {
$o2 = $stack[ count( $stack ) - 1 ];
// Ternary is right-associative in C.
if ( '?:' === $operator || '?' === $operator ) {
if ( self::$op_precedence[ $operator ] >= self::$op_precedence[ $o2 ] ) {
break;
} }
} elseif ( self::$op_precedence[ $operator ] > self::$op_precedence[ $o2 ] ) {
// Discard open paren.
array_pop( $stack );
$found = true;
break; break;
} }
$output[] = array( 'op', array_pop( $stack ) ); if ( ! $found ) {
} throw new Exception( 'Mismatched parentheses' );
$stack[] = $operator;
$pos += $end_operator;
break;
// Ternary "else".
case ':':
$found = false;
$s_pos = count( $stack ) - 1;
while ( $s_pos >= 0 ) {
$o2 = $stack[ $s_pos ];
if ( '?' !== $o2 ) {
$output[] = array( 'op', array_pop( $stack ) );
$s_pos--;
continue;
} }
// Replace. $pos++;
$stack[ $s_pos ] = '?:';
$found = true;
break; break;
}
if ( ! $found ) { // Operators.
throw new Exception( 'Missing starting "?" ternary operator' ); case '|':
} case '&':
$pos++; case '>':
break; case '<':
case '!':
case '=':
case '%':
case '?':
$end_operator = strspn( $str, self::OP_CHARS, $pos );
$operator = substr( $str, $pos, $end_operator );
if ( ! array_key_exists( $operator, self::$op_precedence ) ) {
throw new Exception( sprintf( 'Unknown operator "%s"', $operator ) );
}
// Default - number or invalid. while ( ! empty( $stack ) ) {
default: $o2 = $stack[ count( $stack ) - 1 ];
if ( $next >= '0' && $next <= '9' ) {
$span = strspn( $str, self::NUM_CHARS, $pos ); // Ternary is right-associative in C.
$output[] = array( 'value', intval( substr( $str, $pos, $span ) ) ); if ( '?:' === $operator || '?' === $operator ) {
$pos += $span; if ( self::$op_precedence[ $operator ] >= self::$op_precedence[ $o2 ] ) {
break;
}
} elseif ( self::$op_precedence[ $operator ] > self::$op_precedence[ $o2 ] ) {
break;
}
$output[] = array( 'op', array_pop( $stack ) );
}
$stack[] = $operator;
$pos += $end_operator;
break; break;
}
throw new Exception( sprintf( 'Unknown symbol "%s"', $next ) ); // Ternary "else".
} case ':':
} $found = false;
$s_pos = count( $stack ) - 1;
while ( $s_pos >= 0 ) {
$o2 = $stack[ $s_pos ];
if ( '?' !== $o2 ) {
$output[] = array( 'op', array_pop( $stack ) );
$s_pos--;
continue;
}
while ( ! empty( $stack ) ) { // Replace.
$o2 = array_pop( $stack ); $stack[ $s_pos ] = '?:';
if ( '(' === $o2 || ')' === $o2 ) { $found = true;
throw new Exception( 'Mismatched parentheses' ); break;
}
if ( ! $found ) {
throw new Exception( 'Missing starting "?" ternary operator' );
}
$pos++;
break;
// Default - number or invalid.
default:
if ( $next >= '0' && $next <= '9' ) {
$span = strspn( $str, self::NUM_CHARS, $pos );
$output[] = array( 'value', intval( substr( $str, $pos, $span ) ) );
$pos += $span;
break;
}
throw new Exception( sprintf( 'Unknown symbol "%s"', $next ) );
}
} }
$output[] = array( 'op', $o2 ); while ( ! empty( $stack ) ) {
$o2 = array_pop( $stack );
if ( '(' === $o2 || ')' === $o2 ) {
throw new Exception( 'Mismatched parentheses' );
}
$output[] = array( 'op', $o2 );
}
$this->tokens = $output;
} }
$this->tokens = $output; /**
} * Get the plural form for a number.
*
/** * Caches the value for repeated calls.
* Get the plural form for a number. *
* * @since 4.9.0
* Caches the value for repeated calls. *
* * @param int $num Number to get plural form for.
* @since 4.9.0 * @return int Plural form value.
* */
* @param int $num Number to get plural form for. public function get( $num ) {
* @return int Plural form value. if ( isset( $this->cache[ $num ] ) ) {
*/ return $this->cache[ $num ];
public function get( $num ) { }
if ( isset( $this->cache[ $num ] ) ) { $this->cache[ $num ] = $this->execute( $num );
return $this->cache[ $num ]; return $this->cache[ $num ];
} }
$this->cache[ $num ] = $this->execute( $num );
return $this->cache[ $num ];
}
/** /**
* Execute the plural form function. * Execute the plural form function.
* *
* @since 4.9.0 * @since 4.9.0
* *
* @param int $n Variable "n" to substitute. * @param int $n Variable "n" to substitute.
* @return int Plural form value. * @return int Plural form value.
*/ */
public function execute( $n ) { public function execute( $n ) {
$stack = array(); $stack = array();
$i = 0; $i = 0;
$total = count( $this->tokens ); $total = count( $this->tokens );
while ( $i < $total ) { while ( $i < $total ) {
$next = $this->tokens[ $i ]; $next = $this->tokens[ $i ];
$i++; $i++;
if ( 'var' === $next[0] ) { if ( 'var' === $next[0] ) {
$stack[] = $n; $stack[] = $n;
continue; continue;
} elseif ( 'value' === $next[0] ) { } elseif ( 'value' === $next[0] ) {
$stack[] = $next[1]; $stack[] = $next[1];
continue; continue;
}
// Only operators left.
switch ( $next[1] ) {
case '%':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 % $v2;
break;
case '||':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 || $v2;
break;
case '&&':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 && $v2;
break;
case '<':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 < $v2;
break;
case '<=':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 <= $v2;
break;
case '>':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 > $v2;
break;
case '>=':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 >= $v2;
break;
case '!=':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 != $v2;
break;
case '==':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 == $v2;
break;
case '?:':
$v3 = array_pop( $stack );
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 ? $v2 : $v3;
break;
default:
throw new Exception( sprintf( 'Unknown operator "%s"', $next[1] ) );
}
} }
// Only operators left. if ( count( $stack ) !== 1 ) {
switch ( $next[1] ) { throw new Exception( 'Too many values remaining on the stack' );
case '%':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 % $v2;
break;
case '||':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 || $v2;
break;
case '&&':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 && $v2;
break;
case '<':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 < $v2;
break;
case '<=':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 <= $v2;
break;
case '>':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 > $v2;
break;
case '>=':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 >= $v2;
break;
case '!=':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 != $v2;
break;
case '==':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 == $v2;
break;
case '?:':
$v3 = array_pop( $stack );
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 ? $v2 : $v3;
break;
default:
throw new Exception( sprintf( 'Unknown operator "%s"', $next[1] ) );
} }
}
if ( count( $stack ) !== 1 ) { return (int) $stack[0];
throw new Exception( 'Too many values remaining on the stack' );
} }
return (int) $stack[0];
} }
} endif;

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-alpha-48767'; $wp_version = '5.6-alpha-48769';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.