chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doctests: Allow parenthetical comments as an expansion RHS
[secnet.git]
/
generate
diff --git
a/generate
b/generate
index 61bbd507c683adc89d5fe648260737a7c0492e73..f571fa19d196efc9aa62299a487a095f0dba2724 100755
(executable)
--- a/
generate
+++ b/
generate
@@
-177,6
+177,7
@@
our @warn_ena_dfl = map { $_ => 1 } qw(
local+global
single-char-var
unknown-warning
local+global
single-char-var
unknown-warning
+ broken-var-ref
);
our %warn_ena = @warn_ena_dfl;
);
our %warn_ena = @warn_ena_dfl;
@@
-198,6
+199,8
@@
sub wrncore ($$) {
sub wrn ($$) {
my ($wk,$m) = @_;
sub wrn ($$) {
my ($wk,$m) = @_;
+ our %warn_dedupe;
+ return 0 if $warn_dedupe{$err_file,$.,$wk,$m}++;
wrncore($wk, "${err_file}:$.: $m");
}
wrncore($wk, "${err_file}:$.: $m");
}
@@
-231,8
+234,8
@@
sub process_input_mk ($$$$) {
local $err_file=$f;
my %srcdirmap = (
local $err_file=$f;
my %srcdirmap = (
- '^' => "\$
(top_srcdir)
${dir_suffix}",
- '~' => "\$
(top_srcdir)
",
+ '^' => "\$
{top_srcdir}
${dir_suffix}",
+ '~' => "\$
{top_srcdir}
",
);
my %pfxmap = (
'' => $dir_prefix,
);
my %pfxmap = (
'' => $dir_prefix,
@@
-330,6
+333,10
@@
sub process_input_mk ($$$$) {
wrn 'single-char-var',
'possibly confusing unbracketed single-char $-expansion';
}
wrn 'single-char-var',
'possibly confusing unbracketed single-char $-expansion';
}
+ elsif (m{^$esc}) {
+ wrn 'broken-var-ref',
+ 'broken $&... expansion; you probably meant &$';
+ }
elsif (m{^\(($esc)?([^()\$]+)\)} ||
m{^\{($esc)?([^{}\$]+)\}}) {
$note_varref->($2,!!$1);
elsif (m{^\(($esc)?([^()\$]+)\)} ||
m{^\{($esc)?([^{}\$]+)\}}) {
$note_varref->($2,!!$1);
@@
-343,7
+350,7
@@
sub process_input_mk ($$$$) {
elsif (m{^(?=$caps_re)}) { od $var_prefix }
elsif (s{^\$([A-Za-z]\w+)}{}) {
$note_varref->($1,1);
elsif (m{^(?=$caps_re)}) { od $var_prefix }
elsif (s{^\$([A-Za-z]\w+)}{}) {
$note_varref->($1,1);
- od "\$
(${var_prefix}$1)
";
+ od "\$
{${var_prefix}$1}
";
}
elsif (s{^([~^]?)(?=$lc_re)}{}) { od $pfxmap{$1} }
elsif (s{^_}{}) { od $var_prefix }
}
elsif (s{^([~^]?)(?=$lc_re)}{}) { od $pfxmap{$1} }
elsif (s{^_}{}) { od $var_prefix }