SigPrinter minor refactoring. Income Msgs as const.

astand · astand · commit 26cf3f3212a1 · 2020-11-26T22:12:57.000+03:00
diff --git a/src/codegen/c-sigprinter.cpp b/src/codegen/c-sigprinter.cpp
@@ -23,17 +23,17 @@ CSigPrinter::~CSigPrinter()
   sigs_expr.clear();
 }
 
-void CSigPrinter::AddMessage(const std::vector<MessageDescriptor_t*> message)
+void CSigPrinter::LoadMessages(const std::vector<MessageDescriptor_t*> message)
 {
   sigs_expr.clear();
 
   for (size_t i = 0; i < message.size(); i++)
   {
-    AddMessage(*(message[i]));
+    LoadMessage(*(message[i]));
   }
 }
 
-void CSigPrinter::AddMessage(const MessageDescriptor_t& message)
+void CSigPrinter::LoadMessage(const MessageDescriptor_t& message)
 {
   CiExpr_t* nexpr = new CiExpr_t;
 
@@ -94,14 +94,14 @@ int32_t CSigPrinter::BuildCConvertExprs(CiExpr_t* msg)
   return ret;
 }
 
-std::string CSigPrinter::PrintSignalExpr(SignalDescriptor_t* sig,
-    std::vector<std::string>& to_bytes)
+std::string CSigPrinter::PrintSignalExpr(const SignalDescriptor_t* sig,
+  std::vector<std::string>& to_bytes)
 {
   // value for collecting expression (to_signal)
   std::string tosigexpr;
 
   uint16_t startb = (uint16_t)((sig->Order == BitLayout::kIntel) ?
-                               (sig->StartBit + (sig->LengthBit - 1)) : (sig->StartBit));
+    (sig->StartBit + (sig->LengthBit - 1)) : (sig->StartBit));
 
   if (startb > 63)
     startb = 63;
@@ -118,7 +118,7 @@ std::string CSigPrinter::PrintSignalExpr(SignalDescriptor_t* sig,
     tosigexpr += workbuff;
 
     snprintf(workbuff, WBUFF_LEN, "((_m->{%s} & (%s)) << %d)", sig->Name.c_str(), msk[slen].c_str(),
-             bbc - slen);
+      bbc - slen);
     AppendToByteLine(to_bytes[bn], workbuff);
   }
   else if (bbc == slen)
@@ -144,7 +144,7 @@ std::string CSigPrinter::PrintSignalExpr(SignalDescriptor_t* sig,
     tosigexpr += workbuff;
 
     snprintf(workbuff, WBUFF_LEN, "((_m->%s >> %d) & (%s))", sig->Name.c_str(), slen,
-             msk[bbc].c_str());
+      msk[bbc].c_str());
     AppendToByteLine(to_bytes[bn], workbuff);
 
     while ((slen - 8) >= 0)
@@ -190,7 +190,7 @@ std::string CSigPrinter::PrintSignalExpr(SignalDescriptor_t* sig,
       tosigexpr += workbuff;
 
       snprintf(workbuff, WBUFF_LEN, "((_m->%s & (%s)) << %d)", sig->Name.c_str(), msk[slen].c_str(),
-               8 - slen);
+        8 - slen);
       AppendToByteLine(to_bytes[bn], workbuff);
     }
   }
@@ -221,4 +221,4 @@ void CSigPrinter::AppendToByteLine(std::string& expr, std::string str)
     // First appending
     expr = str;
   }
-}
+}
diff --git a/src/codegen/c-sigprinter.h b/src/codegen/c-sigprinter.h
@@ -8,8 +8,8 @@ class CSigPrinter
 	CSigPrinter();
 	~CSigPrinter();
 
-	void AddMessage(const MessageDescriptor_t& message);
-	void AddMessage(const std::vector<MessageDescriptor_t*> message);
+	void LoadMessage(const MessageDescriptor_t& message);
+	void LoadMessages(const std::vector<MessageDescriptor_t*> message);
 
 public: 
 	std::vector<CiExpr_t*> sigs_expr;
@@ -19,7 +19,7 @@ class CSigPrinter
 
 	int32_t BuildCConvertExprs(CiExpr_t* msg);
 
