http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94306
Revision: 94306
Author: reedy
Date: 2011-08-11 23:57:15 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
Whitespace
Modified Paths:
--------------
trunk/extensions/LocalisationUpdate/LocalisationUpdate.class.php
trunk/extensions/LocalisationUpdate/QuickArrayReader.php
Modified: trunk/extensions/LocalisationUpdate/LocalisationUpdate.class.php
===================================================================
--- trunk/extensions/LocalisationUpdate/LocalisationUpdate.class.php
2011-08-11 23:53:48 UTC (rev 94305)
+++ trunk/extensions/LocalisationUpdate/LocalisationUpdate.class.php
2011-08-11 23:57:15 UTC (rev 94306)
@@ -124,7 +124,7 @@
}
/**
- * Update the Mediawiki Core Messages.
+ * Update the MediaWiki Core Messages.
*
* @param $verbose Boolean
*
@@ -179,7 +179,7 @@
}
// Log some nice info.
- self::myLog( "{$changedCount} Mediawiki messages are updated" );
+ self::myLog( "{$changedCount} MediaWiki messages are updated" );
return $changedCount;
}
@@ -606,6 +606,11 @@
}
}
+ /**
+ * @param $php
+ * @param $varname
+ * @return bool|array
+ */
public static function parsePHP( $php, $varname ) {
try {
$reader = new QuickArrayReader("<?php $php");
Modified: trunk/extensions/LocalisationUpdate/QuickArrayReader.php
===================================================================
--- trunk/extensions/LocalisationUpdate/QuickArrayReader.php 2011-08-11
23:53:48 UTC (rev 94305)
+++ trunk/extensions/LocalisationUpdate/QuickArrayReader.php 2011-08-11
23:57:15 UTC (rev 94306)
@@ -9,7 +9,7 @@
*/
class QuickArrayReader {
var $vars = array();
-
+
function __construct( $string ) {
$scalarTypes = array(
T_LNUMBER => true,
@@ -36,30 +36,30 @@
// '$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]] ) );
-
+
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 ) {
@@ -70,7 +70,7 @@
$buildval = array();
do {
while(
isset($skipTypes[$tokens[++$i][0]] ) );
-
+
if( $tokens[$i] === ')' ) {
break;
}
@@ -78,18 +78,18 @@
$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] === ')' )
{
@@ -117,7 +117,7 @@
}
}
}
-
+
private function except( $got, $expected ) {
if( is_array( $got ) ) {
$got = token_name( $got[0] ) . " ('" . $got[1] . "')";
@@ -160,7 +160,7 @@
// be useful for a change
return $str;
}
-
+
function getVar( $varname ) {
if( isset( $this->vars[$varname] ) ) {
return $this->vars[$varname];
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
