Commit 88323c70 authored by Manuel Pégourié-Gonnard's avatar Manuel Pégourié-Gonnard
Browse files

Add option to replace inside strings for programs

parent 3385cf4e
......@@ -2,11 +2,12 @@
# test result with:
# make all check
# ggrep -i --exclude-dir=mpg --exclude=.travis.yml --exclude=ChangeLog --exclude=extra-names --exclude=public-names polarssl . --exclude-dir=tmp G -v 'include|OU?=PolarSSL|PolarSSLTes' | cut -d':' -f1 | sort -u
# ggrep -i --exclude-dir=mpg --exclude=.travis.yml --exclude=ChangeLog --exclude=extra-names --exclude=public-names polarssl . --exclude-dir=tmp G -v 'OU?=PolarSSL|PolarSSLTes' | cut -d':' -f1 | sort -u
set -eu
FILES='include/mbedtls/*.h library/*.c programs/*.c programs/*/*.c tests/suites/* configs/*.h scripts/data_files/*.fmt scripts/* tests/scripts/*'
tmp/analyze-names.sh
tmp/makelist.pl public-names extra-names > old2new
tmp/rename.pl old2new $FILES
# re-invoke on programs including strings
tmp/rename.pl old2new include/mbedtls/*.h library/*.c tests/suites/* configs/*.h scripts/data_files/*.fmt scripts/* tests/scripts/*
tmp/rename.pl old2new programs/*.c programs/*/*.c
......@@ -9,7 +9,13 @@ use open qw(:std utf8);
# apply substitutions from the table in the first arg to files
# expected usage: via invoke-rename.pl
die "Usage: $0 names-file [filenames...]\n" if( @ARGV < 1 or ! -r $ARGV[0] );
my $do_strings = 0;
if( $ARGV[0] eq "-s" ) {
shift;
$do_strings = 1;
}
die "Usage: $0 [-s] names-file [filenames...]\n" if( @ARGV < 1 or ! -r $ARGV[0] );
open my $nfh, '<', shift or die;
my @names = <$nfh>;
......@@ -27,6 +33,10 @@ my $space = qr/\s+/;
my $idnum = qr/[a-zA-Z0-9_]+/;
my $symbols = qr/[!#%&'()*+,-.:;<=>?@^_`{|}~\$\/\[\\\]]+|"/;
# if we replace inside strings, we don't consider them a token
my $token = $do_strings ? qr/$space|$idnum|$symbols/
: qr/$string|$space|$idnum|$symbols/;
my %warnings;
while( my $filename = shift )
......@@ -40,7 +50,7 @@ while( my $filename = shift )
my @out;
for my $line (@lines) {
my @words = ($line =~ /$string|$space|$idnum|$symbols/g);
my @words = ($line =~ /$token/g);
my $checkline = join '', @words;
if( $checkline eq $line ) {
my @new = map { exists $subst{$_} ? $subst{$_} : $_ } @words;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment