Skip to content

target: mbedos5: Sort magic strings #1518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 11, 2017
Merged

target: mbedos5: Sort magic strings #1518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions targets/mbedos5/tools/generate_pins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,11 @@ def enumerate_pins(c_source_file, include_dirs, definitions):
# enumerate pins from PinNames.h
pins = enumerate_pins(pins_file, ['./tools'] + list(includes), defines)

out_file = '\r\n'.join(['var %s = %s;' % pin for pin in pins.iteritems()])
# first sort alphabetically, then by length.
pins = [ (x, pins[x]) for x in pins] # turn dict into tuples, which can be sorted
pins = sorted(pins, key = lambda x: (len(x[0]), x[0].lower()))

out_file = '\r\n'.join(['var %s = %s;' % pin for pin in pins])
args.o.write(out_file)

LICENSE = '''/* Copyright JS Foundation and other contributors, http://js.foundation
Expand All @@ -198,21 +202,21 @@ def enumerate_pins(c_source_file, include_dirs, definitions):
unsigned int jsmbed_js_magic_string_count = {};
'''.format(len(pins))

LENGTHS = ',\n '.join(str(len(name)) for name in pins.iterkeys())
LENGTHS = ',\n '.join(str(len(pin[0])) for pin in pins)
LENGTHS_SOURCE = '''
unsigned int jsmbed_js_magic_string_lengths[] = {
%s
};
''' % LENGTHS

MAGIC_VALUES = ',\n '.join(str(value) for value in pins.itervalues())
MAGIC_VALUES = ',\n '.join(str(pin[1]) for pin in pins)
MAGIC_SOURCE = '''
unsigned int jsmbed_js_magic_string_values[] = {
%s
};
''' % MAGIC_VALUES

MAGIC_STRINGS = ',\n '.join('"' + name + '"' for name in pins.iterkeys())
MAGIC_STRINGS = ',\n '.join('"' + pin[0] + '"' for pin in pins)
MAGIC_STRING_SOURCE = '''
const char * jsmbed_js_magic_strings[] = {
%s
Expand Down