Add SourceLocation support for DoStatement

wpmed92 · Aug 8, 2024 · e861031 · e861031
1 parent c9a47bb
commit e861031
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/include/AST/AST.h b/include/AST/AST.h
@@ -513,9 +513,9 @@ class WhileStatement : public Statement {
 class DoStatement : public Statement {
 
 public:
-  DoStatement(std::unique_ptr<Statement> body,
+  DoStatement(SourceLocation location, std::unique_ptr<Statement> body,
               std::unique_ptr<Expression> condition)
-      : body(std::move(body)), condition(std::move(condition)) {}
+      : ASTNode(location), body(std::move(body)), condition(std::move(condition)) {}
 
   void accept(ASTVisitor *visitor) override { visitor->visit(this); }
 

diff --git a/lib/AST/PrinterASTVisitor.cpp b/lib/AST/PrinterASTVisitor.cpp
@@ -54,7 +54,7 @@ void PrinterASTVisitor::visit(VariableDeclarationList *varDeclList) {
 
 void PrinterASTVisitor::visit(VariableDeclaration *varDecl) {
   auto typeName = varDecl->getType() != nullptr ? varDecl->getType()->toString() : "";
-  print("|-VariableDeclaration: name=" + varDecl->getIdentifierName() + ((typeName != "") ? (", type=" + typeName) : "") + loc(varDecl->getSourceLocation()));
+  print("|-VariableDeclaration: name=" + varDecl->getIdentifierName() + ((typeName != "") ? (", type=" + typeName) : "") + " " + loc(varDecl->getSourceLocation()));
 
   indent();
   if (auto exp = varDecl->getInitialzerExpression()) {
@@ -81,7 +81,7 @@ void PrinterASTVisitor::visit(WhileStatement *whileStmt) {
 }
 
 void PrinterASTVisitor::visit(DoStatement *doStmt) {
-  print("|-DoStatement");
+  print("|-DoStatement " + loc(doStmt->getSourceLocation()));
 
   doStmt->getCondition()->accept(this);
   indent();
@@ -300,9 +300,9 @@ void PrinterASTVisitor::visit(CaseLabel *caseLabel) {
 std::string PrinterASTVisitor::loc(const SourceLocation &sourceLoc) {
   std::stringstream ssLoc;
   if (sourceLoc.startLine == sourceLoc.endLine) {
-    ssLoc << "[line: " << sourceLoc.startLine << ", col:" << sourceLoc.startCol << " -> " << "col:" << sourceLoc.endCol << "]";
+    ssLoc << "[line:" << sourceLoc.startLine << ", col:" << sourceLoc.startCol << " -> " << "col:" << sourceLoc.endCol << "]";
   } else {
-    ssLoc << "[line: " << sourceLoc.startLine << ", col:" << sourceLoc.startCol << "] -> " << "[line: " << sourceLoc.endLine << ", col:" << sourceLoc.endCol << "]";
+    ssLoc << "[line:" << sourceLoc.startLine << ", col:" << sourceLoc.startCol << "] -> " << "[line: " << sourceLoc.endLine << ", col:" << sourceLoc.endCol << "]";
   }
 
   return ssLoc.str();

diff --git a/lib/Parser/Parser.cpp b/lib/Parser/Parser.cpp
@@ -837,6 +837,7 @@ std::unique_ptr<DoStatement> Parser::parseDoStatement() {
     return nullptr;
   }
 
+  auto startLoc = curToken->getSourceLocation();
   advanceToken();
 
   if (auto stmt = parseStatement()) {
@@ -868,9 +869,14 @@ std::unique_ptr<DoStatement> Parser::parseDoStatement() {
       return nullptr;
     }
 
+    auto endLoc = curToken->getSourceLocation();
     advanceToken();
 
-    return std::make_unique<DoStatement>(std::move(stmt), std::move(exp));
+    return std::make_unique<DoStatement>(
+      SourceLocation(startLoc.startLine, startLoc.startCol, endLoc.endLine, endLoc.endCol),
+      std::move(stmt),
+      std::move(exp)
+    );
   } else {
     return nullptr;
   }