opdavies/presentations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update WP and plugins

Browse source
This commit is contained in:
Oliver Davies 2019-04-16 20:56:22 +01:00
parent 10a4713229
commit 1fb77fc4ff
864 changed files with 101724 additions and 78262 deletions
Download patch file Download diff file Expand all files Collapse all files

68
wp-includes/pomo/plural-forms.php
View file

@ -34,11 +34,11 @@ class Plural_Forms {
* @var array $op_precedence Operator precedence from highest to lowest.
*/
protected static $op_precedence = array(
'%' => 6,
'%' => 6,
'<' => 5,
'<' => 5,
'<=' => 5,
'>' => 5,
'>' => 5,
'>=' => 5,
'==' => 4,
@ -49,10 +49,10 @@ class Plural_Forms {
'||' => 2,
'?:' => 1,
'?' => 1,
'?' => 1,
'(' => 0,
')' => 0,
'(' => 0,
')' => 0,
);
/**
@ -98,7 +98,7 @@ class Plural_Forms {
// Convert infix operators to postfix using the shunting-yard algorithm.
$output = array();
$stack = array();
$stack = array();
while ( $pos < $len ) {
$next = substr( $str, $pos, 1 );
@ -153,7 +153,7 @@ class Plural_Forms {
case '%':
case '?':
$end_operator = strspn( $str, self::OP_CHARS, $pos );
$operator = substr( $str, $pos, $end_operator );
$operator = substr( $str, $pos, $end_operator );
if ( ! array_key_exists( $operator, self::$op_precedence ) ) {
throw new Exception( sprintf( 'Unknown operator "%s"', $operator ) );
}
@ -191,7 +191,7 @@ class Plural_Forms {
// Replace.
$stack[ $s_pos ] = '?:';
$found = true;
$found = true;
break;
}
@ -204,9 +204,9 @@ class Plural_Forms {
// Default - number or invalid
default:
if ( $next >= '0' && $next <= '9' ) {
$span = strspn( $str, self::NUM_CHARS, $pos );
$span = strspn( $str, self::NUM_CHARS, $pos );
$output[] = array( 'value', intval( substr( $str, $pos, $span ) ) );
$pos += $span;
$pos += $span;
break;
}
@ -253,10 +253,10 @@ class Plural_Forms {
*/
public function execute( $n ) {
$stack = array();
$i = 0;
$i = 0;
$total = count( $this->tokens );
while ( $i < $total ) {
$next = $this->tokens[$i];
$next = $this->tokens[ $i ];
$i++;
if ( $next[0] === 'var' ) {
$stack[] = $n;
@ -269,63 +269,63 @@ class Plural_Forms {
// Only operators left.
switch ( $next[1] ) {
case '%':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 % $v2;
break;
case '||':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 || $v2;
break;
case '&&':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 && $v2;
break;
case '<':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 < $v2;
break;
case '<=':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 <= $v2;
break;
case '>':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 > $v2;
break;
case '>=':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 >= $v2;
break;
case '!=':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 != $v2;
break;
case '==':
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$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 );
$v3 = array_pop( $stack );
$v2 = array_pop( $stack );
$v1 = array_pop( $stack );
$stack[] = $v1 ? $v2 : $v3;
break;