Skip to content

Commit 4b02b10

Browse files
committed
Fix various typos of the word conversion
1 parent b39fb6d commit 4b02b10

File tree

4 files changed

+27
-28
lines changed

4 files changed

+27
-28
lines changed

generate_parameter_library_py/generate_parameter_library_py/cpp_convertions.py renamed to generate_parameter_library_py/generate_parameter_library_py/cpp_conversions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from yaml.scanner import ScannerError
99

1010

11-
class CPPConverstions:
11+
class CPPConversions:
1212
def __init__(self):
1313
self.defined_type_to_lang_type = {
1414
'none': lambda defined_type, templates: None,

generate_parameter_library_py/generate_parameter_library_py/parse_yaml.py

+25-25
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
import os
4646
import yaml
4747

48-
from generate_parameter_library_py.cpp_convertions import CPPConverstions
49-
from generate_parameter_library_py.python_convertions import PythonConvertions
48+
from generate_parameter_library_py.cpp_conversions import CPPConversions
49+
from generate_parameter_library_py.python_conversions import PythonConversions
5050
from generate_parameter_library_py.string_filters_cpp import (
5151
valid_string_cpp,
5252
valid_string_python,
@@ -162,13 +162,13 @@ def __init__(
162162
default_value: Any,
163163
):
164164
if language == 'cpp':
165-
self.conversation = CPPConverstions()
165+
self.conversion = CPPConversions()
166166
elif language == 'rst' or language == 'markdown':
167167
# cpp is used here because it the desired style of the markdown,
168168
# e.g. "false" for C++ instead of "False" for Python
169-
self.conversation = CPPConverstions()
169+
self.conversion = CPPConversions()
170170
elif language == 'python':
171-
self.conversation = PythonConvertions()
171+
self.conversion = PythonConversions()
172172
else:
173173
raise compile_error(
174174
'Invalid language, only c++ and python are currently supported.'
@@ -181,21 +181,21 @@ def __init__(
181181
self.defined_type, template = self.process_type(defined_type)
182182
self.array_type = array_type(self.defined_type)
183183

184-
if self.defined_type not in self.conversation.defined_type_to_lang_type:
184+
if self.defined_type not in self.conversion.defined_type_to_lang_type:
185185
allowed = ', '.join(
186-
key for key in self.conversation.defined_type_to_lang_type
186+
key for key in self.conversion.defined_type_to_lang_type
187187
)
188188
raise compile_error(
189189
f'Invalid parameter type `{defined_type}` for parameter {param_name}. Allowed types are: '
190190
+ allowed
191191
)
192-
func = self.conversation.defined_type_to_lang_type[self.defined_type]
192+
func = self.conversion.defined_type_to_lang_type[self.defined_type]
193193
self.lang_type = func(self.defined_type, template)
194194
tmp = defined_type.split('_')
195195
self.defined_base_type = tmp[0]
196-
func = self.conversation.defined_type_to_lang_type[self.defined_base_type]
196+
func = self.conversion.defined_type_to_lang_type[self.defined_base_type]
197197
self.lang_base_type = func(self.defined_base_type, template)
198-
func = self.conversation.lang_str_value_func[self.defined_type]
198+
func = self.conversion.lang_str_value_func[self.defined_type]
199199
try:
200200
self.lang_str_value = func(default_value)
201201
except TypeCheckError:
@@ -204,18 +204,18 @@ def __init__(
204204
)
205205

206206
def parameter_as_function_str(self):
207-
if self.defined_type not in self.conversation.yaml_type_to_as_function:
207+
if self.defined_type not in self.conversion.yaml_type_to_as_function:
208208
raise compile_error('invalid yaml type: %s' % type(self.defined_type))
209-
return self.conversation.yaml_type_to_as_function[self.defined_type]
209+
return self.conversion.yaml_type_to_as_function[self.defined_type]
210210

211211
def get_python_val_to_str_func(self, arg):
212-
return self.conversation.python_val_to_str_func[str(type(arg))]
212+
return self.conversion.python_val_to_str_func[str(type(arg))]
213213

214214
def get_yaml_type_from_python(self, arg):
215215
if isinstance(arg, list):
216-
return self.conversation.python_list_to_yaml_type[str(type(arg[0]))]
216+
return self.conversion.python_list_to_yaml_type[str(type(arg[0]))]
217217
else:
218-
return self.conversation.python_val_to_yaml_type[str(type(arg[0]))]
218+
return self.conversion.python_val_to_yaml_type[str(type(arg[0]))]
219219

220220
def process_type(self, defined_type):
221221
raise NotImplemented()
@@ -237,7 +237,7 @@ def process_type(self, defined_type):
237237
size = fixed_type_size(defined_type)
238238
tmp = defined_type.split('_')
239239
yaml_base_type = tmp[0]
240-
func = self.conversation.defined_type_to_lang_type[yaml_base_type]
240+
func = self.conversion.defined_type_to_lang_type[yaml_base_type]
241241
lang_base_type = func(yaml_base_type, None)
242242
defined_type = get_fixed_type(defined_type)
243243
return defined_type, (lang_base_type, size)
@@ -335,11 +335,11 @@ def __init__(
335335
self.arguments = []
336336

337337
def __str__(self):
338-
function_name = self.code_gen_variable.conversation.get_func_signature(
338+
function_name = self.code_gen_variable.conversion.get_func_signature(
339339
self.function_name, self.code_gen_variable.lang_base_type
340340
)
341-
open_bracket = self.code_gen_variable.conversation.open_bracket
342-
close_bracket = self.code_gen_variable.conversation.close_bracket
341+
open_bracket = self.code_gen_variable.conversion.open_bracket
342+
close_bracket = self.code_gen_variable.conversion.close_bracket
343343

344344
code = function_name + '(param'
345345
for arg in self.arguments:
@@ -511,7 +511,7 @@ def __str__(self):
511511
self.parameter_value = ''
512512
else:
513513
self.parameter_value = self.parameter_name
514-
bool_to_str = self.code_gen_variable.conversation.bool_to_str
514+
bool_to_str = self.code_gen_variable.conversion.bool_to_str
515515

516516
parameter_validations = self.parameter_validations
517517

@@ -568,7 +568,7 @@ def __str__(self):
568568
else:
569569
default_value = 'non-empty'
570570

571-
bool_to_str = self.code_gen_variable.conversation.bool_to_str
571+
bool_to_str = self.code_gen_variable.conversion.bool_to_str
572572
parameter_field = get_dynamic_parameter_field(self.parameter_name)
573573
mapped_params = get_dynamic_mapped_parameter(self.parameter_name)
574574
parameter_map = get_dynamic_parameter_map(self.parameter_name)
@@ -790,16 +790,16 @@ def parse_params(self, name, value, nested_name_list):
790790

791791
param_name = code_gen_variable.param_name
792792
update_parameter_invalid = (
793-
code_gen_variable.conversation.update_parameter_fail_validation()
793+
code_gen_variable.conversion.update_parameter_fail_validation()
794794
)
795795
update_parameter_valid = (
796-
code_gen_variable.conversation.update_parameter_pass_validation()
796+
code_gen_variable.conversion.update_parameter_pass_validation()
797797
)
798798
declare_parameter_invalid = (
799-
code_gen_variable.conversation.initialization_fail_validation(param_name)
799+
code_gen_variable.conversion.initialization_fail_validation(param_name)
800800
)
801801
declare_parameter_valid = (
802-
code_gen_variable.conversation.initialization_pass_validation(param_name)
802+
code_gen_variable.conversion.initialization_pass_validation(param_name)
803803
)
804804

805805
# add variable to struct

generate_parameter_library_py/generate_parameter_library_py/python_convertions.py renamed to generate_parameter_library_py/generate_parameter_library_py/python_conversions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from yaml.scanner import ScannerError
99

1010

11-
class PythonConvertions:
11+
class PythonConversions:
1212
def __init__(self):
1313
self.defined_type_to_lang_type = {
1414
'none': lambda defined_type, templates: None,

generate_parameter_library_py/generate_parameter_library_py/setup_helper.py

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ def generate_parameter_module(module_name, yaml_file, validation_module=''):
5555
install_dir = os.path.join(
5656
colcon_ws,
5757
'install',
58-
pkg_name,
5958
'lib',
6059
py_version,
6160
'site-packages',

0 commit comments

Comments
 (0)