#18

core/dbc_statement_handler.h

@@ -17,6 +17,15 @@ struct PendingValueDescriptions {
     std::size_t lineNumber;
 };
 
+struct PendingComment {
+    std::uint32_t canId;
+    bool isExtended;
+    bool isSignal;
+    std::string signalName;
+    std::string comment;
+    std::size_t lineNumber;
+};
+
 /** Carries deferred validation locations without parsing exception text. */
 class DbcDiagnosticError : public std::runtime_error {
 public:
@@ -38,6 +47,9 @@ struct DbcParseContext {
     std::vector<std::vector<std::size_t>> signalLines = {};
     void ValidateMultiplexing(const std::string &filePath) const;
 
+    std::vector<PendingComment> pendingComments = {};
+    void ResolveComments(const std::string &filePath);
+
     void ResolveValueDescriptions(const std::string &filePath);
 };
 
@@ -67,8 +79,6 @@ class DbcCommentHandler : public DbcStatementHandler {
 public:
     void Handle(const std::string &line, DbcParseContext &context) const override;
 
-private:
-    static void ParseCommentLine(const std::string &line, DbcDatabase &database);
 };
 
 class DbcValueDescriptionHandler : public DbcStatementHandler {