X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=src%2Fupdate.pl;h=1c5e40d454d4a339efb5b6f9d39f599f57a0a393;hb=9fc90d81cde4cbe8bff27adf3cc3624c86988f1a;hp=dea38cf8531e15f29167775fd0c2071ea9cb57eb;hpb=d2b7e04fb8d40639a353ea53a1957b9872373c8b;p=perl%2Fmodules%2Fre-engine-Hooks.git diff --git a/src/update.pl b/src/update.pl index dea38cf..1c5e40d 100644 --- a/src/update.pl +++ b/src/update.pl @@ -218,8 +218,16 @@ sub fetch_source_file { my %patched_chunks; my %expected_chunks = ( - 'regcomp.c' => [ qw, ('COMP_NODE_HOOK') x 3 ], - 'regexec.c' => [ qw ], + 'regcomp.c' => [ + 're_defs', + 'COMP_NODE_HOOK', + 'COMP_BEGIN_HOOK', + ('COMP_NODE_HOOK') x 3, + ], + 'regexec.c' => [ + 're_defs', + 'EXEC_NODE_HOOK', + ], ); sub patch_regcomp { @@ -234,7 +242,10 @@ sub patch_regcomp { } elsif ($line =~ /FILL_ADVANCE_NODE(_ARG)?\(\s*([^\s,\)]+)/) { my $shift = $1 ? 2 : 1; push @{$patched_chunks{$file}}, 'COMP_NODE_HOOK'; - return $line, " REH_CALL_REGCOMP_HOOK(pRExC_state->rx, ($2) - $shift);\n" + return $line, " REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, ($2) - $shift);\n" + } elsif ($line =~ /end node insert/) { + push @{$patched_chunks{$file}}, 'COMP_NODE_HOOK'; + return $line, " REH_CALL_COMP_NODE_HOOK(pRExC_state->rx, convert);\n"; } return $line; @@ -248,7 +259,7 @@ sub patch_regexec { return $line, "#include \"re_defs.h\"\n"; } elsif ($line =~ /^\s*reenter_switch:\s*$/) { push @{$patched_chunks{$file}}, 'EXEC_NODE_HOOK'; - return "\tREH_CALL_REGEXEC_HOOK(rex, scan, reginfo, st);\n", $line; + return "\tREH_CALL_EXEC_NODE_HOOK(rex, scan, reginfo, st);\n", $line; } return $line;