From a187908c0e007ca4d1ab2ba7fbe15590fa48aaf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= Date: Mon, 12 Jul 2021 11:10:30 +0200 Subject: isort: Comment and improve code --- isort | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/isort b/isort index 27a589d..af7828e 100755 --- a/isort +++ b/isort @@ -2,7 +2,20 @@ # isort -- sort C variable declarations separated by commas -s/([^,]*?)(\S+[,;])/$2/; $prefix = $1; -s/;$/,/; @words = sort split /\s+/; +# Extract words, save prefix. +s/([^,]*?)(\S+[,;])/$2/; +$prefix = $1; + +# Ensure all words end with comma. +$semicolon = s/;$/,/; + +# Sort words. +@words = sort { + ($x = $a) =~ s/^\*//; + ($y = $b) =~ s/^\*//; + $x cmp $y +} split /\s+/; + +# Join words, add prefix and semicolon. $_ = $prefix . (join ' ', @words) . "\n"; -s/,$/;/; +s/,$/;/ if $semicolon; -- cgit v1.2.3