Commit d4d3870e authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Minor refactoring

parent 83b10c6e
...@@ -814,14 +814,13 @@ package {process_name} with Elaborate_Body is'''] ...@@ -814,14 +814,13 @@ package {process_name} with Elaborate_Body is''']
# for the .ads file, generate the declaration of the required interfaces # for the .ads file, generate the declaration of the required interfaces
# output signals are the asynchronous RI - only one parameter # output signals are the asynchronous RI - only one parameter
for signal in process.output_signals: for signal in process.output_signals:
param_name = signal.get('param_name') \ param_name = signal.get('param_name') \
or u'{}_param'.format(signal['name']) or u'{}_param'.format(signal['name'])
# Add (optional) RI parameter # Add (optional) RI parameter
# Paramless TMs: when targetting simulation, the name of the TM is # Paramless TMs: when targetting simulation, the name of the TM is
# passed as single parameter. This allows the simualor to handle them # passed as single parameter. This allows the simualor to handle them
# dynamically, with a single callback function for all TMs # dynamically, with a single callback function for all TMs
param_spec = '' if not simu else "(tm: chars_ptr)" param_spec = '' if not simu else "(TM : chars_ptr)"
if 'type' in signal: if 'type' in signal:
typename = type_name(signal['type']) typename = type_name(signal['type'])
param_spec = u'({pName}: in out {sort}{shared})' \ param_spec = u'({pName}: in out {sort}{shared})' \
...@@ -861,10 +860,7 @@ package {process_name} with Elaborate_Body is'''] ...@@ -861,10 +860,7 @@ package {process_name} with Elaborate_Body is''']
taste_template.append(u'end Register_{};'.format(signal['name'])) taste_template.append(u'end Register_{};'.format(signal['name']))
taste_template.append(u'') taste_template.append(u'')
elif not generic: elif not generic:
ads_template.append(u'procedure RI{}{}{};' ads_template.append(f'procedure RI{SEPARATOR}{signal["name"]}{param_spec};')
.format(SEPARATOR,
signal['name'],
param_spec))
procname = process_name.lower() if taste else process_name procname = process_name.lower() if taste else process_name
# no: taste target keeps the case (with kazoo) # no: taste target keeps the case (with kazoo)
#signame = signal['name'].lower() if taste else signal['name'] #signame = signal['name'].lower() if taste else signal['name']
...@@ -877,9 +873,7 @@ package {process_name} with Elaborate_Body is'''] ...@@ -877,9 +873,7 @@ package {process_name} with Elaborate_Body is''']
# for the .ads file, generate the declaration of the external procedures # for the .ads file, generate the declaration of the external procedures
for proc in (proc for proc in process.procedures if proc.external): for proc in (proc for proc in process.procedures if proc.external):
ri_header = u'procedure RI{sep}{sig_name}'.format( ri_header = f'procedure RI{SEPARATOR}{proc.inputString}'
sep=SEPARATOR,
sig_name=proc.inputString)
params = [] params = []
params_spec = u"" params_spec = u""
if simu: if simu:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment