wikimedia/mediawiki-extensions-Math
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Math synced 2024-09-23 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce usage of lst2arr helper

Browse source 
As expr is of type TexArray there is
no need to wrap this into another TexArray.
Additionally, this makes it makes calls to
lst2arr that unwrap the extra structure useless.

* Use fluent setters for methods used in
  grammar

For testing, one should add an assertion
to check that lst2arr is not called on
non (right-skewed) binary trees.
It is, however, not recommended
T276940 to keep the assertions in the code.

Bug: T362344
Bug: T276940
Change-Id: I037495bd0f0be6f1d634a057391fd202f5cafc86
This commit is contained in:
Moritz Schubotz (physikerwelt) 2024-04-24 15:36:34 +02:00 committed by Physikerwelt
parent 872ad3717a
commit 5d4a406a3a
3 changed files with 237 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/WikiTexVC/Nodes/TexArray.php
View file

@ -448,8 +448,9 @@ class TexArray extends TexNode {
}
}
public function unshift( ...$elements ) {
public function unshift( ...$elements ): TexArray {
array_unshift( $this->args, ...$elements );
return $this;
}
/**
@ -476,4 +477,9 @@ class TexArray extends TexNode {
return $this->curly;
}
public function setCurly( $curly = true ): TexArray {
$this->curly = $curly;
return $this;
}
}

444
src/WikiTexVC/Parser.php
View file

File diff suppressed because it is too large Load diff

17
src/WikiTexVC/parser.pegjs
View file

@ -13,9 +13,8 @@ $this->options = ParserUtil::createOptions($options);
start
= _ t:tex_expr
{
# assert.ok($t instanceof TexArray);
assert($t instanceof TexArray);
return ParserUtil::lst2arr($t);
return $t;
}
// the PEG grammar doesn't automatically ignore whitespace when tokenizing.
@ -34,7 +33,7 @@ tex_expr
= e:expr EOF
{ return $e; }
/ e1:ne_expr name:FUN_INFIX e2:ne_expr EOF
{ return new TexArray(new Infix($name, ParserUtil::lst2arr($e1), ParserUtil::lst2arr($e2))); }
{ return new TexArray( new Infix($name, $e1, $e2)); }
expr
= ne_expr
@ -43,11 +42,11 @@ expr
ne_expr
= h:lit_aq t:expr
{ return new TexArray($h, $t); }
{ return $t->unshift($h); }
/ h:litsq_aq t:expr
{ return new TexArray($h, $t); }
{ return $t->unshift($h); }
/ d:DECLh e:expr
{ return new TexArray(new Declh($d->getFname(), ParserUtil::lst2arr($e))); }
{ return new TexArray(new Declh($d->getFname(), $e)); }
litsq_aq
= litsq_fq
/ litsq_dq
@ -141,7 +140,7 @@ lit
/ r:DELIMITER { return new Literal($r); }
/ b:BIG r:DELIMITER { return new Big($b, $r); }
/ b:BIG SQ_CLOSE { return new Big($b, "]"); }
/ l:left e:expr r:right {return new Lr($l, $r, ParserUtil::lst2arr($e)); }
/ l:left e:expr r:right {return new Lr($l, $r, $e); }
/ name:FUN_AR1opt e:expr_nosqc SQ_CLOSE l:lit /* must be before FUN_AR1 */
{ return new Fun2sq($name, ParserUtil::lst2arr($e, true), $l); }
/ name:FUN_AR1 l:lit { return new Fun1($name, $l); }
@ -152,9 +151,9 @@ lit
/ name:FUN_AR2nb l1:lit l2:lit { return new Fun2nb($name, $l1, $l2); }
/ BOX
/ CURLY_OPEN e:expr CURLY_CLOSE
{ return ParserUtil::lst2arr($e, true); }
{ return $e->setCurly(); }
/ CURLY_OPEN e1:ne_expr name:FUN_INFIX e2:ne_expr CURLY_CLOSE
{ return new Infix($name, ParserUtil::lst2arr($e1), ParserUtil::lst2arr($e2)); }
{ return new Infix($name, $e1, $e2); }
/ BEGIN_MATRIX m:(array/matrix) END_MATRIX
{ return new Matrix("matrix", ParserUtil::lst2arr($m)); }
/ BEGIN_PMATRIX m:(array/matrix) END_PMATRIX