wikimedia/mediawiki-extensions-Math
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Math synced 2024-11-24 07:34:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix Perfomance Issues of TexUtil"

Browse source
This commit is contained in:
jenkins-bot 2022-10-25 18:10:09 +00:00 committed by Gerrit Code Review
parent ded8f70772 b5d3bca4b4
commit 3dcdbbd95b
7 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/TexVC/Nodes/Fun1.php
View file

@ -19,7 +19,7 @@ class Fun1 extends TexNode {
parent::__construct( $fname, $arg );
$this->fname = $fname;
$this->arg = $arg;
$this->tu = new TexUtil();
$this->tu = TexUtil::getInstance();
}
/**

3
src/TexVC/Nodes/Literal.php
View file

@ -16,8 +16,7 @@ class Literal extends TexNode {
public function __construct( string $arg ) {
parent::__construct( $arg );
$this->arg = $arg;
$tu = new TexUtil();
$this->literals = array_keys( $tu->getBaseElements()['is_literal'] );
$this->literals = array_keys( TexUtil::getInstance()->getBaseElements()['is_literal'] );
$this->extendedLiterals = $this->literals;
array_push( $this->extendedLiterals, '\\infty', '\\emptyset' );
}

2
src/TexVC/Parser.php
View file

@ -9536,7 +9536,7 @@ class Parser {
/* BEGIN initializer code */
$this->tu = new TexUtil();
$this->tu = TexUtil::getInstance();
# get reference of the options for usage in functions.

15
src/TexVC/TexUtil.php
View file

@ -7,6 +7,7 @@ namespace MediaWiki\Extension\Math\TexVC;
use MWException;
class TexUtil {
private static $instance = null;
private $allFunctions;
private $baseElements;
@ -15,7 +16,7 @@ class TexUtil {
* allFunctions holds the root-level function keys
* other objects are second level elements and hold all functions which are assigned to this second level elements
*/
public function __construct() {
private function __construct() {
$jsonContent = $this->getJSON();
// dynamically create functions from the content
$this->allFunctions = [];
@ -41,6 +42,18 @@ class TexUtil {
}
}
public static function removeInstance() {
self::$instance = null;
}
public static function getInstance() {
if ( self::$instance == null ) {
self::$instance = new TexUtil();
}
return self::$instance;
}
/**
* Returning the base elements array.
* This is only used for testing in TexUtilTest.php.

2
src/TexVC/TexVC.php
View file

@ -24,7 +24,7 @@ class TexVC {
public function __construct() {
$this->parser = new Parser();
$this->tu = new TexUtil();
$this->tu = TexUtil::getInstance();
}
private function strStartsWith( $haystack, $needle ): bool {

3
src/TexVC/parser.pegjs
View file

@ -1,6 +1,7 @@
/** PEGjs lexer/parser */
{
$this->tu = new TexUtil();
$this->tu = TexUtil::getInstance();
# get reference of the options for usage in functions.

7
tests/phpunit/unit/TexVC/TexUtilTest.php
View file

@ -11,10 +11,11 @@ use MediaWikiUnitTestCase;
class TexUtilTest extends MediaWikiUnitTestCase {
/**
* Basic test for tex util.
* Basic test for TexUtil
*/
public function testTexUtil() {
$tu = new TexUtil();
TexUtil::removeInstance();
$tu = TexUtil::getInstance();
// Testing all functions
$this->assertTrue( $tu->getAllFunctionsAt( "\\AA" ) );
$this->assertFalse( $tu->getAllFunctionsAt( "\\notlisted" ) );
@ -28,7 +29,7 @@ class TexUtilTest extends MediaWikiUnitTestCase {
* @return void
*/
public function testChecksum() {
$tu = new TexUtil();
$tu = TexUtil::getInstance();
$out = [];
$sets = [