summaryrefslogtreecommitdiff
path: root/extensions/LocalisationUpdate/QuickArrayReader.php
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/LocalisationUpdate/QuickArrayReader.php')
-rw-r--r--extensions/LocalisationUpdate/QuickArrayReader.php199
1 files changed, 91 insertions, 108 deletions
diff --git a/extensions/LocalisationUpdate/QuickArrayReader.php b/extensions/LocalisationUpdate/QuickArrayReader.php
index 453032f2..214d5a61 100644
--- a/extensions/LocalisationUpdate/QuickArrayReader.php
+++ b/extensions/LocalisationUpdate/QuickArrayReader.php
@@ -8,7 +8,7 @@
* order of magnitude slower than eval().
*/
class QuickArrayReader {
- private $vars = array();
+ var $vars = array();
/**
* @param $string string
@@ -27,100 +27,96 @@ class QuickArrayReader {
);
$tokens = token_get_all( $string );
$count = count( $tokens );
- for ( $i = 0; $i < $count; ) {
- while ( isset( $skipTypes[$tokens[$i][0]] ) ) {
+ for( $i = 0; $i < $count; ) {
+ while( isset($skipTypes[$tokens[$i][0]] ) ) {
$i++;
}
- switch ( $tokens[$i][0] ) {
- case T_OPEN_TAG:
- $i++;
- continue;
- case T_VARIABLE:
- // '$messages' -> 'messages'
- $varname = trim( substr( $tokens[$i][1], 1 ) );
- $varindex = null;
-
- while ( isset( $skipTypes[$tokens[++$i][0]] ) );
-
- if ( $tokens[$i] === '[' ) {
- while ( isset( $skipTypes[$tokens[++$i][0]] ) );
-
- if ( isset( $scalarTypes[$tokens[$i][0]] ) ) {
- $varindex = $this->parseScalar( $tokens[$i] );
- } else {
- throw $this->except( $tokens[$i], 'scalar index' );
- }
- while ( isset( $skipTypes[$tokens[++$i][0]] ) );
+ switch( $tokens[$i][0] ) {
+ case T_OPEN_TAG:
+ $i++;
+ continue;
+ case T_VARIABLE:
+ // '$messages' -> 'messages'
+ $varname = trim( substr( $tokens[$i][1], 1 ) );
+ $varindex = null;
- if ( $tokens[$i] !== ']' ) {
- throw $this->except( $tokens[$i], ']' );
- }
- while ( isset( $skipTypes[$tokens[++$i][0]] ) );
- }
+ while( isset($skipTypes[$tokens[++$i][0]] ) );
- if ( $tokens[$i] !== '=' ) {
- throw $this->except( $tokens[$i], '=' );
- }
- while ( isset( $skipTypes[$tokens[++$i][0]] ) );
-
- if ( isset( $scalarTypes[$tokens[$i][0]] ) ) {
- $buildval = $this->parseScalar( $tokens[$i] );
- } elseif ( $tokens[$i][0] === T_ARRAY ) {
- while ( isset( $skipTypes[$tokens[++$i][0]] ) );
- if ( $tokens[$i] !== '(' ) {
- throw $this->except( $tokens[$i], '(' );
- }
- $buildval = array();
- do {
- while ( isset( $skipTypes[$tokens[++$i][0]] ) );
-
- if ( $tokens[$i] === ')' ) {
- break;
- }
- if ( isset( $scalarTypes[$tokens[$i][0]] ) ) {
- $key = $this->parseScalar( $tokens[$i] );
- }
- while ( isset( $skipTypes[$tokens[++$i][0]] ) );
-
- if ( $tokens[$i][0] !== T_DOUBLE_ARROW ) {
- throw $this->except( $tokens[$i], '=>' );
- }
- while ( isset( $skipTypes[$tokens[++$i][0]] ) );
-
- if ( isset( $scalarTypes[$tokens[$i][0]] ) ) {
- $val = $this->parseScalar( $tokens[$i] );
- }
- wfSuppressWarnings();
- $buildval[$key] = $val;
- wfRestoreWarnings();
- while ( isset( $skipTypes[$tokens[++$i][0]] ) );
-
- if ( $tokens[$i] === ',' ) {
- continue;
- } elseif ( $tokens[$i] === ')' ) {
- break;
- } else {
- throw $this->except( $tokens[$i], ', or )' );
- }
- } while ( true );
+ if( $tokens[$i] === '[' ) {
+ while( isset($skipTypes[$tokens[++$i][0]] ) );
+
+ if( isset($scalarTypes[$tokens[$i][0]] ) ) {
+ $varindex = $this->parseScalar( $tokens[$i] );
} else {
- throw $this->except( $tokens[$i], 'scalar or array' );
+ throw $this->except( $tokens[$i], 'scalar index' );
}
- if ( is_null( $varindex ) ) {
- $this->vars[$varname] = $buildval;
- } else {
- wfSuppressWarnings();
- $this->vars[$varname][$varindex] = $buildval;
- wfRestoreWarnings();
+ while( isset($skipTypes[$tokens[++$i][0]] ) );
+
+ if( $tokens[$i] !== ']' ) {
+ throw $this->except( $tokens[$i], ']' );
}
- while ( isset( $skipTypes[$tokens[++$i][0]] ) );
- if ( $tokens[$i] !== ';' ) {
- throw $this->except( $tokens[$i], ';' );
+ while( isset($skipTypes[$tokens[++$i][0]] ) );
+ }
+
+ if( $tokens[$i] !== '=' ) {
+ throw $this->except( $tokens[$i], '=' );
+ }
+ while( isset($skipTypes[$tokens[++$i][0]] ) );
+
+ if( isset($scalarTypes[$tokens[$i][0]] ) ) {
+ $buildval = $this->parseScalar( $tokens[$i] );
+ } elseif( $tokens[$i][0] === T_ARRAY ) {
+ while( isset($skipTypes[$tokens[++$i][0]] ) );
+ if( $tokens[$i] !== '(' ) {
+ throw $this->except( $tokens[$i], '(' );
}
- $i++;
- break;
- default:
- throw $this->except( $tokens[$i], 'open tag, whitespace, or variable.' );
+ $buildval = array();
+ do {
+ while( isset($skipTypes[$tokens[++$i][0]] ) );
+
+ if( $tokens[$i] === ')' ) {
+ break;
+ }
+ if( isset($scalarTypes[$tokens[$i][0]] ) ) {
+ $key = $this->parseScalar( $tokens[$i] );
+ }
+ while( isset($skipTypes[$tokens[++$i][0]] ) );
+
+ if( $tokens[$i][0] !== T_DOUBLE_ARROW ) {
+ throw $this->except( $tokens[$i], '=>' );
+ }
+ while( isset($skipTypes[$tokens[++$i][0]] ) );
+
+ if( isset($scalarTypes[$tokens[$i][0]] ) ) {
+ $val = $this->parseScalar( $tokens[$i] );
+ }
+ @$buildval[$key] = $val;
+ while( isset($skipTypes[$tokens[++$i][0]] ) );
+
+ if( $tokens[$i] === ',' ) {
+ continue;
+ } elseif( $tokens[$i] === ')' ) {
+ break;
+ } else {
+ throw $this->except( $tokens[$i], ', or )' );
+ }
+ } while(true);
+ } else {
+ throw $this->except( $tokens[$i], 'scalar or array' );
+ }
+ if( is_null( $varindex ) ) {
+ $this->vars[$varname] = $buildval;
+ } else {
+ @$this->vars[$varname][$varindex] = $buildval;
+ }
+ while( isset($skipTypes[$tokens[++$i][0]] ) );
+ if( $tokens[$i] !== ';' ) {
+ throw $this->except($tokens[$i], ';');
+ }
+ $i++;
+ break;
+ default:
+ throw $this->except($tokens[$i], 'open tag, whitespace, or variable.');
}
}
}
@@ -131,12 +127,11 @@ class QuickArrayReader {
* @return Exception
*/
private function except( $got, $expected ) {
- if ( is_array( $got ) ) {
+ if( is_array( $got ) ) {
$got = token_name( $got[0] ) . " ('" . $got[1] . "')";
} else {
$got = "'" . $got . "'";
}
-
return new Exception( "Expected $expected, got $got" );
}
@@ -148,42 +143,30 @@ class QuickArrayReader {
* @return mixed Parsed value
*/
function parseScalar( $token ) {
- if ( is_array( $token ) ) {
+ if( is_array( $token ) ) {
$str = $token[1];
} else {
$str = $token;
}
- if ( $str !== '' && $str[0] == '\'' ) {
+ if ( $str !== '' && $str[0] == '\'' )
// Single-quoted string
// @fixme trim() call is due to mystery bug where whitespace gets
// appended to the token; without it we ended up reading in the
// extra quote on the end!
return strtr( substr( trim( $str ), 1, -1 ),
array( '\\\'' => '\'', '\\\\' => '\\' ) );
- }
-
- wfSuppressWarnings();
- if ( $str !== '' && $str[0] == '"' ) {
+ if ( $str !== '' && @$str[0] == '"' )
// Double-quoted string
// @fixme trim() call is due to mystery bug where whitespace gets
// appended to the token; without it we ended up reading in the
// extra quote on the end!
return stripcslashes( substr( trim( $str ), 1, -1 ) );
- }
- wfRestoreWarnings();
-
- if ( substr( $str, 0, 4 ) === 'true' ) {
+ if ( substr( $str, 0, 4 ) === 'true' )
return true;
- }
-
- if ( substr( $str, 0, 5 ) === 'false' ) {
+ if ( substr( $str, 0, 5 ) === 'false' )
return false;
- }
-
- if ( substr( $str, 0, 4 ) === 'null' ) {
+ if ( substr( $str, 0, 4 ) === 'null' )
return null;
- }
-
// Must be some kind of numeric value, so let PHP's weak typing
// be useful for a change
return $str;
@@ -194,7 +177,7 @@ class QuickArrayReader {
* @return null|string
*/
function getVar( $varname ) {
- if ( isset( $this->vars[$varname] ) ) {
+ if( isset( $this->vars[$varname] ) ) {
return $this->vars[$varname];
} else {
return null;
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-22 02:16:55 +0000