Fs creator keeps lowcase drvname in separated field.

astand · astand · commit bf0ed04585d4 · 2021-01-11T20:13:32.000+03:00
diff --git a/src/codegen/c-main-generator.cpp b/src/codegen/c-main-generator.cpp
@@ -154,24 +154,26 @@ void CiMainGenerator::Generate(std::vector<MessageDescriptor_t*>& msgs, const Fs
 
     fwriter->AppendLine(
       PrintF("uint32_t Unpack_%s_%s(%s_t* _m, const uint8_t* _d, uint8_t dlc_);",
-             m.Name.c_str(), fsd.drvname.c_str(), m.Name.c_str()));
+             m.Name.c_str(), fsd.DrvName_orig.c_str(), m.Name.c_str()));
 
     fwriter->AppendLine(PrintF("#ifdef %s", fsd.usesruct_def.c_str()));
 
     fwriter->AppendLine(
       PrintF("uint32_t Pack_%s_%s(const %s_t* _m, __CoderDbcCanFrame_t__* cframe);",
-             m.Name.c_str(), fsd.drvname.c_str(), m.Name.c_str()));
+             m.Name.c_str(), fsd.DrvName_orig.c_str(), m.Name.c_str()));
 
     fwriter->AppendLine("#else");
 
     fwriter->AppendLine(
       PrintF("uint32_t Pack_%s_%s(const %s_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide);",
-             m.Name.c_str(), fsd.drvname.c_str(), m.Name.c_str()));
+             m.Name.c_str(), fsd.DrvName_orig.c_str(), m.Name.c_str()));
 
     fwriter->AppendLine(PrintF("#endif // %s", fsd.usesruct_def.c_str()), 2);
   }
 
   fwriter->AppendLine("#ifdef __cplusplus\n}\n#endif");
+
+  // save fwrite cached text to file
   fwriter->Flush(fsd.core_h.fpath);
 
   // 3 step is to print main source file
diff --git a/src/codegen/fs-creator.cpp b/src/codegen/fs-creator.cpp
@@ -75,25 +75,25 @@ bool FsCreator::PrepareDirectory(std::string drvname, std::string basepath, bool
   if (ret)
   {
     // directory valid and exists, set all the values
-    FS.drvname = drvname;
+    FS.DrvName_orig = drvname;
     FS.DRVNAME = str_toupper(drvname);
+    FS.drvname = str_tolower(drvname);
 
-    std::string ldrvname = str_tolower(drvname);
 
     FS.core_h.dir = work_dir_path;
-    FS.core_h.fname = ldrvname + ".h";
+    FS.core_h.fname = FS.drvname + ".h";
     FS.core_h.fpath = work_dir_path + "/" + FS.core_h.fname;
 
     FS.core_c.dir = work_dir_path;
-    FS.core_c.fname = ldrvname + ".c";
+    FS.core_c.fname = FS.drvname + ".c";
     FS.core_c.fpath = work_dir_path + "/" + FS.core_c.fname;
 
     FS.util_h.dir = work_dir_path;
-    FS.util_h.fname = ldrvname + "_binutil" + ".h";
+    FS.util_h.fname = FS.drvname + "_binutil" + ".h";
     FS.util_h.fpath = work_dir_path + "/" + FS.util_h.fname;
 
     FS.util_c.dir = work_dir_path;
-    FS.util_c.fname = ldrvname + "_binutil" + ".c";
+    FS.util_c.fname = FS.drvname + "_binutil" + ".c";
     FS.util_c.fpath = work_dir_path + "/" + FS.util_c.fname;
 
     snprintf(_tmpb, kTmpLen, "%s_USE_BITS_SIGNAL", FS.DRVNAME.c_str());
diff --git a/src/codegen/fs-creator.h b/src/codegen/fs-creator.h
@@ -6,6 +6,8 @@
 
 typedef struct
 {
+  // original driver name view
+  std::string DrvName_orig;
   // low case driver name
   std::string drvname;
   // up case driver name
@@ -26,7 +28,7 @@ typedef struct
 // This class is used to build all neccessary string -ed
 // value that will be required during code generation
 // (paths, file names, drvnames, common defines etc)
-// if preparation ends with true, the collection of 
+// if preparation ends with true, the collection of
 // values can be used.
 class FsCreator {
  public:
