Add coordinate parsing

Author: Argmaster

cpp/gerber/include/gerber/ast/ast.hpp

@@ -1,25 +1,31 @@
-#include "gerber/ast/command.hpp"
-#include "gerber/ast/enums.hpp"
-#include "gerber/ast/extended_command.hpp"
-#include "gerber/ast/file.hpp"
-#include "gerber/ast/node.hpp"
+#include "./command.hpp"
+#include "./enums.hpp"
+#include "./extended_command.hpp"
+#include "./file.hpp"
+#include "./node.hpp"
 
-#include "gerber/ast/g_codes/G01.hpp"
-#include "gerber/ast/g_codes/G02.hpp"
-#include "gerber/ast/g_codes/G03.hpp"
-#include "gerber/ast/g_codes/G04.hpp"
-#include "gerber/ast/g_codes/G36.hpp"
-#include "gerber/ast/g_codes/G37.hpp"
-#include "gerber/ast/g_codes/G54.hpp"
-#include "gerber/ast/g_codes/G55.hpp"
-#include "gerber/ast/g_codes/G70.hpp"
-#include "gerber/ast/g_codes/G71.hpp"
-#include "gerber/ast/g_codes/G74.hpp"
-#include "gerber/ast/g_codes/G75.hpp"
-#include "gerber/ast/g_codes/G90.hpp"
-#include "gerber/ast/g_codes/G91.hpp"
+#include "./g_codes/G01.hpp"
+#include "./g_codes/G02.hpp"
+#include "./g_codes/G03.hpp"
+#include "./g_codes/G04.hpp"
+#include "./g_codes/G36.hpp"
+#include "./g_codes/G37.hpp"
+#include "./g_codes/G54.hpp"
+#include "./g_codes/G55.hpp"
+#include "./g_codes/G70.hpp"
+#include "./g_codes/G71.hpp"
+#include "./g_codes/G74.hpp"
+#include "./g_codes/G75.hpp"
+#include "./g_codes/G90.hpp"
+#include "./g_codes/G91.hpp"
 
-#include "gerber/ast/load/LP.hpp"
+#include "./load/LP.hpp"
 
-#include "gerber/ast/properties/FS.hpp"
-#include "gerber/ast/properties/MO.hpp"
+#include "./other/coordinate.hpp"
+#include "./other/coordinate_i.hpp"
+#include "./other/coordinate_j.hpp"
+#include "./other/coordinate_x.hpp"
+#include "./other/coordinate_y.hpp"
+
+#include "./properties/FS.hpp"
+#include "./properties/MO.hpp"

cpp/gerber/include/gerber/ast/other/coordinate.hpp

@@ -0,0 +1,17 @@
+#pragma once
+#include "gerber/ast/command.hpp"
+#include <string>
+
+namespace gerber {
+    class Coordinate : public Command {
+      private:
+        std::string value;
+
+        Coordinate() = delete;
+
+      public:
+        Coordinate(const std::string_view& value);
+        std::string getNodeName() const override;
+        std::string getValue() const;
+    };
+} // namespace gerber

cpp/gerber/include/gerber/ast/other/coordinate_i.hpp

@@ -0,0 +1,11 @@
+#pragma once
+#include "./coordinate.hpp"
+#include <string>
+
+namespace gerber {
+    class CoordinateI : public Coordinate {
+      public:
+        using Coordinate::Coordinate;
+        std::string getNodeName() const override;
+    };
+} // namespace gerber

cpp/gerber/include/gerber/ast/other/coordinate_j.hpp

@@ -0,0 +1,11 @@
+#pragma once
+#include "./coordinate.hpp"
+#include <string>
+
+namespace gerber {
+    class CoordinateJ : public Coordinate {
+      public:
+        using Coordinate::Coordinate;
+        std::string getNodeName() const override;
+    };
+} // namespace gerber

cpp/gerber/include/gerber/ast/other/coordinate_x.hpp

@@ -0,0 +1,11 @@
+#pragma once
+#include "./coordinate.hpp"
+#include <string>
+
+namespace gerber {
+    class CoordinateX : public Coordinate {
+      public:
+        using Coordinate::Coordinate;
+        std::string getNodeName() const override;
+    };
+} // namespace gerber

cpp/gerber/include/gerber/ast/other/coordinate_y.hpp

@@ -0,0 +1,11 @@
+#pragma once
+#include "./coordinate.hpp"
+#include <string>
+
+namespace gerber {
+    class CoordinateY : public Coordinate {
+      public:
+        using Coordinate::Coordinate;
+        std::string getNodeName() const override;
+    };
+} // namespace gerber

cpp/gerber/include/gerber/parser.hpp

@@ -40,6 +40,32 @@ namespace gerber {
         [[noreturn]] void throw_syntax_error();
         offset_t          parse_g_code(const std::string_view& gerber, const location_t& index);
 
+        template <typename coordinate_type>
+        offset_t parse_coordinate(const std::string_view& source, const location_t& index) {
+            // Shortest possible X coordinate is X0* or alike.
+            if (source.length() < 3) {
+                throw_syntax_error();
+            }
+
+            auto length = parse_integer(source.substr(1));
+            commands.push_back(std::make_shared<coordinate_type>(source.substr(1, length)));
+
+            return 1 + length;
+        }
+
+        offset_t parse_integer(const std::string_view& source);
+
+        template <typename lambda_t>
+        offset_t parse_while_predicate(lambda_t char_predicate, const std::string_view& source) {
+            offset_t substring_length = 0;
+            auto     source_length    = source.length();
+
+            while (substring_length < source_length && char_predicate(source[substring_length])) {
+                substring_length++;
+            }
+            return substring_length;
+        }
+
         offset_t parse_extended_command(const std::string_view& source, const location_t& index);
         offset_t parse_load_command(const std::string_view& source, const location_t& index);
         offset_t parse_fs_command(const std::string_view& source, const location_t& index);

cpp/gerber/src/ast/other/coordinate.cpp

@@ -0,0 +1,14 @@
+#include "gerber/ast/other/coordinate.hpp"
+
+namespace gerber {
+    Coordinate::Coordinate(const std::string_view& value) :
+        value(value) {}
+
+    std::string Coordinate::getNodeName() const {
+        return "Coordinate";
+    }
+
+    std::string Coordinate::getValue() const {
+        return value;
+    }
+} // namespace gerber

cpp/gerber/src/ast/other/coordinate_i.cpp

@@ -0,0 +1,7 @@
+#include "gerber/ast/other/coordinate_i.hpp"
+
+namespace gerber {
+    std::string CoordinateI::getNodeName() const {
+        return "I";
+    }
+} // namespace gerber

cpp/gerber/src/ast/other/coordinate_j.cpp

@@ -0,0 +1,7 @@
+#include "gerber/ast/other/coordinate_j.hpp"
+
+namespace gerber {
+    std::string CoordinateJ::getNodeName() const {
+        return "J";
+    }
+} // namespace gerber