<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[48769] trunk/src/wp-includes/pomo/plural-forms.php: I18N: Add a `class_exists()` check to `Plural_Forms` class for consistency with other POMO library classes.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/48769">48769</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/48769","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-08-10 11:32:01 +0000 (Mon, 10 Aug 2020)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>I18N: Add a `class_exists()` check to `Plural_Forms` class for consistency with other POMO library classes.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/41722">[41722]</a>.

Fixes <a href="https://core.trac.wordpress.org/ticket/50881">#50881</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespomopluralformsphp">trunk/src/wp-includes/pomo/plural-forms.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespomopluralformsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pomo/plural-forms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/plural-forms.php       2020-08-09 02:01:01 UTC (rev 48768)
+++ trunk/src/wp-includes/pomo/plural-forms.php 2020-08-10 11:32:01 UTC (rev 48769)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,340 +5,342 @@
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 4.9.0
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class Plural_Forms {
-       /**
-        * Operator characters.
-        *
-        * @since 4.9.0
-        * @var string OP_CHARS Operator characters.
-        */
-       const OP_CHARS = '|&><!=%?:';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! class_exists( 'Plural_Forms', false ) ) :
+       class Plural_Forms {
+               /**
+                * Operator characters.
+                *
+                * @since 4.9.0
+                * @var string OP_CHARS Operator characters.
+                */
+               const OP_CHARS = '|&><!=%?:';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Valid number characters.
-        *
-        * @since 4.9.0
-        * @var string NUM_CHARS Valid number characters.
-        */
-       const NUM_CHARS = '0123456789';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /**
+                * Valid number characters.
+                *
+                * @since 4.9.0
+                * @var string NUM_CHARS Valid number characters.
+                */
+               const NUM_CHARS = '0123456789';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Operator precedence.
-        *
-        * Operator precedence from highest to lowest. Higher numbers indicate
-        * higher precedence, and are executed first.
-        *
-        * @see https://en.wikipedia.org/wiki/Operators_in_C_and_C%2B%2B#Operator_precedence
-        *
-        * @since 4.9.0
-        * @var array $op_precedence Operator precedence from highest to lowest.
-        */
-       protected static $op_precedence = array(
-               '%'  => 6,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /**
+                * Operator precedence.
+                *
+                * Operator precedence from highest to lowest. Higher numbers indicate
+                * higher precedence, and are executed first.
+                *
+                * @see https://en.wikipedia.org/wiki/Operators_in_C_and_C%2B%2B#Operator_precedence
+                *
+                * @since 4.9.0
+                * @var array $op_precedence Operator precedence from highest to lowest.
+                */
+               protected static $op_precedence = array(
+                       '%'  => 6,
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                '<'  => 5,
-               '<=' => 5,
-               '>'  => 5,
-               '>=' => 5,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 '<'  => 5,
+                       '<=' => 5,
+                       '>'  => 5,
+                       '>=' => 5,
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                '==' => 4,
-               '!=' => 4,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 '==' => 4,
+                       '!=' => 4,
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                '&&' => 3,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 '&&' => 3,
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                '||' => 2,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 '||' => 2,
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                '?:' => 1,
-               '?'  => 1,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 '?:' => 1,
+                       '?'  => 1,
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                '('  => 0,
-               ')'  => 0,
-       );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 '('  => 0,
+                       ')'  => 0,
+               );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Tokens generated from the string.
-        *
-        * @since 4.9.0
-        * @var array $tokens List of tokens.
-        */
-       protected $tokens = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /**
+                * Tokens generated from the string.
+                *
+                * @since 4.9.0
+                * @var array $tokens List of tokens.
+                */
+               protected $tokens = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Cache for repeated calls to the function.
-        *
-        * @since 4.9.0
-        * @var array $cache Map of $n => $result
-        */
-       protected $cache = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /**
+                * Cache for repeated calls to the function.
+                *
+                * @since 4.9.0
+                * @var array $cache Map of $n => $result
+                */
+               protected $cache = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Constructor.
-        *
-        * @since 4.9.0
-        *
-        * @param string $str Plural function (just the bit after `plural=` from Plural-Forms)
-        */
-       public function __construct( $str ) {
-               $this->parse( $str );
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /**
+                * Constructor.
+                *
+                * @since 4.9.0
+                *
+                * @param string $str Plural function (just the bit after `plural=` from Plural-Forms)
+                */
+               public function __construct( $str ) {
+                       $this->parse( $str );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Parse a Plural-Forms string into tokens.
-        *
-        * Uses the shunting-yard algorithm to convert the string to Reverse Polish
-        * Notation tokens.
-        *
-        * @since 4.9.0
-        *
-        * @param string $str String to parse.
-        */
-       protected function parse( $str ) {
-               $pos = 0;
-               $len = strlen( $str );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /**
+                * Parse a Plural-Forms string into tokens.
+                *
+                * Uses the shunting-yard algorithm to convert the string to Reverse Polish
+                * Notation tokens.
+                *
+                * @since 4.9.0
+                *
+                * @param string $str String to parse.
+                */
+               protected function parse( $str ) {
+                       $pos = 0;
+                       $len = strlen( $str );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Convert infix operators to postfix using the shunting-yard algorithm.
-               $output = array();
-               $stack  = array();
-               while ( $pos < $len ) {
-                       $next = substr( $str, $pos, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // Convert infix operators to postfix using the shunting-yard algorithm.
+                       $output = array();
+                       $stack  = array();
+                       while ( $pos < $len ) {
+                               $next = substr( $str, $pos, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        switch ( $next ) {
-                               // Ignore whitespace.
-                               case ' ':
-                               case "\t":
-                                       $pos++;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         switch ( $next ) {
+                                       // Ignore whitespace.
+                                       case ' ':
+                                       case "\t":
+                                               $pos++;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Variable (n).
-                               case 'n':
-                                       $output[] = array( 'var' );
-                                       $pos++;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Variable (n).
+                                       case 'n':
+                                               $output[] = array( 'var' );
+                                               $pos++;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Parentheses.
-                               case '(':
-                                       $stack[] = $next;
-                                       $pos++;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Parentheses.
+                                       case '(':
+                                               $stack[] = $next;
+                                               $pos++;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case ')':
-                                       $found = false;
-                                       while ( ! empty( $stack ) ) {
-                                               $o2 = $stack[ count( $stack ) - 1 ];
-                                               if ( '(' !== $o2 ) {
-                                                       $output[] = array( 'op', array_pop( $stack ) );
-                                                       continue;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 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;
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Discard open paren.
-                                               array_pop( $stack );
-                                               $found = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         if ( ! $found ) {
+                                                       throw new Exception( 'Mismatched parentheses' );
+                                               }
+
+                                               $pos++;
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 break;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        if ( ! $found ) {
-                                               throw new Exception( 'Mismatched parentheses' );
-                                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // Operators.
+                                       case '|':
+                                       case '&':
+                                       case '>':
+                                       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 ) );
+                                               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $pos++;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         while ( ! empty( $stack ) ) {
+                                                       $o2 = $stack[ count( $stack ) - 1 ];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // Operators.
-                               case '|':
-                               case '&':
-                               case '>':
-                               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 ) );
-                                       }
-
-                                       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 ] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // 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 ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 break;
</span><span class="cx" style="display: block; padding: 0 10px">                                                        }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                } elseif ( self::$op_precedence[ $operator ] > self::$op_precedence[ $o2 ] ) {
-                                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                                                       $output[] = array( 'op', array_pop( $stack ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                $stack[] = $operator;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                $output[] = array( 'op', array_pop( $stack ) );
-                                       }
-                                       $stack[] = $operator;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         $pos += $end_operator;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $pos += $end_operator;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // 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;
+                                                       }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 // Replace.
+                                                       $stack[ $s_pos ] = '?:';
+                                                       $found           = true;
+                                                       break;
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // Replace.
-                                               $stack[ $s_pos ] = '?:';
-                                               $found           = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         if ( ! $found ) {
+                                                       throw new Exception( 'Missing starting "?" ternary operator' );
+                                               }
+                                               $pos++;
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 break;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        if ( ! $found ) {
-                                               throw new Exception( 'Missing starting "?" ternary operator' );
-                                       }
-                                       $pos++;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 // 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;
+                                               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // 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 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         throw new Exception( sprintf( 'Unknown symbol "%s"', $next ) );
+                               }
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                while ( ! empty( $stack ) ) {
-                       $o2 = array_pop( $stack );
-                       if ( '(' === $o2 || ')' === $o2 ) {
-                               throw new Exception( 'Mismatched parentheses' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 while ( ! empty( $stack ) ) {
+                               $o2 = array_pop( $stack );
+                               if ( '(' === $o2 || ')' === $o2 ) {
+                                       throw new Exception( 'Mismatched parentheses' );
+                               }
+
+                               $output[] = array( 'op', $o2 );
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $output[] = array( 'op', $o2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->tokens = $output;
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->tokens = $output;
-       }
-
-       /**
-        * Get the plural form for a number.
-        *
-        * Caches the value for repeated calls.
-        *
-        * @since 4.9.0
-        *
-        * @param int $num Number to get plural form for.
-        * @return int Plural form value.
-        */
-       public function get( $num ) {
-               if ( isset( $this->cache[ $num ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /**
+                * Get the plural form for a number.
+                *
+                * Caches the value for repeated calls.
+                *
+                * @since 4.9.0
+                *
+                * @param int $num Number to get plural form for.
+                * @return int Plural form value.
+                */
+               public function get( $num ) {
+                       if ( isset( $this->cache[ $num ] ) ) {
+                               return $this->cache[ $num ];
+                       }
+                       $this->cache[ $num ] = $this->execute( $num );
</ins><span class="cx" style="display: block; padding: 0 10px">                         return $this->cache[ $num ];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->cache[ $num ] = $this->execute( $num );
-               return $this->cache[ $num ];
-       }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Execute the plural form function.
-        *
-        * @since 4.9.0
-        *
-        * @param int $n Variable "n" to substitute.
-        * @return int Plural form value.
-        */
-       public function execute( $n ) {
-               $stack = array();
-               $i     = 0;
-               $total = count( $this->tokens );
-               while ( $i < $total ) {
-                       $next = $this->tokens[ $i ];
-                       $i++;
-                       if ( 'var' === $next[0] ) {
-                               $stack[] = $n;
-                               continue;
-                       } elseif ( 'value' === $next[0] ) {
-                               $stack[] = $next[1];
-                               continue;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /**
+                * Execute the plural form function.
+                *
+                * @since 4.9.0
+                *
+                * @param int $n Variable "n" to substitute.
+                * @return int Plural form value.
+                */
+               public function execute( $n ) {
+                       $stack = array();
+                       $i     = 0;
+                       $total = count( $this->tokens );
+                       while ( $i < $total ) {
+                               $next = $this->tokens[ $i ];
+                               $i++;
+                               if ( 'var' === $next[0] ) {
+                                       $stack[] = $n;
+                                       continue;
+                               } elseif ( 'value' === $next[0] ) {
+                                       $stack[] = $next[1];
+                                       continue;
+                               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // Only operators left.
-                       switch ( $next[1] ) {
-                               case '%':
-                                       $v2      = array_pop( $stack );
-                                       $v1      = array_pop( $stack );
-                                       $stack[] = $v1 % $v2;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // Only operators left.
+                               switch ( $next[1] ) {
+                                       case '%':
+                                               $v2      = array_pop( $stack );
+                                               $v1      = array_pop( $stack );
+                                               $stack[] = $v1 % $v2;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case '||':
-                                       $v2      = array_pop( $stack );
-                                       $v1      = array_pop( $stack );
-                                       $stack[] = $v1 || $v2;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 case '||':
+                                               $v2      = array_pop( $stack );
+                                               $v1      = array_pop( $stack );
+                                               $stack[] = $v1 || $v2;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case '&&':
-                                       $v2      = array_pop( $stack );
-                                       $v1      = array_pop( $stack );
-                                       $stack[] = $v1 && $v2;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 case '&&':
+                                               $v2      = array_pop( $stack );
+                                               $v1      = array_pop( $stack );
+                                               $stack[] = $v1 && $v2;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case '<':
-                                       $v2      = array_pop( $stack );
-                                       $v1      = array_pop( $stack );
-                                       $stack[] = $v1 < $v2;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 case '<':
+                                               $v2      = array_pop( $stack );
+                                               $v1      = array_pop( $stack );
+                                               $stack[] = $v1 < $v2;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case '<=':
-                                       $v2      = array_pop( $stack );
-                                       $v1      = array_pop( $stack );
-                                       $stack[] = $v1 <= $v2;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 case '<=':
+                                               $v2      = array_pop( $stack );
+                                               $v1      = array_pop( $stack );
+                                               $stack[] = $v1 <= $v2;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case '>':
-                                       $v2      = array_pop( $stack );
-                                       $v1      = array_pop( $stack );
-                                       $stack[] = $v1 > $v2;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 case '>':
+                                               $v2      = array_pop( $stack );
+                                               $v1      = array_pop( $stack );
+                                               $stack[] = $v1 > $v2;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case '>=':
-                                       $v2      = array_pop( $stack );
-                                       $v1      = array_pop( $stack );
-                                       $stack[] = $v1 >= $v2;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 case '>=':
+                                               $v2      = array_pop( $stack );
+                                               $v1      = array_pop( $stack );
+                                               $stack[] = $v1 >= $v2;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case '!=':
-                                       $v2      = array_pop( $stack );
-                                       $v1      = array_pop( $stack );
-                                       $stack[] = $v1 != $v2;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 case '!=':
+                                               $v2      = array_pop( $stack );
+                                               $v1      = array_pop( $stack );
+                                               $stack[] = $v1 != $v2;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case '==':
-                                       $v2      = array_pop( $stack );
-                                       $v1      = array_pop( $stack );
-                                       $stack[] = $v1 == $v2;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 case '==':
+                                               $v2      = array_pop( $stack );
+                                               $v1      = array_pop( $stack );
+                                               $stack[] = $v1 == $v2;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                case '?:':
-                                       $v3      = array_pop( $stack );
-                                       $v2      = array_pop( $stack );
-                                       $v1      = array_pop( $stack );
-                                       $stack[] = $v1 ? $v2 : $v3;
-                                       break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 case '?:':
+                                               $v3      = array_pop( $stack );
+                                               $v2      = array_pop( $stack );
+                                               $v1      = array_pop( $stack );
+                                               $stack[] = $v1 ? $v2 : $v3;
+                                               break;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                default:
-                                       throw new Exception( sprintf( 'Unknown operator "%s"', $next[1] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 default:
+                                               throw new Exception( sprintf( 'Unknown operator "%s"', $next[1] ) );
+                               }
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( count( $stack ) !== 1 ) {
-                       throw new Exception( 'Too many values remaining on the stack' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( count( $stack ) !== 1 ) {
+                               throw new Exception( 'Too many values remaining on the stack' );
+                       }
+
+                       return (int) $stack[0];
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-               return (int) $stack[0];
</del><span class="cx" style="display: block; padding: 0 10px">         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins></span></pre>
</div>
</div>

</body>
</html>