45
45
import os
46
46
import yaml
47
47
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
50
50
from generate_parameter_library_py .string_filters_cpp import (
51
51
valid_string_cpp ,
52
52
valid_string_python ,
@@ -162,13 +162,13 @@ def __init__(
162
162
default_value : Any ,
163
163
):
164
164
if language == 'cpp' :
165
- self .conversation = CPPConverstions ()
165
+ self .conversion = CPPConversions ()
166
166
elif language == 'rst' or language == 'markdown' :
167
167
# cpp is used here because it the desired style of the markdown,
168
168
# e.g. "false" for C++ instead of "False" for Python
169
- self .conversation = CPPConverstions ()
169
+ self .conversion = CPPConversions ()
170
170
elif language == 'python' :
171
- self .conversation = PythonConvertions ()
171
+ self .conversion = PythonConversions ()
172
172
else :
173
173
raise compile_error (
174
174
'Invalid language, only c++ and python are currently supported.'
@@ -181,21 +181,21 @@ def __init__(
181
181
self .defined_type , template = self .process_type (defined_type )
182
182
self .array_type = array_type (self .defined_type )
183
183
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 :
185
185
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
187
187
)
188
188
raise compile_error (
189
189
f'Invalid parameter type `{ defined_type } ` for parameter { param_name } . Allowed types are: '
190
190
+ allowed
191
191
)
192
- func = self .conversation .defined_type_to_lang_type [self .defined_type ]
192
+ func = self .conversion .defined_type_to_lang_type [self .defined_type ]
193
193
self .lang_type = func (self .defined_type , template )
194
194
tmp = defined_type .split ('_' )
195
195
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 ]
197
197
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 ]
199
199
try :
200
200
self .lang_str_value = func (default_value )
201
201
except TypeCheckError :
@@ -204,18 +204,18 @@ def __init__(
204
204
)
205
205
206
206
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 :
208
208
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 ]
210
210
211
211
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 ))]
213
213
214
214
def get_yaml_type_from_python (self , arg ):
215
215
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 ]))]
217
217
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 ]))]
219
219
220
220
def process_type (self , defined_type ):
221
221
raise NotImplemented ()
@@ -237,7 +237,7 @@ def process_type(self, defined_type):
237
237
size = fixed_type_size (defined_type )
238
238
tmp = defined_type .split ('_' )
239
239
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 ]
241
241
lang_base_type = func (yaml_base_type , None )
242
242
defined_type = get_fixed_type (defined_type )
243
243
return defined_type , (lang_base_type , size )
@@ -335,11 +335,11 @@ def __init__(
335
335
self .arguments = []
336
336
337
337
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 (
339
339
self .function_name , self .code_gen_variable .lang_base_type
340
340
)
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
343
343
344
344
code = function_name + '(param'
345
345
for arg in self .arguments :
@@ -511,7 +511,7 @@ def __str__(self):
511
511
self .parameter_value = ''
512
512
else :
513
513
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
515
515
516
516
parameter_validations = self .parameter_validations
517
517
@@ -568,7 +568,7 @@ def __str__(self):
568
568
else :
569
569
default_value = 'non-empty'
570
570
571
- bool_to_str = self .code_gen_variable .conversation .bool_to_str
571
+ bool_to_str = self .code_gen_variable .conversion .bool_to_str
572
572
parameter_field = get_dynamic_parameter_field (self .parameter_name )
573
573
mapped_params = get_dynamic_mapped_parameter (self .parameter_name )
574
574
parameter_map = get_dynamic_parameter_map (self .parameter_name )
@@ -790,16 +790,16 @@ def parse_params(self, name, value, nested_name_list):
790
790
791
791
param_name = code_gen_variable .param_name
792
792
update_parameter_invalid = (
793
- code_gen_variable .conversation .update_parameter_fail_validation ()
793
+ code_gen_variable .conversion .update_parameter_fail_validation ()
794
794
)
795
795
update_parameter_valid = (
796
- code_gen_variable .conversation .update_parameter_pass_validation ()
796
+ code_gen_variable .conversion .update_parameter_pass_validation ()
797
797
)
798
798
declare_parameter_invalid = (
799
- code_gen_variable .conversation .initialization_fail_validation (param_name )
799
+ code_gen_variable .conversion .initialization_fail_validation (param_name )
800
800
)
801
801
declare_parameter_valid = (
802
- code_gen_variable .conversation .initialization_pass_validation (param_name )
802
+ code_gen_variable .conversion .initialization_pass_validation (param_name )
803
803
)
804
804
805
805
# add variable to struct
0 commit comments