Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-11 08:29:54 +00:00
Code Issues Projects Releases Wiki Activity

sed: code shrink

Browse Source 
function                                             old     new   delta
process_files                                       2181    2173      -8

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2012-06-04 14:45:09 +02:00
parent 21f6fbf545
commit c35545a100
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
editors/sed.c
View File

@ -737,6 +737,8 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
/* Now loop through, substituting for matches */ /* Now loop through, substituting for matches */
do { do {
int start = G.regmatch[0].rm_so;
int end = G.regmatch[0].rm_eo;
int i; int i;
match_count++; match_count++;
@ -746,16 +748,16 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
if (sed_cmd->which_match if (sed_cmd->which_match
&& (sed_cmd->which_match != match_count) && (sed_cmd->which_match != match_count)
) { ) {
for (i = 0; i < G.regmatch[0].rm_eo; i++) for (i = 0; i < end; i++)
pipe_putc(*line++); pipe_putc(*line++);
/* Null match? Print one more char */ /* Null match? Print one more char */
if (G.regmatch[0].rm_so == i && *line) if (start == end && *line)
pipe_putc(*line++); pipe_putc(*line++);
goto next; goto next;
} }
/* Print everything before the match */ /* Print everything before the match */
for (i = 0; i < G.regmatch[0].rm_so; i++) for (i = 0; i < start; i++)
pipe_putc(line[i]); pipe_putc(line[i]);
/* Then print the substitution string, /* Then print the substitution string,
@ -765,25 +767,25 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
* second is "" before "d", third is "" after "d". * second is "" before "d", third is "" after "d".
* Second match is NOT replaced! * Second match is NOT replaced!
*/ */
if (prev_match_empty || i != 0) { if (prev_match_empty || start != 0) {
dbg("inserting replacement at %d in '%s'", i, line); dbg("inserting replacement at %d in '%s'", start, line);
do_subst_w_backrefs(line, sed_cmd->string); do_subst_w_backrefs(line, sed_cmd->string);
} else { } else {
dbg("NOT inserting replacement at %d in '%s'", i, line); dbg("NOT inserting replacement at %d in '%s'", start, line);
} }
/* If matched string is empty (f.e. "c*" pattern), /* If matched string is empty (f.e. "c*" pattern),
* copy verbatim one char after it before attempting more matches * copy verbatim one char after it before attempting more matches
*/ */
prev_match_empty = (G.regmatch[0].rm_eo == i); prev_match_empty = (start == end);
if (prev_match_empty && line[i]) { if (prev_match_empty && line[end]) {
pipe_putc(line[i]); pipe_putc(line[end]);
G.regmatch[0].rm_eo++; end++;
} }
/* Advance past the match */ /* Advance past the match */
dbg("line += %d", G.regmatch[0].rm_eo); dbg("line += %d", end);
line += G.regmatch[0].rm_eo; line += end;
/* Flag that something has changed */ /* Flag that something has changed */
altered = 1; altered = 1;
@ -798,7 +800,7 @@ static int do_subst_command(sed_cmd_t *sed_cmd, char **line_p)
tried_at_eol = 1; tried_at_eol = 1;
} }
//maybe (G.regmatch[0].rm_eo ? REG_NOTBOL : 0) instead of unconditional REG_NOTBOL? //maybe (end ? REG_NOTBOL : 0) instead of unconditional REG_NOTBOL?
} while (regexec(current_regex, line, 10, G.regmatch, REG_NOTBOL) != REG_NOMATCH); } while (regexec(current_regex, line, 10, G.regmatch, REG_NOTBOL) != REG_NOMATCH);
/* Copy rest of string into output pipeline */ /* Copy rest of string into output pipeline */