refactor Parser error signal to include token; update parsing logic to support left-associativity; enhance TreeVisualiser for improved node representation

Author: SemoMoh

parser_gui/Parser/include/Parser.h

@@ -51,7 +51,7 @@ class Parser : public QObject {
      * @brief Emitted when a parsing error occurs (e.g., unexpected token or EOF).
      * @param message A descriptive error message.
      */
-    void error(QString message);
+    void error(Tiny::Data::Token token, QString message);
 
 private:
     QList<Tiny::Data::Token> tokens;  ///< The list of tokens to parse.

parser_gui/Parser/src/Parser.cpp

@@ -296,26 +296,21 @@ Node *Parser::parseSimpleExp()
     // you might build the tree right-associatively:
     // a + a + a + a = a + (a + (a + a))
 
-    // Start from the right:
-    Node* root = terms.back(); // last term
-    terms.pop_back();
-
-    // Combine from the rightmost operator backward
-    for (int i = (int)ops.size() - 1; i >= 0; i--) {
+    // Start from the left
+    Node* root = terms[0]; // The first term is the initial root
+    for (int i = 0; i < (int)ops.size(); i++) {
         Node* op = ops[i];
-        Node* leftTerm = terms[i];  // corresponding left term
+        Node* rightTerm = terms[i + 1]; // The next term after the operator
 
-        // Build the subtree: op(leftTerm, root)
-        op->addChild(leftTerm);
+        // For left-associativity: op(root, rightTerm)
         op->addChild(root);
-        root = op; // op now becomes the new root
-    }
+        op->addChild(rightTerm);
 
-    // Now 'root' represents the full expression tree.
+        root = op; // Now op becomes the current root
+    }
 
-    // Assign levels now that the full structure is known
+    // Now 'root' is left-associative
     assignLevels(root, currentLevel);
-
     return root;
 }
 
@@ -400,23 +395,19 @@ Node *Parser::parseTerm()
     }
 
     // Now build the tree from these operators and factors.
-    // For example, if you want right-associativity:
-    Node* root = factors.back();
-    factors.pop_back();
-
-    // Combine from the rightmost operator backward
-    for (int i = (int)ops.size() - 1; i >= 0; i--) {
+    Node* root = factors[0]; // Start with the first factor
+    for (int i = 0; i < (int)ops.size(); i++) {
         Node* op = ops[i];
-        Node* leftFactor = factors[i];
+        Node* rightFactor = factors[i + 1];
 
-        op->addChild(leftFactor);
+        // Left-associative: ( (firstFactor op secondFactor) op thirdFactor ) op fourthFactor
         op->addChild(root);
-        root = op;
-    }
+        op->addChild(rightFactor);
 
-    // root now represents the entire term expression tree
-    assignLevels(root, currentLevel); // Assign levels after the entire tree is known
+        root = op; // Update root
+    }
 
+    assignLevels(root, currentLevel);
     return root;
 }
 

parser_gui/Widgets/include/TreeVisualiser.h

@@ -36,21 +36,22 @@ namespace Tiny::Widgets {
         void wheelEvent(QWheelEvent* event) override;
 
         bool isOval(Node::NodeType type) {
-            if ((type == Node::NodeType::Identifier) ||
-                (type == Node::NodeType::Number) ||
-                (type == Node::NodeType::Comparison)) {
+            if ((type == Node::NodeType::Id) ||
+                (type == Node::NodeType::Const) ||
+
+                (type == Node::NodeType::Op)) {
                 return true;
             } else {
                 return false;
             }
         }
 
         bool hasValue(Node::NodeType type) {
-            if ((type == Node::NodeType::Identifier) ||
-                (type == Node::NodeType::Number) ||
-                (type == Node::NodeType::ReadStatement) ||
-                (type == Node::NodeType::AssignStatement) ||
-                (type == Node::NodeType::Comparison)) {
+            if ((type == Node::NodeType::If) ||
+                    (type == Node::NodeType::Write) ||
+                    (type == Node::NodeType::Repeat)
+                )
+                {
                 return true;
             } else {
                 return false;

parser_gui/Widgets/src/TabContent.cpp

@@ -51,7 +51,7 @@ TabContent::TabContent(bool tokenTextOnly, bool newFile, QWidget *parent) :
     parser->setTokens(tokensList);
     parser->parse();
 
-    connect(parser, &Parser::error, this, [this](QString message) {
+    connect(parser, &Parser::error, this, [this](Tiny::Data::Token token, QString message) {
         // show the error
         // TODO
         //qDebug() << message;
@@ -191,6 +191,8 @@ void TabContent::textChanged()
             // update the tree visualiser
             if (root != nullptr) {
                 this->treeVisualiser->setRoot(root);
+            } else {
+                this->treeVisualiser->setRoot(nullptr);
             }
         }
     }

parser_gui/Widgets/src/TreeVisualiser.cpp

@@ -23,24 +23,7 @@ void TreeVisualiser::paintEvent(QPaintEvent *event) {
 }
 
 TreeVisualiser::TreeVisualiser(QWidget *parent) : QWidget(parent) {
-    Node *nroot = new Node(Node::NodeType::Expression, "+");
-    nroot->setLevel(1);
-    Node *child1 = new Node(Node::NodeType::Number, "3");
-    child1->setLevel(2);
-    Node *child2 = new Node(Node::NodeType::Number, "4");
-    child2->setLevel(1);
-    Node *child3 = new Node(Node::NodeType::Number, "5");
-    child3->setLevel(3);
-
-    Node *child4 = new Node(Node::NodeType::Number, "A7a");
-    Node *child5 = new Node(Node::NodeType::Addition, "5555555");
-
-    this->root = nroot;
-    this->root->addChild(child1);
-    this->root->addChild(child2);
-    child2->addChild(child3);
-    child2->addChild(child4);
-    child1->addChild(child5);
+
 }
 
 void TreeVisualiser::drawTree(QPainter *painter, Node *node, int x, int y, int availableWidth, int level) {
@@ -62,7 +45,7 @@ void TreeVisualiser::drawTree(QPainter *painter, Node *node, int x, int y, int a
     if (!hasValue(node->getType())) {
         nodeText = node->getNodeTypeString().toString() + "\n(" + node->getValue() + ")";
     } else {
-        nodeText = node->getValue();
+        nodeText = node->getNodeTypeString().toString();
     }
     painter->drawText(QRect(x - 40, y - 20, 80, 40),
                       Qt::AlignCenter | Qt::TextWordWrap, nodeText);
@@ -94,14 +77,14 @@ void TreeVisualiser::drawTree(QPainter *painter, Node *node, int x, int y, int a
         int childWidth = childWidths[i];
 
         // Calculate position for each child
-        int childX = startX + childWidth / 2;
-        int childY = (child->getLevel() == node->getLevel())? y : y + verticalSpacing;
+        int childX = startX + childWidth / 2 - 20;
+        int childY = y + verticalSpacing;
 
         // Draw connection line to child node
         painter->setPen(QPen(Qt::black, 2));
         int yLineOffset = (child->getLevel() == node->getLevel())? 0 : 20;
 
-        painter->drawLine(x, y + yLineOffset, childX, childY);
+        painter->drawLine(x, y + 20, childX, childY);
 
         // Recursively draw the child node
         drawTree(painter, child, childX, childY, childWidth, child->getLevel());