diff --git a/include/bolt/CST.hpp b/include/bolt/CST.hpp
index 6256df06a..acb2bd48f 100644
--- a/include/bolt/CST.hpp
+++ b/include/bolt/CST.hpp
@@ -217,7 +217,7 @@ namespace bolt {
       return static_cast<T*>(this);
     }
 
-    TextRange getRange() const;
+    virtual TextRange getRange() const;
 
     inline Node(NodeKind Type):
         Kind(Type) {}
@@ -290,28 +290,32 @@ namespace bolt {
       ZEN_UNREACHABLE
     }
 
-    inline TextLoc getStartLoc() {
+    inline TextLoc getStartLoc() const {
       return StartLoc;
     }
 
-    TextLoc getEndLoc();
+    TextLoc getEndLoc() const;
 
-    inline size_t getStartLine() {
+    inline size_t getStartLine() const override {
       return StartLoc.Line;
     }
 
-    inline size_t getStartColumn() {
+    inline size_t getStartColumn() const override {
       return StartLoc.Column;
     }
 
-    inline size_t getEndLine() {
+    inline size_t getEndLine() const override {
       return getEndLoc().Line;
     }
 
-    inline size_t getEndColumn() {
+    inline size_t getEndColumn() const override {
       return getEndLoc().Column;
     }
 
+    TextRange getRange() const override {
+      return { getStartLoc(), getEndLoc() };
+    }
+
   };
 
   class Equals : public Token {
diff --git a/src/CST.cc b/src/CST.cc
index d094d404c..3efd78546 100644
--- a/src/CST.cc
+++ b/src/CST.cc
@@ -188,7 +188,7 @@ namespace bolt {
   /*   return Parent->getClassScope(); */
   /* } */
 
-  TextLoc Token::getEndLoc() {
+  TextLoc Token::getEndLoc() const {
     auto Loc = StartLoc;
     Loc.advance(getText());
     return Loc;