}
sub detect( $ ) {
- ( $_ ) = @_;
- return( 'struct', 1, $1, "typedef struct { ... } $1;" ) if( /^\s*typedef\s+struct\s*{.*}\s*(\w+)\s*;\s*$/s );
- return( 'enum', 1, $1, "typedef enum { ... } $1;" ) if( /^\s*typedef\s+enum\s*{.*}\s*(\w+)\s*;\s*$/s );
- my $l = length;
- s/\n.*//s;
- return( 'struct', 0, $1, $_ ) if( /struct\s+(\w+)\s+{/ );
- return( 'enum', 0, $1, $_ ) if( /enum\s+(\w+)\s+{/ );
- if( $l > length ) {
- warn( "Unknown statement $_\n" );
- return( '', 0, $_, $_ );
- }
- return( 'define', 0, $1, $_ ) if( /#define\s+(\w+)/ );
- return( 'function', 1, $1, $_ ) if( /(\w+)\(.*\)/ );
- return( 'variable', 1, $1, $_ ) if( /\s(\w+);/ );
- warn( "Unknown statement $_\n" );
- return( '', 0, $_, $_ );
+ ( $_ ) = @_;
+ return( $1, 1, $2, "typedef $1 { ... } $2;" ) if /^\s*typedef\s+(struct|enum)\s*{.*}\s*(\w+)\s*;\s*$/s;
+ return( $1, 1, $2, $_ ) if /^\s*(struct|enum)\s+(\w+)\s*;\s*$/s;
+ my $l = length;
+ s/\n.*//s;
+ return( $1, 0, $2, $_ ) if /(struct|enum)\s+(\w+)\s+{/;
+ return( 'def', 0, $1, $_ ) if /#define\s+(\w+)/;
+ if( $l > length ) {
+ warn( "Unknown multiline statement $_\n" );
+ return( '', 0, $_, $_ );
+ }
+ return( 'type', 1, $2, $_ ) if /^\s*typedef[^()]+?(\(\s*?\*\s*?)?(\w+)(\s*\))?\s*\(.*\)/;
+ return( 'fun', 1, $2, $1 ) if /^(.*?(\w+)\([^{]*\)[^{]*)/;
+ return( 'type', 1, $1, $_ ) if /^\s*typedef.*?(\w+);/;
+ return( 'var', 1, $1, $_ ) if /\s\**(\w+);/;
+ warn( "Unknown statement $_\n" );
+ return( '', 0, $_, $_ );
}
my @deps;
print OUT "\n";
print OUT "''''\n";
chomp $head;
- print OUT "[[auto_$id]]\n";
- my( $type, $semicolon, $name, $oneline ) = detect( $head );
- $head =~ s/;?\s*$/;/ if( $semicolon );
- if( $type eq 'function' ) {
- print OUT "!!f!$head!!!\n\n";
- } else {
- print OUT "..................\n";
- print OUT "$head\n";
- print OUT "..................\n\n";
- }
+ my( $type, $semicolon, $name, $oneline ) = detect( $head );
+ $oneline =~ s/\s+$//;
+ $oneline =~ s/;?$/;/ if( $semicolon );
+ $head =~ s/;?\s*$/;/ if( $semicolon );
+ $head =~ s/(\.\.\.)/\\$1/g;
+ print OUT "[[${type}_$name]]\n";
+ $head = $oneline if $type eq 'fun';#Remove { from inline functions
+ print OUT "..................\n";
+ print OUT "$head\n";
+ print OUT "..................\n\n";
if( $hasdump ) {
- print DUMP "$outname,$id,$type,$name,$oneline\n";
+ print DUMP "$outname,${type}_$name,$type,$name,$oneline\n";
$id ++;
}
print OUT "$comment\n\n";
my $buff;
my $head;
my $struct;
+ my $def;
while( defined( $line = <FILE> ) ) {
chomp $line;
- if( $struct ) {
+ if( $def ) {
+ $head .= "\n".$line;
+ $line =~ s/(\/\*.*?\*\/|\/\/.*)//g;
+ if( $line !~ /\\\s*$/ ) {
+ formatNote( $head, $buff );
+ $def = 0;
+ $buff = $head = undef;
+ }
+ } elsif( $struct ) {
$head .= "\n".$line;
if( $line =~ /}/ ) {
formatNote( $head, $buff );
}
} else {
if( ( $line =~ /\S/ ) && ( defined $buff ) ) {
- if( $line =~ /\(/ || $line !~ /{/ ) {
+ if( $line =~ /^\s*#define.*\\(\s*(\/\/.*|\/\*.*?\*\/|))*/ ) {
+ $head = $line;
+ $def = 1;
+ } elsif( $line =~ /\(/ || $line !~ /{/ || $line =~ /^\s*#define/ ) {
$_ = $line;
s/^\s*\s?//;
s/\/\/.*//;
} elsif( ( $head, $buff ) = ( $line =~ /^(.*)\/\*\*(.*)\*\*\// ) ) {
$buff =~ s/^\s*//;
$buff =~ s/\s*$//;
- if( $head =~ /\(/ || $head !~ /{/ ) {
+ if( $head =~ /\(/ || $head !~ /{/ || $head =~/}/ ) {
$head =~ s/^\s*//;
$head =~ s/\/\*.*?\*\///gs;
formatNote( $head, $buff );