docs: kernel-doc: Finish moving STATE_* code out of process_file() (c17add56) · Commits · 戴 / test

scripts/kernel-doc

+77 −62

Original line number	Diff line number	Diff line
		@@ -1990,37 +1990,39 @@ sub process_proto($$) {
		}
		}

		#
		# STATE_DOCBLOCK: within a DOC: block.
		#
		sub process_docblock($$) {
		my $file = shift;

		sub process_file($) {
		my $file;
		my $func;
		my $initial_section_counter = $section_counter;
		my ($orig_file) = @_;

		$file = map_filename($orig_file);

		if (!open(IN,"<$file")) {
		print STDERR "Error: Cannot open file $file\n";
		++$errors;
		return;
		if (/$doc_end/) {
		dump_doc_section($file, $section, $contents);
		$section = $section_default;
		$contents = "";
		$function = "";
		%parameterdescs = ();
		%parametertypes = ();
		@parameterlist = ();
		%sections = ();
		@sectionlist = ();
		$prototype = "";
		$state = STATE_NORMAL;
		} elsif (/$doc_content/) {
		if ( $1 eq "" ) {
		$contents .= $blankline;
		} else {
		$contents .= $1 . "\n";
		}
		}
		}

		$. = 1;
		#
		# STATE_INLINE: docbook comments within a prototype.
		#
		sub process_inline($$) {
		my $file = shift;

		$section_counter = 0;
		while (<IN>) {
		while (s/\\\s*$//) {
		$_ .= <IN>;
		}
		# Replace tabs by spaces
		while ($_ =~ s/\t+/' ' x (length($&) * 8 - length($`) % 8)/e) {};
		if ($state == STATE_NORMAL) {
		process_normal();
		} elsif ($state == STATE_NAME) {
		process_name($file, $_);
		} elsif ($state == STATE_BODY \|\| $state == STATE_BODY_MAYBE) {
		process_body($file, $_);
		} elsif ($state == STATE_INLINE) { # scanning for inline parameters
		# First line (state 1) needs to be a @parameter
		if ($inline_doc_state == STATE_INLINE_NAME && /$doc_inline_sect/o) {
		$section = $1;
		@@ -2057,36 +2059,49 @@ sub process_file($) {
		++$warnings;
		}
		}
		} elsif ($state == STATE_PROTO) {
		process_proto($file, $_);
		} elsif ($state == STATE_DOCBLOCK) {
		if (/$doc_end/)
		{
		dump_doc_section($file, $section, $contents);
		$section = $section_default;
		$contents = "";
		$function = "";
		%parameterdescs = ();
		%parametertypes = ();
		@parameterlist = ();
		%sections = ();
		@sectionlist = ();
		$prototype = "";
		$state = STATE_NORMAL;
		}
		elsif (/$doc_content/)
		{
		if ( $1 eq "" )
		{
		$contents .= $blankline;
		}
		else
		{
		$contents .= $1 . "\n";


		sub process_file($) {
		my $file;
		my $initial_section_counter = $section_counter;
		my ($orig_file) = @_;

		$file = map_filename($orig_file);

		if (!open(IN,"<$file")) {
		print STDERR "Error: Cannot open file $file\n";
		++$errors;
		return;
		}

		$. = 1;

		$section_counter = 0;
		while (<IN>) {
		while (s/\\\s*$//) {
		$_ .= <IN>;
		}
		# Replace tabs by spaces
		while ($_ =~ s/\t+/' ' x (length($&) * 8 - length($`) % 8)/e) {};

		# Hand this line to the appropriate state handler
		if ($state == STATE_NORMAL) {
		process_normal();
		} elsif ($state == STATE_NAME) {
		process_name($file, $_);
		} elsif ($state == STATE_BODY \|\| $state == STATE_BODY_MAYBE) {
		process_body($file, $_);
		} elsif ($state == STATE_INLINE) { # scanning for inline parameters
		process_inline($file, $_);
		} elsif ($state == STATE_PROTO) {
		process_proto($file, $_);
		} elsif ($state == STATE_DOCBLOCK) {
		process_docblock($file, $_);
		}
		}

		# Make sure we got something interesting.
		if ($initial_section_counter == $section_counter) {
		if ($output_mode ne "none") {
		print STDERR "${file}:1: warning: no structured comments found\n";

Admin message