Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mesonlib: use ints instead of strings for numbers 

makes version comparisons even faster
This commit is contained in:
Dylan Baker 2019-04-22 16:23:57 -07:00
parent 506f8708ba
commit 8977e49a9b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mesonbuild/mesonlib.py
View File

@ -515,8 +515,8 @@ class Version:
sequences = re.finditer(r'(\d+|[a-zA-Z]+|[^a-zA-Z\d]+)', s) sequences = re.finditer(r'(\d+|[a-zA-Z]+|[^a-zA-Z\d]+)', s)
# non-alphanumeric separators are discarded # non-alphanumeric separators are discarded
sequences = [m for m in sequences if not re.match(r'[^a-zA-Z\d]+', m.group(1))] sequences = [m for m in sequences if not re.match(r'[^a-zA-Z\d]+', m.group(1))]
# numeric sequences have leading zeroes discarded # numeric sequences are converted from strings to ints
sequences = [re.sub(r'^0+(\d)', r'\1', m.group(1), 1) for m in sequences] sequences = [int(m.group(1)) if m.group(1).isdigit() else m.group(1) for m in sequences]
self._v = sequences self._v = sequences
@ -539,14 +539,15 @@ class Version:
# compare each sequence in order # compare each sequence in order
for ours, theirs in zip(self._v, other._v): for ours, theirs in zip(self._v, other._v):
# sort a non-digit sequence before a digit sequence # sort a non-digit sequence before a digit sequence
if ours.isdigit() != theirs.isdigit(): ours_is_int = isinstance(ours, int)
return 1 if ours.isdigit() else -1 if ours_is_int != isinstance(theirs, int):
return 1 if isinstance(ours, int) else -1
# compare as numbers # compare as numbers
if ours.isdigit(): if ours_is_int:
# because leading zeros have already been removed, if one number # because leading zeros have already been removed, if one number
# has more digits, it is greater # has more digits, it is greater
c = cmp(len(ours), len(theirs)) c = cmp(ours, theirs)
if c != 0: if c != 0:
return c return c
# fallthrough # fallthrough