Merge branch 'develop' into release-0.5.1

include/cqasm-annotations.hpp

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <string>
-
+#include <cstdint>
 
 namespace cqasm::annotations {
 
@@ -23,39 +23,39 @@ class SourceLocation {
     /**
      * The first line of the range, or 0 if unknown.
      */
-    uint32_t first_line;
+    std::uint32_t first_line;
 
     /**
      * The first column of the range, or 0 if unknown.
      */
-    uint32_t first_column;
+    std::uint32_t first_column;
 
     /**
      * The last line of the range, or 0 if unknown.
      */
-    uint32_t last_line;
+    std::uint32_t last_line;
 
     /**
      * The last column of the range, or 0 if unknown.
      */
-    uint32_t last_column;
+    std::uint32_t last_column;
 
     /**
      * Constructs a source location object.
      */
     SourceLocation(
         const std::string &filename,
-        uint32_t first_line = 0,
-        uint32_t first_column = 0,
-        uint32_t last_line = 0,
-        uint32_t last_column = 0
+        std::uint32_t first_line = 0,
+        std::uint32_t first_column = 0,
+        std::uint32_t last_line = 0,
+        std::uint32_t last_column = 0
     );
 
     /**
      * Expands the location range to contain the given location in the source
      * file.
      */
-    void expand_to_include(uint32_t line, uint32_t column = 1);
+    void expand_to_include(std::uint32_t line, std::uint32_t column = 1);
 
 };
 

src/cqasm-annotations.cpp

@@ -13,10 +13,10 @@ namespace annotations {
  */
 SourceLocation::SourceLocation(
     const std::string &filename,
-    uint32_t first_line,
-    uint32_t first_column,
-    uint32_t last_line,
-    uint32_t last_column
+    std::uint32_t first_line,
+    std::uint32_t first_column,
+    std::uint32_t last_line,
+    std::uint32_t last_column
 ) :
     filename(filename),
     first_line(first_line),
@@ -36,7 +36,7 @@ SourceLocation::SourceLocation(
  * Expands the location range to contain the given location in the source
  * file.
  */
-void SourceLocation::expand_to_include(uint32_t line, uint32_t column) {
+void SourceLocation::expand_to_include(std::uint32_t line, std::uint32_t column) {
     if (line < first_line) {
         first_line = line;
     }

src/v3x/BuildTreeGenAstVisitor.cpp

@@ -36,10 +36,10 @@ void BuildTreeGenAstVisitor::setNodeAnnotation(ast::One<ast::Node> node, antlr4:
     // We change it here to a one-based index, which is the more human-readable, and the common option in text editors
     node->set_annotation(cqasm::annotations::SourceLocation{
         file_name_,
-        static_cast<uint32_t>(token->getLine()),
-        static_cast<uint32_t>(token->getCharPositionInLine() + 1),
-        static_cast<uint32_t>(token->getLine()),
-        static_cast<uint32_t>(token->getCharPositionInLine() + 1 + token_size)
+        static_cast<std::uint32_t>(token->getLine()),
+        static_cast<std::uint32_t>(token->getCharPositionInLine() + 1),
+        static_cast<std::uint32_t>(token->getLine()),
+        static_cast<std::uint32_t>(token->getCharPositionInLine() + 1 + token_size)
     });
 }