<refactor> Refactor Tree to standardised object by JoshdRod · Pull Request #29 · JoshdRod/integrle

JoshdRod · 2026-01-30T20:50:07Z

Tree object contains the following:
DATA:
-- list body, contains node objects making up the tree
-- int root, pointer to root node in tree
-- int length, length of body
FUNCTIONALITY:
-- Get(index) - gets node at specified index
-- Find(Node) - finds index of node in tree
-- Add(Node, Node parentNode) - adds node to the tree under parentNode
-- Remove(Node) - removes node from the tree

The key feature of this change is that nodes can be removed from the tree without ruining the pointers.
Previously, removing a node from the tree would mean that all pointers that pointed to an index greater than the element removed would be off by 1. The Remove(Node) funciton handles modifying the pointers in the tree, so this is no longer an impossibility.

Node class contains properties: - type - content - leftNode - rightNode - parent - commutative - precedence

Previously, expressionToComponentList wasn't able to use the new Node class, for a few reasons: - The Node class needs to be defined before it is accessed (see the Temporal Dead Zone https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/let#temporal_dead_zone_tdz) - Move Node class to a new file - Add private type and content properties, which are accessed by the Node getter and setters

- Change node type references to the enum, instead of string - Fix spelling errors

- Change references to node type to reference the enum

- Replace references to string literals in the function to use the NodeType and Operator enums

Returning in a switch-case statement terminates the statement. Hence, a break after the return is just dead code, and unneeded.

Previously, a missing break caused the setting of content for any Operator Node to fall into the function case. e.g: This would set its content as '+', instead of OPERATOR.ADDITION. Currently, these two things are the same thing, but this could deviate in the future.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Error objects return their stack trace, unlike a raw string.

Tree object contains the following: DATA: -- list body, contains node objects making up the tree -- int root, pointer to root node in tree FUNCTIONALITY: -- Add(Node, Node parentNode) - adds node to the tree under parentNode -- Remove(Node) - removes node from the tree Constructor and functionality still needs to be implemented

Add function now adds nodes to tree

Still need to test Add and Remove function - after I've done constructor, I should be able to

Tree object can be instantiated with a body (list of node objects)

- Syntax errors fixed - Renamed parentNode to parent - The keyword isn't needed for class methods. The class has been fixed to reflect this.

Make it possible to retrieve the Nodes inside the tree, by calling the Get function. Unfortunately, JS doesn't support function overloading. Hence, we have to settle here for a helper method.

Beginning of migrating all functions over to the Tree object

Functions in script.js now use the Tree object when interacting with a tree.

Copilot

Pull request overview

This PR refactors the expression “tree” representation into standardized Node/Tree classes and updates the existing parsing/normalisation code to use the new API, with the goal of enabling safe node removal without breaking index-based pointers.

Changes:

Added pages/index/tree.js introducing Operator, NodeType, Node, and Tree abstractions.
Updated pages/index/script.js to construct Node instances, use NodeType/Operator constants, and interact with trees via Tree.Get() / Tree.Find().
Updated index.html to load tree.js before script.js.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 12 comments.

File	Description
pages/index/tree.js	Introduces the new standardized `Tree`/`Node` object model and pointer-management logic (incl. removal).
pages/index/script.js	Migrates parsing and tree algorithms from plain objects/arrays to the new `Node` and `Tree` APIs.
index.html	Ensures the new tree module is loaded for browser runtime before dependent code.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

In Add(), the parent did not have to be in the tree to be added to. This is now not possible. In Remove(), the node removed did not have to be in the tree. This is now also not possible. This prevents unintended consequences of phantom trees being created / phantom nodes messing up pointers.

JoshdRod · 2026-02-01T14:53:47Z

TODO:

Switch errors to throw Error objs
Put up issue for these types of errors:

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Error objects contain the stack trace of the program - throwing a string doesn't.

Previously, eTCL used to set these properties on the component objects it created. Now, the Node object computes these values at request. Hence, these locals are dead code and can be removed.

If root index > index of node being removed, we need to -1 from tree.root to ensure it still points towards the correct index.

JoshdRod added 7 commits January 13, 2026 21:36

