Renamed Top -> First and TopN -> Peek.

Author: zorkow

mathjax3-ts/input/tex/Stack.ts

@@ -146,7 +146,7 @@ export default class Stack {
    */
   public Prev(noPop?: boolean): MmlNode | void {
     const top = this.Top();
-    return noPop ? top.Last : top.Pop();
+    return noPop ? top.First : top.Pop();
   }
 
 

mathjax3-ts/input/tex/StackItem.ts

@@ -45,7 +45,7 @@ export interface NodeStack {
    * Get or set the topmost element on the node stack without removing it.
    * @return {MmlNode} The topmost node on the stack.
    */
-  Top: MmlNode;
+  First: MmlNode;
 
   /**
    * Get or set the last element on the node stack without removing it.
@@ -69,7 +69,7 @@ export interface NodeStack {
    * @param {number=} n Number of elements that should be returned.
    * @return {MmlNode[]} List of nodes on top of stack.
    */
-  TopN(n?: number): MmlNode[];
+  Peek(n?: number): MmlNode[];
 
   /**
    * @return {number} The size of the stack.
@@ -129,15 +129,15 @@ export abstract class MmlStack implements NodeStack {
   /**
    * @override
    */
-  public get Top(): MmlNode {
+  public get First(): MmlNode {
     return this._nodes[this.Size() - 1];
   }
 
 
   /**
    * @override
    */
-  public set Top(node: MmlNode) {
+  public set First(node: MmlNode) {
     this._nodes[this.Size() - 1] = node;
   }
 
@@ -161,7 +161,7 @@ export abstract class MmlStack implements NodeStack {
   /**
    * @override
    */
-  public TopN(n?: number): MmlNode[] {
+  public Peek(n?: number): MmlNode[] {
     if (n == null) {
       n = 1;
     }
@@ -192,7 +192,7 @@ export abstract class MmlStack implements NodeStack {
    */
   public toMml(inferred: boolean = true, forceRow?: boolean) {
     if (this._nodes.length === 1 && !forceRow) {
-      return this.Top;
+      return this.First;
     }
     // @test Two Identifiers
     return this.create(
@@ -440,7 +440,7 @@ export abstract class BaseItem extends MmlStack implements StackItem {
     if (!item.isFinal) {
       return true;
     }
-    this.Push(item.Top);
+    this.Push(item.First);
     return false;
   }
 

mathjax3-ts/input/tex/TexParser.ts

@@ -218,7 +218,7 @@ export default class TexParser {
     if (!this.stack.Top().isKind('mml')) {
       return null;
     }
-    let node = this.stack.Top().Top;
+    let node = this.stack.Top().First;
     this.configuration.popParser();
     return node;
   }

mathjax3-ts/input/tex/ams/AmsMethods.ts

@@ -223,11 +223,11 @@ AmsMethods.xArrow = function(parser: TexParser, name: string,
                              chr: number, l: number, r: number) {
   let def = {width: '+' + (l + r) + 'mu', lspace: l + 'mu'};
   let bot = parser.GetBrackets(name);
-  let top = parser.ParseArg(name);
+  let first = parser.ParseArg(name);
   let arrow = parser.create('token',
     'mo', {stretchy: true, texClass: TEXCLASS.REL}, String.fromCharCode(chr));
   let mml = parser.create('node', 'munderover', [arrow]) as MmlMunderover;
-  let mpadded = parser.create('node', 'mpadded', [top], def);
+  let mpadded = parser.create('node', 'mpadded', [first], def);
   NodeUtil.setProperties(mpadded, {voffset: '.15em'});
   NodeUtil.setChild(mml, mml.over, mpadded);
   if (bot) {

mathjax3-ts/input/tex/base/BaseItems.ts

@@ -181,7 +181,7 @@ export class PrimeItem extends BaseItem {
    * @override
    */
   public checkItem(item: StackItem) {
-    let [top0, top1] = this.TopN(2);
+    let [top0, top1] = this.Peek(2);
     if (!NodeUtil.isType(top0, 'msubsup')) {
       // @test Prime, Double Prime
       const node = this.create('node', 'msup', [top0, top1]);
@@ -224,7 +224,7 @@ export class SubsupItem extends BaseItem {
     if (item.isKind('open') || item.isKind('left')) {
       return true;
     }
-    const top = this.Top;
+    const top = this.First;
     const position = this.getProperty('position') as number;
     if (item.isKind('mml')) {
       if (this.getProperty('primes')) {
@@ -234,11 +234,11 @@ export class SubsupItem extends BaseItem {
         } else {
           // @test Prime on Prime
           NodeUtil.setProperties(this.getProperty('primes') as MmlNode, {variantForm: true});
-          const node = this.create('node', 'mrow', [this.getProperty('primes') as MmlNode, item.Top]);
-          item.Top = node;
+          const node = this.create('node', 'mrow', [this.getProperty('primes') as MmlNode, item.First]);
+          item.First = node;
         }
       }
-      NodeUtil.setChild(top, position, item.Top);
+      NodeUtil.setChild(top, position, item.First);
       if (this.getProperty('movesupsub') != null) {
         // @test Limits Subsup (currently does not work! Check again!)
         NodeUtil.setProperties(top, {movesupsub: this.getProperty('movesupsub')} as PropertyList);
@@ -567,15 +567,15 @@ export class FnItem extends BaseItem {
    * @override
    */
   public checkItem(item: StackItem) {
-    const top = this.Top;
+    const top = this.First;
     if (top) {
       if (item.isOpen) {
         // @test Fn Stretchy
         return true;
       }
       if (!item.isKind('fn')) {
         // @test Named Function
-        let mml = item.Top;
+        let mml = item.First;
         if (!item.isKind('mml') || !mml) {
           // @test Mathop Super
           return [top, item];
@@ -630,9 +630,9 @@ export class NotItem extends BaseItem {
       return true;
     }
     if (item.isKind('mml') &&
-        (NodeUtil.isType(item.Top, 'mo') || NodeUtil.isType(item.Top, 'mi') ||
-         NodeUtil.isType(item.Top, 'mtext'))) {
-      mml = item.Top;
+        (NodeUtil.isType(item.First, 'mo') || NodeUtil.isType(item.First, 'mi') ||
+         NodeUtil.isType(item.First, 'mtext'))) {
+      mml = item.First;
       c = NodeUtil.getText(mml as TextNode);
       if (c.length === 1 && !NodeUtil.getProperty(mml, 'movesupsub') &&
           NodeUtil.getChildren(mml).length === 1) {
@@ -675,7 +675,7 @@ export class DotsItem extends BaseItem {
       return true;
     }
     let dots = this.getProperty('ldots') as MmlNode;
-    let top = item.Top;
+    let top = item.First;
     // @test Operator Dots
     if (item.isKind('mml') && NodeUtil.isEmbellished(top)) {
       const tclass = NodeUtil.getTexClass(NodeUtil.getCoreMO(top));

mathjax3-ts/input/tex/base/BaseMethods.ts

@@ -114,7 +114,7 @@ BaseMethods.Superscript = function(parser: TexParser, c: string) {
   const top = parser.stack.Top();
   if (top.isKind('prime')) {
     // @test Prime on Prime
-    [base, primes] = top.TopN(2);
+    [base, primes] = top.Peek(2);
     parser.stack.Pop();
   } else {
     // @test Empty base2, Square, Cube
@@ -174,7 +174,7 @@ BaseMethods.Subscript = function(parser: TexParser, c: string) {
   const top = parser.stack.Top();
   if (top.isKind('prime')) {
     // @test Prime on Sub
-    [base, primes] = top.TopN(2);
+    [base, primes] = top.Peek(2);
     parser.stack.Pop();
   } else {
     base = parser.stack.Prev();