From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <Ian.Campbell@citrix.com>
Subject: [PATCH 2/2] docs: xen-headers: Remove hard tabs
Date: Thu, 1 Mar 2012 16:11:57 +0000 [thread overview]
Message-ID: <1330618317-6292-2-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <20303.40778.738574.117025@mariner.uk.xensource.com>
Remove hard tabs from the Perl script.
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: Ian Campbell <Ian.Campbell@citrix.com>
---
| 230 +++++++++++++++++++++++++++---------------------------
1 files changed, 115 insertions(+), 115 deletions(-)
--git a/docs/xen-headers b/docs/xen-headers
index 3fea3e3..c4cf2e4 100755
--- a/docs/xen-headers
+++ b/docs/xen-headers
@@ -86,13 +86,13 @@ sub compile_fglobs () {
local ($_);
my $f = "sub file_wanted (\$) {\n local (\$_) = \"/\$leaf\";\n";
foreach my $fglob (@fglobs) {
- $_ = $fglob->[0];
- $_ = "**$_**" unless m/[?*]/;
- s/\W/\\$&/g;
- s,\\\*\\\*,.*,g;
- s,\\\*,[^/]*,g;
- s,\\\?,[^/],g;
- $f .= " return $fglob->[1] if m,$_,o;\n";
+ $_ = $fglob->[0];
+ $_ = "**$_**" unless m/[?*]/;
+ s/\W/\\$&/g;
+ s,\\\*\\\*,.*,g;
+ s,\\\*,[^/]*,g;
+ s,\\\?,[^/],g;
+ $f .= " return $fglob->[1] if m,$_,o;\n";
}
$f .= " return 1;\n}\n1;\n";
debug(3, $f);
@@ -136,15 +136,15 @@ sub norm ($) {
local ($_) = @_;
my $no = '';
while (length) {
- if (s/^(?:\s|^\W)+//) {
- $no .= $&;
- } elsif (s/^(struct|union|enum)\s+(\w+)\b//) {
- $no .= ahref($&, (ucfirst $1), $2);
- } elsif (s/^\w+\b//) {
- $no .= ahref($&, [qw(Func Typedef)], $&);
- } else {
- die "$_ ?";
- }
+ if (s/^(?:\s|^\W)+//) {
+ $no .= $&;
+ } elsif (s/^(struct|union|enum)\s+(\w+)\b//) {
+ $no .= ahref($&, (ucfirst $1), $2);
+ } elsif (s/^\w+\b//) {
+ $no .= ahref($&, [qw(Func Typedef)], $&);
+ } else {
+ die "$_ ?";
+ }
}
return $no;
}
@@ -195,25 +195,25 @@ sub ahref ($$$) {
sub defmacro ($) {
my ($valname) = @_;
if (!$in_enum) {
- return $valname;
+ return $valname;
} elsif (substr($valname, 0, (length $in_enum->[0])) ne $in_enum->[0]) {
- warning("in enum expecting $in_enum->[0]* got $valname");
- return $valname;
+ warning("in enum expecting $in_enum->[0]* got $valname");
+ return $valname;
} else {
- my $reftype = $in_enum->[1];
- my $refname = $in_enum->[2].substr($valname, (length $in_enum->[0]));
- $sdef{$reftype}{$refname}{Xrefs}{$leaf,$.} =
- "[see <a href=\"$leaf_opath#EnumVal_$valname\">$valname</a>]";
- $sdef{EnumVal}{$valname}{Used} = 1;
- return defn($valname,'EnumVal',$valname, refhref($reftype,$refname));
+ my $reftype = $in_enum->[1];
+ my $refname = $in_enum->[2].substr($valname, (length $in_enum->[0]));
+ $sdef{$reftype}{$refname}{Xrefs}{$leaf,$.} =
+ "[see <a href=\"$leaf_opath#EnumVal_$valname\">$valname</a>]";
+ $sdef{EnumVal}{$valname}{Used} = 1;
+ return defn($valname,'EnumVal',$valname, refhref($reftype,$refname));
}
}
sub out_xrefs ($) {
my ($linemapfunc) = @_;
foreach my $xref (@pending_xrefs) {
- $o .= $linemapfunc->($xref);
- $o .= "\n";
+ $o .= $linemapfunc->($xref);
+ $o .= "\n";
}
@pending_xrefs = ();
}
@@ -222,11 +222,11 @@ sub incontents ($$$) {
my ($text, $seq, $anchor) = @_;
$anchor = "incontents_$anchor";
if ($pass==2) {
- push @incontents, {
- Seq => $seq,
- Href => "$leaf_opath#$anchor",
- Title => $text,
- };
+ push @incontents, {
+ Seq => $seq,
+ Href => "$leaf_opath#$anchor",
+ Title => $text,
+ };
}
return "<a name=\"$anchor\"><strong>$text</strong></a>";
}
@@ -250,41 +250,41 @@ sub process_file ($$) {
$o .= "<html><head><title>$leaf - $xtitle</title></head><body><pre>\n";
while (<$in>) {
- s/\&/\&/g;
- s/\</\</g;
- s/\>/\>/g;
-
- if (m/^(.*\`)[ \t]*$/) {
- my $lhs = $1;
- out_xrefs(sub { "$1 $_[0]"; });
- } elsif (m/^\s*$/) {
- out_xrefs(sub { sprintf "/* %70s */", $_[0]; });
- }
+ s/\&/\&/g;
+ s/\</\</g;
+ s/\>/\>/g;
+
+ if (m/^(.*\`)[ \t]*$/) {
+ my $lhs = $1;
+ out_xrefs(sub { "$1 $_[0]"; });
+ } elsif (m/^\s*$/) {
+ out_xrefs(sub { sprintf "/* %70s */", $_[0]; });
+ }
- # In case of comments, strip " /* ` " and " * ` ";
- my $lstripped = s,^ \s* /? \* \s* \` \ ,,x ? $&: '';
+ # In case of comments, strip " /* ` " and " * ` ";
+ my $lstripped = s,^ \s* /? \* \s* \` \ ,,x ? $&: '';
- # Strip trailing whitespace and perhaps trailing "*/" or "*"
- s,(?: \s* \* /? )? \s* $,,x or die;
- my $rstripped = $&;
+ # Strip trailing whitespace and perhaps trailing "*/" or "*"
+ s,(?: \s* \* /? )? \s* $,,x or die;
+ my $rstripped = $&;
- # Now the actual functionality:
+ # Now the actual functionality:
- debug(3,"$. $_");
+ debug(3,"$. $_");
- if (!m/^(?: __attribute__ | __pragma__ )\b/x &&
- s/^( (?: \w+\ )? ) (\w+[a-z]\w+) ( \( .*)$
+ if (!m/^(?: __attribute__ | __pragma__ )\b/x &&
+ s/^( (?: \w+\ )? ) (\w+[a-z]\w+) ( \( .*)$
/ $1.defn($2,'Func',$2).norm($3) /xe) {
- } elsif (s/^((struct|union|enum) \ (\w+)) ( \s+ \{ .* )$
+ } elsif (s/^((struct|union|enum) \ (\w+)) ( \s+ \{ .* )$
/ defn($1,(ucfirst $2),$3).norm($4) /xe) {
- if ($2 eq 'enum') {
- if (m,/[/*] (\w+)\* \=\>\; (\w+)\*\(\),) {
- in_enum($1,'Func',$2)
- } elsif (m,/[/*] (\w+)\* \=\>\; (struct) (\w+)\*,) {
- in_enum($1,(ucfirst $2),$3);
- }
- }
- } elsif (s/^(typedef \s+ )((struct|union|enum) \ (\w+))
+ if ($2 eq 'enum') {
+ if (m,/[/*] (\w+)\* \=\>\; (\w+)\*\(\),) {
+ in_enum($1,'Func',$2)
+ } elsif (m,/[/*] (\w+)\* \=\>\; (struct) (\w+)\*,) {
+ in_enum($1,(ucfirst $2),$3);
+ }
+ }
+ } elsif (s/^(typedef \s+ )((struct|union|enum) \ (\w+))
(\s+) (\w+)(\;)$
/ norm($1).norm($2).$5.
defn($6,'Typedef',$6,undef,[(ucfirst $3),$4]).
@@ -292,32 +292,32 @@ sub process_file ($$) {
} elsif (s/^(typedef \s+) (\w+) (\s+) (\w+) (\;)$
/ $1.norm($2).$3.
defn($4,'Typedef',$4,undef,['Typedef',$2]). $5 /xe) {
- } elsif (s/^( \s* \#define \s+ ) (\w+) ( \s+\S )
+ } elsif (s/^( \s* \#define \s+ ) (\w+) ( \s+\S )
/ $1.defmacro($2).norm($3) /xe) {
- } elsif (s/( \`incontents \s+ (\d+) \s+ (\w+) \s+ )(\S .* \S)
+ } elsif (s/( \`incontents \s+ (\d+) \s+ (\w+) \s+ )(\S .* \S)
/ norm($1).incontents($4, $2, $3) /xe) {
- } else {
- if (m/^\s*\}/) {
- $in_enum = undef;
- }
- $_ = norm($_);
- }
-
- # Write the line out
-
- if ($pass == 2) {
- $o .= $lstripped;
- $o .= $_;
- $o .= $rstripped;
- }
+ } else {
+ if (m/^\s*\}/) {
+ $in_enum = undef;
+ }
+ $_ = norm($_);
+ }
+
+ # Write the line out
+
+ if ($pass == 2) {
+ $o .= $lstripped;
+ $o .= $_;
+ $o .= $rstripped;
+ }
}
warning("pending xrefs at end of file") if @pending_xrefs;
if ($pass == 2) {
- push @outfiles, [ $leaf, $leaf_opath ];
- $o .= "</pre></body></html>";
- write_file($outfile, $o);
+ push @outfiles, [ $leaf, $leaf_opath ];
+ $o .= "</pre></body></html>";
+ write_file($outfile, $o);
}
}
@@ -332,18 +332,18 @@ sub output_index () {
<ul>
END
foreach my $ic (sort { $a->{Seq} <=> $b->{Seq} } @incontents) {
- $o .= "<li><a href=\"$ic->{Href}\">$ic->{Title}</a></li>\n";
+ $o .= "<li><a href=\"$ic->{Href}\">$ic->{Title}</a></li>\n";
}
$o .= "</ul>\n";
my $forkind = sub {
- my ($type,$desc,$pfx,$sfx) = @_;
- $o .= "<h2>$desc</h2><ul>\n";
- foreach my $name (sort keys %{ $sdef{$type} }) {
- my $href = refhref($type,$name);
- next unless $href =~ m/\S/;
- $o .= "<li><a $href>$pfx$name$sfx</a></li>\n";
- }
- $o .= "</ul>\n";
+ my ($type,$desc,$pfx,$sfx) = @_;
+ $o .= "<h2>$desc</h2><ul>\n";
+ foreach my $name (sort keys %{ $sdef{$type} }) {
+ my $href = refhref($type,$name);
+ next unless $href =~ m/\S/;
+ $o .= "<li><a $href>$pfx$name$sfx</a></li>\n";
+ }
+ $o .= "</ul>\n";
};
$forkind->('Func','Functions','','()');
$forkind->('Struct','Structs','struct ','');
@@ -352,7 +352,7 @@ END
$forkind->('EnumVal','Enum values and individual #defines','','');
$o .= "</ul>\n<h2>Files</h2><ul>\n";
foreach my $of (sort { $a->[0] cmp $b->[0] } @outfiles) {
- $o .= "<li><a href=\"$of->[1]\">$of->[0]</a></li>\n";
+ $o .= "<li><a href=\"$of->[1]\">$of->[0]</a></li>\n";
}
$o .= "</ul></body></html>\n";
write_file("$outdir/index.html", $o);
@@ -362,37 +362,37 @@ foreach $pass (qw(1 2)) {
my $depspath = "$outdir/.deps";
my $depsout;
if ($pass==2) {
- $depsout = new IO::File "$depspath.new", 'w' or die $!;
+ $depsout = new IO::File "$depspath.new", 'w' or die $!;
}
find({ wanted =>
- sub {
- return unless m/\.h$/;
- lstat $File::Find::name or die "$File::Find::name $!";
- -f _ or die "$File::Find::name";
- substr($File::Find::name, 0, 1+length $basedir)
- eq "$basedir/"
- or die "$File::Find::name $basedir";
- $leaf = substr($File::Find::name, 1+length $basedir);
- if (!file_wanted()) {
- debug(1,"$pass $File::Find::name excluded");
- return;
- }
- $leaf_opath = $leaf;
- $leaf_opath =~ s#/#,#g;
- $leaf_opath .= ".html";
- print $depsout "$outdir/index.html: $File::Find::name\n"
- or die $!
- if $pass==2;
- process_file($File::Find::name, $outdir.'/'.$leaf_opath);
- },
- no_chdir => 1,
- },
- map { "$basedir/$_" } @indirs);
+ sub {
+ return unless m/\.h$/;
+ lstat $File::Find::name or die "$File::Find::name $!";
+ -f _ or die "$File::Find::name";
+ substr($File::Find::name, 0, 1+length $basedir)
+ eq "$basedir/"
+ or die "$File::Find::name $basedir";
+ $leaf = substr($File::Find::name, 1+length $basedir);
+ if (!file_wanted()) {
+ debug(1,"$pass $File::Find::name excluded");
+ return;
+ }
+ $leaf_opath = $leaf;
+ $leaf_opath =~ s#/#,#g;
+ $leaf_opath .= ".html";
+ print $depsout "$outdir/index.html: $File::Find::name\n"
+ or die $!
+ if $pass==2;
+ process_file($File::Find::name, $outdir.'/'.$leaf_opath);
+ },
+ no_chdir => 1,
+ },
+ map { "$basedir/$_" } @indirs);
if ($pass==2) {
- close $depsout or die $!;
- rename "$depspath.new", "$depspath" or die $!;
+ close $depsout or die $!;
+ rename "$depspath.new", "$depspath" or die $!;
}
}
--
1.7.2.5
next prev parent reply other threads:[~2012-03-01 16:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-27 12:07 [PATCH DOCDAY] hcall: markup the event channel hypercalls to improve generated docs Ian Campbell
2012-02-27 12:37 ` Ian Campbell
2012-02-27 15:50 ` Keir Fraser
2012-03-01 16:03 ` Ian Jackson
2012-02-28 12:39 ` Ian Jackson
2012-02-28 12:43 ` Ian Campbell
2012-03-01 16:09 ` Ian Jackson
2012-03-01 16:11 ` [PATCH 1/2] docs: xen-headers: Annotate typedefs Ian Jackson
2012-03-01 16:27 ` Ian Campbell
2012-03-01 16:11 ` Ian Jackson [this message]
2012-03-01 16:27 ` [PATCH 2/2] docs: xen-headers: Remove hard tabs Ian Campbell
2012-03-01 16:52 ` Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330618317-6292-2-git-send-email-ian.jackson@eu.citrix.com \
--to=ian.jackson@eu.citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.