`make format` on new files.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
This commit is contained in:
Tim 'mithro' Ansell 2018-12-13 18:23:28 -08:00
parent a09ded0624
commit 8d61ee5ac0
3 changed files with 10 additions and 4 deletions

View File

@ -20,6 +20,7 @@ import functools
from prxray import xjson
def check_and_strip_prefix(name, prefix):
assert name.startswith(prefix), repr((name, prefix))
return name[len(prefix):]

View File

@ -13,7 +13,7 @@ def extract_numbers(s):
('VBRK_WR', 1, 'END', 2)
"""
bits = []
for m in re.finditer("([^0-9]*)([0-9]*)",s):
for m in re.finditer("([^0-9]*)([0-9]*)", s):
if m.group(1):
bits.append(m.group(1))
if m.group(2):
@ -25,10 +25,12 @@ def sort(data):
# FIXME: We assume that a list is a tileconn.json format...
if isinstance(data, list):
for o in data:
o['wire_pairs'].sort(key=lambda o: (extract_numbers(o[0]), extract_numbers(o[1])))
o['wire_pairs'].sort(
key=lambda o: (extract_numbers(o[0]), extract_numbers(o[1])))
data.sort(key=lambda o: (o['tile_types'], o['grid_deltas']))
else:
def walker(o, f):
if isinstance(o, dict):
for i in o.values():

View File

@ -26,7 +26,8 @@ def tojson(f):
class XYamlTest(unittest.TestCase):
def test(self):
s = io.StringIO("""\
s = io.StringIO(
"""\
!<xilinx/xc7series/part>
idcode: 0x362d093
global_clock_regions:
@ -40,7 +41,8 @@ global_clock_regions:
frame_count: 42
""")
djson = tojson(s)
self.assertMultiLineEqual(djson, """\
self.assertMultiLineEqual(
djson, """\
{
"global_clock_regions": {
"top": {
@ -62,6 +64,7 @@ global_clock_regions:
"idcode": 56807571
}""")
if __name__ == "__main__":
import sys
if len(sys.argv) == 1: