sablink/molecules
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[molecules] modify.pl: fix commas in sorting with delete

Browse Source
This commit is contained in:
Sławomir Nizio 2011-10-14 07:05:05 +02:00
parent 9110722de7
commit 1c7473fd79
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modify.pl
View File

@ -193,17 +193,8 @@ sub insert_elem {
if ($opts{sort}) { if ($opts{sort}) {
# $text_to_input doesn't need to be defined - provide --sort without # $text_to_input doesn't need to be defined - provide --sort without
# adding anything # adding anything
if (@section_strings > 0) { unshift @section_strings, $text_to_input . "," if defined $text_to_input;
# to have commas where they need to be after sorting sort_elem();
$section_strings[-1] .= "," unless $section_strings[-1] =~ /,$/;
}
push @section_strings, $text_to_input . "," if defined $text_to_input;
@section_strings = sort @section_strings;
if (@section_strings > 0) {
chop ($section_strings[-1]) if $section_strings[-1] =~ /,$/;
}
# cannot simply check if array before and after is the same and return 0
# because it happens to fix indentation too (using $indent)
return 1; return 1;
} }
else { else {
@ -263,7 +254,7 @@ sub delete_elem {
splice @section_strings, $del, 1; splice @section_strings, $del, 1;
} }
if ($opts{sort}) { if ($opts{sort}) {
@section_strings = sort @section_strings; sort_elem();
# cannot simply check if array before and after is the same and return 0 # cannot simply check if array before and after is the same and return 0
# because it happens to fix indentation too (using $indent) # because it happens to fix indentation too (using $indent)
} }
@ -272,7 +263,8 @@ sub delete_elem {
# search for duplicated entries, return their indexes # search for duplicated entries, return their indexes
sub search_dups { sub search_dups {
my $text = shift or die "no arg to search_dups"; my $text = shift;
die "no arg to search_dups" unless defined $text;
my $text_c = $text . ","; my $text_c = $text . ",";
my $stop_at_first = shift; my $stop_at_first = shift;
my @ret = (); my @ret = ();
@ -285,6 +277,15 @@ sub search_dups {
@ret; @ret;
} }
# sort items (modify array in place), handle commas
sub sort_elem {
return if @section_strings == 0;
# to have commas where they need to be after sorting
$section_strings[-1] .= "," unless $section_strings[-1] =~ /,$/;
@section_strings = sort @section_strings;
chop ($section_strings[-1]) if $section_strings[-1] =~ /,$/;
}
# write "section" strings only # write "section" strings only
sub write_strings { sub write_strings {
my ($indent, @strings) = @_; my ($indent, @strings) = @_;