Fixed issue with big comment and localization.

astand · astand · commit b714eb0a2ba3 · 2021-03-14T22:50:22.000+03:00
diff --git a/src/helpers/formatter.cpp b/src/helpers/formatter.cpp
@@ -57,3 +57,31 @@ std::string str_tolower(std::string s)
   });
   return s;
 }
+
+std::string str_trim(std::string s)
+{
+  size_t passed = 0;
+
+  if (s.empty())
+    return s + '\n';
+
+  passed = 0;
+
+  while (passed < s.size())
+  {
+    if (s[s.size() - passed - 1] > ' ')
+    {
+      break;
+    }
+
+    ++passed;
+  }
+
+  if (passed != 0)
+  {
+    // remove tail with non-printable values
+    s.erase(s.size() - passed, passed);
+  }
+
+  return s;
+}
diff --git a/src/helpers/formatter.h b/src/helpers/formatter.h
@@ -12,3 +12,5 @@ std::string PrintType(uint8_t tid);
 std::string str_toupper(std::string s);
 
 std::string str_tolower(std::string s);
+
+std::string str_trim(std::string s);
diff --git a/src/parser/dbclineparser.cpp b/src/parser/dbclineparser.cpp
@@ -206,6 +206,8 @@ bool DbcLineParser::ParseSignalLine(SignalDescriptor_t* sig, const std::string&
     //value into the signal's physical value and vice versa:
     //  physical_value = raw_value * factor + offset
     //  raw_value = (physical_value - offset) / factor
+    std::setlocale(LC_ALL, "en_US.UTF-8");
+    
     sig->Factor = atof(valpart[3].c_str());
     sig->Offset = atof(valpart[4].c_str());
 
diff --git a/src/parser/dbcscanner.cpp b/src/parser/dbcscanner.cpp
@@ -1,6 +1,7 @@
 #include "dbcscanner.h"
 #include <algorithm>
 #include <math.h>
+#include "../helpers/formatter.h"
 
 #define MAX_LINE 4096
 
@@ -67,7 +68,7 @@ void DbcScanner::ParseMessageInfo(istream& readstrm)
   {
     readstrm.getline(line, MAX_LINE);
 
-    sline = line;
+    sline = str_trim(line);
 
     // New message line has been found
     if (lparser.IsMessageLine(sline))
@@ -121,12 +122,7 @@ void DbcScanner::ParseOtherInfo(istream& readstrm)
   {
     readstrm.getline(line, MAX_LINE);
 
-    sline = line;
-
-    if (sline.size() > 0 && sline.back() < ' ')
-    {
-      sline.erase(sline.size() - 1, 1);
-    }
+    sline = str_trim(line);
 
     if (lparser.ParseCommentLine(&cmmnt, sline))
     {