<feat>! Add boilerplate for Node class

ae66a91

Node class contains properties: - type - content - leftNode - rightNode - parent - commutative - precedence

<fix>! Make componentToPostfix work with refactored node object

52e61a9

- Change node type references to the enum, instead of string - Fix spelling errors

<fix> Make postfixToTree work with refactored node object

cee11fe

- Change references to node type to reference the enum

<fix>! Make normaliseTree work for refactored node object

b194b78

- Change references to node type to reference the enum

<fix> Make treeToMathJax work for refactored node object

0ab8c99

- Replace references to string literals in the function to use the NodeType and Operator enums

<chore> Remove breaks after return

3661b7d

Returning in a switch-case statement terminates the statement. Hence, a break after the return is just dead code, and unneeded.

JoshdRod force-pushed the refactor-tree branch from eb59845 to 7ed5fbe Compare January 30, 2026 21:03

JoshdRod and others added 4 commits February 1, 2026 13:52

<style><copilot> Remove unecessary break after thow

8b1856c

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

<style> Throw Error objects instead of strings

56f909c

Error objects return their stack trace, unlike a raw string.

<style> Move break onto new line

5a06ee0

Base automatically changed from refactor-node to main February 1, 2026 14:28

JoshdRod added 8 commits February 1, 2026 14:28

<feat> Add functionality to Add function

b48e5ed

Add function now adds nodes to tree

<feat>! Add functionality to Remove function

e948115

Still need to test Add and Remove function - after I've done constructor, I should be able to

<feat> Add constructor to tree object

711d974

Tree object can be instantiated with a body (list of node objects)

<fix> Patch bugs in Add and Remove methods

4c7375b

- Syntax errors fixed - Renamed parentNode to parent - The keyword isn't needed for class methods. The class has been fixed to reflect this.

<feat> Add Get method to Tree

4b81360

Make it possible to retrieve the Nodes inside the tree, by calling the Get function. Unfortunately, JS doesn't support function overloading. Hence, we have to settle here for a helper method.

<fix> Return Tree object from postfixToTree

52129c7

Beginning of migrating all functions over to the Tree object

<fix> Use Tree object in script functions

d573a65

Functions in script.js now use the Tree object when interacting with a tree.

JoshdRod force-pushed the refactor-tree branch from 7ed5fbe to d573a65 Compare February 1, 2026 14:29

JoshdRod requested a review from Copilot February 1, 2026 14:30

Copilot started reviewing on behalf of JoshdRod February 1, 2026 14:30 View session

Copilot AI reviewed Feb 1, 2026

View reviewed changes

JoshdRod and others added 2 commits February 2, 2026 18:19

<style><copilot> Move statements onto separate lines

ffda049

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

<refactor> Throw Error object when handling errors

9f385a8

Error objects contain the stack trace of the program - throwing a string doesn't.

JoshdRod force-pushed the refactor-tree branch from bbf356a to 4efebcf Compare February 2, 2026 20:12

<chore> Fix spelling error in error message

83fd7a4

JoshdRod force-pushed the refactor-tree branch from 4efebcf to 83fd7a4 Compare February 2, 2026 20:13

<chore> Remove references to and local vars in expressionToComponentList

f061104

Previously, eTCL used to set these properties on the component objects it created. Now, the Node object computes these values at request. Hence, these locals are dead code and can be removed.

JoshdRod mentioned this pull request Feb 2, 2026

<fix> Empty trees cannot be made #32

Open

JoshdRod added 3 commits February 2, 2026 20:39

<fix> Fix additional ;

8f2a4d2

<fix> Subtract from root if needed when removing nodes

ee62c0a

If root index > index of node being removed, we need to -1 from tree.root to ensure it still points towards the correct index.

Merge branch 'main' into refactor-tree

7945592

JoshdRod merged commit 217882c into main Feb 2, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

<refactor> Refactor Tree to standardised object#29

<refactor> Refactor Tree to standardised object#29
JoshdRod merged 27 commits intomainfrom
refactor-tree

JoshdRod commented Jan 30, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JoshdRod commented Feb 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

JoshdRod commented Jan 30, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JoshdRod commented Feb 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants