Added value table parsing.

astand · astand · commit ab769a9824b7 · 2020-11-22T22:30:17.000+03:00
diff --git a/src/dbclineparser.cpp b/src/dbclineparser.cpp
@@ -18,6 +18,7 @@ static const std::string kRegCommMeta = "[ ]+";
 // This reg splits line to parts (for attributes)
 static const std::string kRegAttrMain = "[^A-Za-z0-9_\.]+";
 
+static const std::string kRegValTable = "\"";
 
 static uint64_t __maxvalues[] =
 {
@@ -363,3 +364,57 @@ bool DbcLineParser::ParseAttributeLine(AttributeDescriptor_t* attr, const std::s
 
   return ret;
 }
+
+bool DbcLineParser::ParseValTableLine(Comment_t* comm, const std::string& line)
+{
+  bool ret = false;
+
+  if (line.size() > 0)
+  {
+    if (line.find("VAL_ ") == 0)
+    {
+      valueline.clear();
+      valueline = line;
+    }
+    else if (valueline.size() > 0)
+    {
+      valueline += line;
+    }
+
+    // check if the current line is last
+    if (valueline.size() > 0 && line.back() == ';')
+    {
+      // split all line by quote char
+      auto items = resplit(valueline, kRegValTable);
+
+      if (items.size() >= 2)
+      {
+        // split first part by spaces, the last item will have first value key
+        auto meta = resplit(items[0], kRegCommMeta);
+
+        if (meta.size() == 4)
+        {
+          // ok, set items[0] -> meta[3] (set value key as first @items element)
+          items[0] = meta[3];
+
+          comm->MsgId = (clear_msgid(atoi(meta[1].c_str())));
+
+          comm->SigName = meta[2];
+          // Load value table params to container
+          comm->Text = "";
+
+          for (size_t valpair = 0; valpair < (items.size() / 2); valpair++)
+          {
+            comm->Text += items[valpair * 2 + 0] + " : ";
+            comm->Text += items[valpair * 2 + 1] + "\n";
+          }
+
+          // value table params were parse successfully
+          ret = true;
+        }
+      }
+    }
+  }
+
+  return ret;
+}
diff --git a/src/dbclineparser.h b/src/dbclineparser.h
@@ -64,6 +64,10 @@ class DbcLineParser {
   // and loads result to cm struct, return @true if parsed ok
   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);
+
  private:
   // defines the type for the message struct member
   SigType GetSigType(SignalDescriptor_t* sig);
@@ -73,5 +77,8 @@ class DbcLineParser {
 
   // string to collect attribute dbc line
   std::string attribline;
+
+  // strign to collect value line
+  std::string valueline;
 };
 
diff --git a/src/dbcscanner.cpp b/src/dbcscanner.cpp
@@ -145,6 +145,35 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)
       }
     }
 
+    if (lparser.ParseValTableLine(&cmmnt, sline))
+    {
+      uint32_t found_msg_id = cmmnt.MsgId;
+
+      // update message comment field
+      auto msg = find_message(msgs, cmmnt.MsgId);
+
+      if (msg != nullptr)
+      {
+        // comment line was found
+        if (cmmnt.ca_target == CommentTarget::Message)
+        {
+          // put comment to message descriptor
+          msg->CommentText = cmmnt.Text;
+        }
+        else if (cmmnt.ca_target == CommentTarget::Signal)
+        {
+          for (size_t i = 0; i < msg->Signals.size(); i++)
+          {
+            if (cmmnt.SigName == msg->Signals[i].Name)
+            {
+              // signal has been found, update commnet text
+              msg->Signals[i].ValueText = cmmnt.Text;
+            }
+          }
+        }
+      }
+    }
+
     if (lparser.ParseAttributeLine(&attr, sline))
     {
       auto msg = find_message(msgs, attr.MsgId);
@@ -170,10 +199,10 @@ void DbcScanner::AddMessage(MessageDescriptor_t* message)
     {
       // sort signals by start bit
       std::sort(message->Signals.begin(), message->Signals.end(),
-                [](const SignalDescriptor_t& a, const SignalDescriptor_t& b) -> bool
-      {
-        return a.StartBit < b.StartBit;
-      });
+        [](const SignalDescriptor_t& a, const SignalDescriptor_t& b) -> bool
+        {
+          return a.StartBit < b.StartBit;
+        });
 
       for (size_t i = 0; i < message->Signals.size(); i++)
       {
