Browse Source

Fixed Perl find/substitute options, added inverse.

master
Sorin Ionescu 13 years ago
parent
commit
e1a71a84b1
  1. 1
      plugins/perl/completions/_prep
  2. 12
      plugins/perl/functions/prep
  3. 7
      plugins/perl/functions/psub

1
plugins/perl/completions/_prep

@ -5,6 +5,7 @@ _arguments \ @@ -5,6 +5,7 @@ _arguments \
'-i[ignore case]' \
'-m[^ and $ match the start and the end of a line]' \
'-s[. matches newline]' \
'-v[invert match]' \
'-x[ignore whitespace and comments]' \
'1::pattern:' \
'2::files:_files' && return 0

12
plugins/perl/functions/prep

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
# Perl grep since 'grep -P' is terrible.
# Perl Grep
local usage pattern modifiers
local usage pattern modifiers invert
usage="$(
cat <<EOF
@ -10,16 +10,18 @@ options: @@ -10,16 +10,18 @@ options:
-i ignore case
-m ^ and $ match the start and the end of a line
-s . matches newline
-v invert match
-x ignore whitespace and comments
EOF
)"
while getopts ':igmxe::' opt; do
while getopts ':imsxv' opt; do
case "$opt" in
(i) modifiers="${modifiers}i" ;;
(m) modifiers="${modifiers}m" ;;
(s) modifiers="${modifiers}s" ;;
(x) modifiers="${modifiers}x" ;;
(e) modifiers="${modifiers}e" ;;
(v) invert="yes" ;;
(:)
print "$0: option requires an argument: $OPTARG" >&2
print "$usage" >&2
@ -42,5 +44,5 @@ fi @@ -42,5 +44,5 @@ fi
pattern="$1"
shift
perl -n -l -e "print if m/${pattern//\//\\/}/${modifiers}" "$@"
perl -n -l -e "print if ${invert:+not} m/${pattern//\//\\/}/${modifiers}" "$@"

7
plugins/perl/functions/psub

@ -15,13 +15,13 @@ options: @@ -15,13 +15,13 @@ options:
EOF
)"
while getopts ':igmxe::' opt; do
while getopts ':gimsx' opt; do
case "$opt" in
(i) modifiers="${modifiers}i" ;;
(g) modifiers="${modifiers}g" ;;
(i) modifiers="${modifiers}i" ;;
(m) modifiers="${modifiers}m" ;;
(s) modifiers="${sodifiers}s" ;;
(x) modifiers="${modifiers}x" ;;
(e) modifiers="${modifiers}e" ;;
(:)
print "$0: option requires an argument: $OPTARG" >&2
print "$usage" >&2
@ -46,3 +46,4 @@ replacement="$2" @@ -46,3 +46,4 @@ replacement="$2"
repeat 2 shift
perl -i'.orig' -n -l -e "s/${pattern//\//\\/}/${replacement//\//\\/}/${modifiers}; print" "$@"

Loading…
Cancel
Save