In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/bef74c256c389edeb1dfa9c30dc71e00d17476eb?hp=c06527b22e13cfa21cd9f27439bb61b1402e2425>
- Log ----------------------------------------------------------------- commit bef74c256c389edeb1dfa9c30dc71e00d17476eb Author: David Mitchell <[email protected]> Date: Thu Feb 11 17:31:11 2016 +0000 run regen_perly.pl M perly.act M perly.h M perly.tab commit 5996679157f48f8ada9884c32fd6bcb007f83718 Author: David Mitchell <[email protected]> Date: Wed Feb 10 10:53:03 2016 +0000 regen_perly.pl: improve action extracting The regex was sometimes missing final cases from the big action switch. This simplifies the regex, but assumes that 'default: break;' is the last case. This is the case in bison 2.7 and 3.0.2. M regen_perly.pl commit 95a1c52083ec4d3ba0727a0362422d8ac6192ba3 Author: David Mitchell <[email protected]> Date: Wed Feb 10 10:21:08 2016 +0000 regen_perly.pl: print command with -v when run verbose, print the bison command that is run M regen_perly.pl ----------------------------------------------------------------------- Summary of changes: perly.act | 2 +- perly.h | 2 +- perly.tab | 2 +- regen_perly.pl | 26 ++++++++++---------------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/perly.act b/perly.act index 466a4fd..0d1d5fc 100644 --- a/perly.act +++ b/perly.act @@ -1537,5 +1537,5 @@ case 2: /* Generated from: * 703ebd267cf8ca45f9dee9bc0f4b21511117a0c1dca1c8bc9438ce91950217ae perly.y - * 258328847738b63dfad498af43ecda9c62aba1c740d5c821d8ac1290391a9489 regen_perly.pl + * a4923588f219644801577c514014847e1e5240f49413fa3b89d3306fa4874d07 regen_perly.pl * ex: set ro: */ diff --git a/perly.h b/perly.h index 65c500e..acbdaae 100644 --- a/perly.h +++ b/perly.h @@ -279,5 +279,5 @@ int yyparse (); /* Generated from: * 703ebd267cf8ca45f9dee9bc0f4b21511117a0c1dca1c8bc9438ce91950217ae perly.y - * 258328847738b63dfad498af43ecda9c62aba1c740d5c821d8ac1290391a9489 regen_perly.pl + * a4923588f219644801577c514014847e1e5240f49413fa3b89d3306fa4874d07 regen_perly.pl * ex: set ro: */ diff --git a/perly.tab b/perly.tab index 5e541e5..f5a9580 100644 --- a/perly.tab +++ b/perly.tab @@ -1177,5 +1177,5 @@ static const toketypes yy_type_tab[] = /* Generated from: * 703ebd267cf8ca45f9dee9bc0f4b21511117a0c1dca1c8bc9438ce91950217ae perly.y - * 258328847738b63dfad498af43ecda9c62aba1c740d5c821d8ac1290391a9489 regen_perly.pl + * a4923588f219644801577c514014847e1e5240f49413fa3b89d3306fa4874d07 regen_perly.pl * ex: set ro: */ diff --git a/regen_perly.pl b/regen_perly.pl index 3b94093..33cb3b7 100644 --- a/regen_perly.pl +++ b/regen_perly.pl @@ -187,6 +187,8 @@ foreach ($act_fh, $tab_fh, $h_fh) { exit 0; +# extract the tables and actions from the generated .c file + sub extract { my $clines = shift; my $tablines; @@ -207,23 +209,12 @@ sub extract { $tablines = $&; + # extract all the cases in the big action switch statement + $clines =~ m@ - switch \s* \( \s* \w+ \s* \) \s* { \s* - ( - case \s* \d+ \s* : - \s* - (?: \s* /\* .*? \*/ \s* )* # optional C-comments - \s* - \#line [^\n]+"\Q$y_file\E" - .*? - ) - } - \s* - (?: \s* /\* .*? \*/ \s* )* # optional C-comments - \s* - ( - YY_SYMBOL_PRINT - ) + switch \s* \( \s* yyn \s* \) \s* { \s* + ( .*? default: \s* break; \s* ) + } @xms or die "Can't extract actions from $tmpc_file\n"; $actlines = $1; @@ -335,6 +326,9 @@ sub make_type_tab { sub my_system { + if ($Verbose) { + print "executing: @_\n"; + } system(@_); if ($? == -1) { die "failed to execute command '@_': $!\n"; -- Perl5 Master Repository
