Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

verification/dot2c: Remove __buff_to_string() and cleanup

str.join() can do what __buff_to_string() does. Therefore replace
__buff_to_string() to make the scripts more pythonic.

Also clean and remove some intermediate functions.

Reviewed-by: Nam Cao <namcao@linutronix.de>
Link: https://lore.kernel.org/r/20251126104241.291258-7-gmonaco@redhat.com
Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>

+6 -29
+6 -29
tools/verification/rvgen/rvgen/dot2c.py
··· 26 26 super().__init__(file_path, model_name) 27 27 self.line_length = 100 28 28 29 - def __buff_to_string(self, buff): 30 - string = "" 31 - 32 - for line in buff: 33 - string = string + line + "\n" 34 - 35 - # cut off the last \n 36 - return string[:-1] 37 - 38 29 def __get_enum_states_content(self) -> list[str]: 39 30 buff = [] 40 31 buff.append("\t%s%s = 0," % (self.initial_state, self.enum_suffix)) ··· 36 45 37 46 return buff 38 47 39 - def get_enum_states_string(self): 40 - buff = self.__get_enum_states_content() 41 - return self.__buff_to_string(buff) 42 - 43 48 def format_states_enum(self) -> list[str]: 44 49 buff = [] 45 50 buff.append("enum %s {" % self.enum_states_def) 46 - buff.append(self.get_enum_states_string()) 51 + buff += self.__get_enum_states_content() 47 52 buff.append("};\n") 48 53 49 54 return buff ··· 58 71 59 72 return buff 60 73 61 - def get_enum_events_string(self): 62 - buff = self.__get_enum_events_content() 63 - return self.__buff_to_string(buff) 64 - 65 74 def format_events_enum(self) -> list[str]: 66 75 buff = [] 67 76 buff.append("enum %s {" % self.enum_events_def) 68 - buff.append(self.get_enum_events_string()) 77 + buff += self.__get_enum_events_content() 69 78 buff.append("};\n") 70 79 71 80 return buff ··· 110 127 111 128 return string 112 129 113 - def get_aut_init_events_string(self): 114 - return self.__get_string_vector_per_line_content(self.events) 115 - 116 - def get_aut_init_states_string(self): 117 - return self.__get_string_vector_per_line_content(self.states) 118 - 119 130 def format_aut_init_events_string(self) -> list[str]: 120 131 buff = [] 121 132 buff.append("\t.event_names = {") 122 - buff.append(self.get_aut_init_events_string()) 133 + buff.append(self.__get_string_vector_per_line_content(self.events)) 123 134 buff.append("\t},") 124 135 return buff 125 136 126 137 def format_aut_init_states_string(self) -> list[str]: 127 138 buff = [] 128 139 buff.append("\t.state_names = {") 129 - buff.append(self.get_aut_init_states_string()) 140 + buff.append(self.__get_string_vector_per_line_content(self.states)) 130 141 buff.append("\t},") 131 142 132 143 return buff ··· 155 178 line += "\n\t\t}," if linetoolong else " }," 156 179 buff.append(line) 157 180 158 - return self.__buff_to_string(buff) 181 + return '\n'.join(buff) 159 182 160 183 def format_aut_init_function(self) -> list[str]: 161 184 buff = [] ··· 230 253 231 254 def print_model_classic(self): 232 255 buff = self.format_model() 233 - print(self.__buff_to_string(buff)) 256 + print('\n'.join(buff))