From: Michal Vaner <vorner@ucw.cz>
Date: Wed, 10 Sep 2008 18:54:39 +0000 (+0200)
Subject: Doc. system: fix semicolon handling
X-Git-Tag: holmes-import~319
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=58bd69c1f8c4627ff882c0c042b7ec810677976e;p=libucw.git

Doc. system: fix semicolon handling

No need for the hack in extracting loop, now put into formatting.

Fix the regexp in formatting part.
---

diff --git a/build/doc-extract b/build/doc-extract
index 5373a5a2..b0c47df5 100755
--- a/build/doc-extract
+++ b/build/doc-extract
@@ -50,7 +50,7 @@ sub formatNote( $$ ) {
 	chomp $head;
 	print OUT "[[auto_$id]]\n";
         my( $type, $semicolon, $name ) = detect( $head );
-        $head =~ s/;?\s+$/;/ if( $semicolon );
+        $head =~ s/;?\s*$/;/ if( $semicolon );
 	if( $type eq 'function' ) {
 		print OUT "!!f!$head!!!\n\n";
 	} else {
@@ -107,8 +107,6 @@ sub process( $ ) {
 					s/^\s*\s?//;
 					s/\/\/.*//;
 					s/\/\*.*?\*\///gs;
-					s/([;{]).*/";"x length( $1 )/e;
-					s/\)\s*;$/);/;
 					formatNote( $_, $buff );
 					$head = undef;
 					$buff = undef;
@@ -126,8 +124,6 @@ sub process( $ ) {
 				if( $head =~ /\(/ || $head !~ /{/ ) {
 					$head =~ s/^\s*//;
 					$head =~ s/\/\*.*?\*\///gs;
-					$head =~ s/([;{]).*/";"x length( $1 )/e;
-					$head =~ s/\)\s*;$/);/;
 					formatNote( $head, $buff );
 					$head = undef;
 					$buff = undef;