-	std::string PrintSignalExpr(SignalDescriptor_t* sig, std::vector<std::string>& to_bytes);
+	std::string PrintSignalExpr(const SignalDescriptor_t* sig, std::vector<std::string>& to_bytes);
 
 	void AppendToByteLine(std::string& expr, std::string str);
 

Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,17 @@ CSigPrinter::~CSigPrinter()`
`23`	`23`	`sigs_expr.clear();`
`24`	`24`	`}`
`25`	`25`
`26`		`-void CSigPrinter::AddMessage(const std::vector<MessageDescriptor_t*> message)`
	`26`	`+void CSigPrinter::LoadMessages(const std::vector<MessageDescriptor_t*> message)`
`27`	`27`	`{`
`28`	`28`	`sigs_expr.clear();`
`29`	`29`
`30`	`30`	`for (size_t i = 0; i < message.size(); i++)`
`31`	`31`	`{`
`32`		`- AddMessage(*(message[i]));`
	`32`	`+ LoadMessage(*(message[i]));`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`-void CSigPrinter::AddMessage(const MessageDescriptor_t& message)`
	`36`	`+void CSigPrinter::LoadMessage(const MessageDescriptor_t& message)`
`37`	`37`	`{`
`38`	`38`	`CiExpr_t* nexpr = new CiExpr_t;`
`39`	`39`
`@@ -94,14 +94,14 @@ int32_t CSigPrinter::BuildCConvertExprs(CiExpr_t* msg)`
`94`	`94`	`return ret;`
`95`	`95`	`}`
`96`	`96`
`97`		`-std::string CSigPrinter::PrintSignalExpr(SignalDescriptor_t* sig,`
`98`		`- std::vector<std::string>& to_bytes)`
	`97`	`+std::string CSigPrinter::PrintSignalExpr(const SignalDescriptor_t* sig,`
	`98`	`+ std::vector<std::string>& to_bytes)`
`99`	`99`	`{`
`100`	`100`	`// value for collecting expression (to_signal)`
`101`	`101`	`std::string tosigexpr;`
`102`	`102`
`103`	`103`	`uint16_t startb = (uint16_t)((sig->Order == BitLayout::kIntel) ?`
`104`		`- (sig->StartBit + (sig->LengthBit - 1)) : (sig->StartBit));`
	`104`	`+ (sig->StartBit + (sig->LengthBit - 1)) : (sig->StartBit));`
`105`	`105`
`106`	`106`	`if (startb > 63)`
`107`	`107`	`startb = 63;`
`@@ -118,7 +118,7 @@ std::string CSigPrinter::PrintSignalExpr(SignalDescriptor_t* sig,`
`118`	`118`	`tosigexpr += workbuff;`
`119`	`119`
`120`	`120`	`snprintf(workbuff, WBUFF_LEN, "((_m->{%s} & (%s)) << %d)", sig->Name.c_str(), msk[slen].c_str(),`
`121`		`- bbc - slen);`
	`121`	`+ bbc - slen);`
`122`	`122`	`AppendToByteLine(to_bytes[bn], workbuff);`
`123`	`123`	`}`
`124`	`124`	`else if (bbc == slen)`
`@@ -144,7 +144,7 @@ std::string CSigPrinter::PrintSignalExpr(SignalDescriptor_t* sig,`
`144`	`144`	`tosigexpr += workbuff;`
`145`	`145`
`146`	`146`	`snprintf(workbuff, WBUFF_LEN, "((_m->%s >> %d) & (%s))", sig->Name.c_str(), slen,`
`147`		`- msk[bbc].c_str());`
	`147`	`+ msk[bbc].c_str());`
`148`	`148`	`AppendToByteLine(to_bytes[bn], workbuff);`
`149`	`149`
`150`	`150`	`while ((slen - 8) >= 0)`
`@@ -190,7 +190,7 @@ std::string CSigPrinter::PrintSignalExpr(SignalDescriptor_t* sig,`
`190`	`190`	`tosigexpr += workbuff;`
`191`	`191`
`192`	`192`	`snprintf(workbuff, WBUFF_LEN, "((_m->%s & (%s)) << %d)", sig->Name.c_str(), msk[slen].c_str(),`
`193`		`- 8 - slen);`
	`193`	`+ 8 - slen);`
`194`	`194`	`AppendToByteLine(to_bytes[bn], workbuff);`
`195`	`195`	`}`
`196`	`196`	`}`
`@@ -221,4 +221,4 @@ void CSigPrinter::AppendToByteLine(std::string& expr, std::string str)`
`221`	`221`	`// First appending`
`222`	`222`	`expr = str;`
`223`	`223`	`}`
`224`		`-}`
	`224`	`+}`