Added more specific value tables handling.

astand · astand · commit 961c15b64449 · 2022-05-07T11:01:19.000+03:00
diff --git a/src/parser/dbclineparser.cpp b/src/parser/dbclineparser.cpp
@@ -1,4 +1,6 @@
 #include "dbclineparser.h"
+#include <helpers/formatter.h>
+#include <stdlib.h>
 #include <clocale>
 #include <regex>
 #include <math.h>
@@ -515,7 +517,7 @@ bool DbcLineParser::ParseAttributeLine(AttributeDescriptor_t* attr, const std::s
   return ret;
 }
 
-bool DbcLineParser::ParseValTableLine(Comment_t* comm, const std::string& line)
+bool DbcLineParser::ParseValTableLine(Comment_t* comm, const std::string& line, ValTable_t& vtab)
 {
   bool ret = false;
 
@@ -546,10 +548,17 @@ bool DbcLineParser::ParseValTableLine(Comment_t* comm, const std::string& line)
         comm->Text = "";
         comm->ca_target = CommentTarget::Signal;
 
+        // prepare value table container
+        vtab.SigName = items[2];
+        vtab.vpairs.clear();
+
         for (size_t valpair = 3; valpair < (items.size() - 1); valpair += 2)
         {
           comm->Text += " " + items[valpair + 0] + " : ";
           comm->Text += items[valpair + 1] + '\n';
+
+          auto valdef = make_c_name(items[valpair + 1]);
+          vtab.vpairs.push_back({valdef, (uint32_t)atoll((items[valpair + 0]).c_str())});
         }
 
         if (comm->Text.size() > 0)
diff --git a/src/parser/dbclineparser.h b/src/parser/dbclineparser.h
@@ -65,8 +65,9 @@ class DbcLineParser {
   bool ParseCommentLine(Comment_t* cm, const std::string& line);
 
   // tries to parse value table string in line
-  // and load result to attr ValueStr, return true if parsed ok
-  bool ParseValTableLine(Comment_t* cm, const std::string& line);
+  // saves result as comment text in @cm object, and as
+  // pairs of items (definition / value) in @vtab
+  bool ParseValTableLine(Comment_t* cm, const std::string& line, ValTable_t& vtab);
 
   /**
    * @brief tries to find string with information about frame which has
diff --git a/src/parser/dbcscanner.cpp b/src/parser/dbcscanner.cpp
@@ -154,6 +154,8 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)
 
   Comment_t cmmnt;
 
+  ValTable_t vals;
+
   AttributeDescriptor_t attr;
 
   while (!readstrm.eof())
@@ -229,7 +231,7 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)
       }
     }
 
-    if (lparser.ParseValTableLine(&cmmnt, sline))
+    if (lparser.ParseValTableLine(&cmmnt, sline, vals))
     {
       // update message comment field
       auto msg = find_message(dblist.msgs, cmmnt.MsgId);
@@ -250,6 +252,8 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)
             {
               // signal has been found, update commnet text
               msg->Signals[i].ValueText = cmmnt.Text;
+              // save collected value table's definitions to signal
+              msg->Signals[i].ValDefs = vals;
             }
           }
         }
diff --git a/src/parser/dbcscanner.h b/src/parser/dbcscanner.h
@@ -31,4 +31,7 @@ class DbcScanner {
 
   DbcLineParser lparser;
 
+  // this variable is used for gathering value table signal's information
+  std::pair<std::string, uint32_t> vpairs;
+
 };
diff --git a/src/types/comment.h b/src/types/comment.h
@@ -2,6 +2,7 @@
 
 #include <stdint.h>
 #include <string>
+#include <vector>
 
 enum class CommentTarget
 {
@@ -27,3 +28,12 @@ typedef struct
   std::string Text;
 
 } Comment_t;
+
+
+typedef struct
+{
+  std::string SigName;
+
+  std::vector<std::pair<std::string, uint32_t>> vpairs{};
+
+} ValTable_t;
diff --git a/src/types/message.h b/src/types/message.h
@@ -83,6 +83,8 @@ typedef struct
 
   std::vector<std::string> RecS;
 
+  ValTable_t ValDefs;
+
   std::string CommentText;
 
   std::string ValueText;

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,8 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)`
`154`	`154`
`155`	`155`	`Comment_t cmmnt;`
`156`	`156`
	`157`	`+ ValTable_t vals;`
	`158`	`+`
`157`	`159`	`AttributeDescriptor_t attr;`
`158`	`160`
`159`	`161`	`while (!readstrm.eof())`
`@@ -229,7 +231,7 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)`
`229`	`231`	`}`
`230`	`232`	`}`
`231`	`233`
`232`		`- if (lparser.ParseValTableLine(&cmmnt, sline))`
	`234`	`+ if (lparser.ParseValTableLine(&cmmnt, sline, vals))`
`233`	`235`	`{`
`234`	`236`	`// update message comment field`
`235`	`237`	`auto msg = find_message(dblist.msgs, cmmnt.MsgId);`
`@@ -250,6 +252,8 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)`
`250`	`252`	`{`
`251`	`253`	`// signal has been found, update commnet text`
`252`	`254`	`msg->Signals[i].ValueText = cmmnt.Text;`
	`255`	`+ // save collected value table's definitions to signal`
	`256`	`+ msg->Signals[i].ValDefs = vals;`
`253`	`257`	`}`
`254`	`258`	`}`
`255`	`259`	`}`