From 08ed592f5be46da9fab6e0233bdc0f5e55da8a09 Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 21 Jun 2000 12:55:49 +0000 Subject: [PATCH] Merge the 2.a36 release. git-svn-id: https://svn.dealii.org/trunk@3050 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/contrib/kdoc/src/Iter.pm | 30 ++++++++++++++-------- deal.II/contrib/kdoc/src/Version | 3 ++- deal.II/contrib/kdoc/src/debian/changelog | 6 +++++ deal.II/contrib/kdoc/src/debian/control | 3 ++- deal.II/contrib/kdoc/src/debian/copyright | 2 +- deal.II/contrib/kdoc/src/debian/rules | 2 +- deal.II/contrib/kdoc/src/doc/Makefile.in | 11 ++++---- deal.II/contrib/kdoc/src/doc/kdoc.pod | 5 ++++ deal.II/contrib/kdoc/src/kdoc | 31 +++++++++++++++-------- deal.II/contrib/kdoc/src/kdocAstUtil.pm | 5 +++- deal.II/contrib/kdoc/src/kdocCxxHTML.pm | 12 ++++++--- deal.II/contrib/kdoc/src/kdocParseDoc.pm | 5 +++- 12 files changed, 79 insertions(+), 36 deletions(-) diff --git a/deal.II/contrib/kdoc/src/Iter.pm b/deal.II/contrib/kdoc/src/Iter.pm index 337825ddad..f134b66e56 100644 --- a/deal.II/contrib/kdoc/src/Iter.pm +++ b/deal.II/contrib/kdoc/src/Iter.pm @@ -331,8 +331,9 @@ sub MembersByType return; } - foreach my $access ( qw/public protected private/ ) { - next if $access eq "private" && !$main::doPrivate; + foreach my $acc ( qw/public protected private/ ) { + next if $acc eq "private" && !$main::doPrivate; + $access = $acc; my @types = (); my @data = (); @@ -386,23 +387,23 @@ sub MembersByType } # apply - $access = ucfirst( $access ); + $uc_access = ucfirst( $access ); - doGroup( "$access Types", $node, \@types, $startgrpsub, + doGroup( "$uc_access Types", $node, \@types, $startgrpsub, $methodsub, $endgrpsub); doGroup( "Modules", $node, \@modules, $startgrpsub, $methodsub, $endgrpsub); doGroup( "Interfaces", $node, \@interfaces, $startgrpsub, $methodsub, $endgrpsub); - doGroup( "$access Methods", $node, \@methods, $startgrpsub, + doGroup( "$uc_access Methods", $node, \@methods, $startgrpsub, $methodsub, $endgrpsub); - doGroup( "$access Slots", $node, \@slots, $startgrpsub, + doGroup( "$uc_access Slots", $node, \@slots, $startgrpsub, $methodsub, $endgrpsub); doGroup( "Signals", $node, \@signals, $startgrpsub, $methodsub, $endgrpsub); - doGroup( "$access Static Methods", $node, \@static, + doGroup( "$uc_access Static Methods", $node, \@static, $startgrpsub, $methodsub, $endgrpsub); - doGroup( "$access Members", $node, \@data, $startgrpsub, + doGroup( "$uc_access Members", $node, \@data, $startgrpsub, $methodsub, $endgrpsub); } } @@ -411,13 +412,22 @@ sub doGroup { my ( $name, $node, $list, $startgrpsub, $methodsub, $endgrpsub ) = @_; - return if $#$list < 0; + my ( $hasMembers ) = 0; + foreach my $kid ( @$list ) { + if ( !exists $kid->{DocNode}->{Reimplemented} ) { + $hasMembers = 1; + break; + } + } + return if !$hasMembers; $startgrpsub->( $name ) if defined $startgrpsub; if ( defined $methodsub ) { foreach my $kid ( @$list ) { - $methodsub->( $node, $kid ); + if ( !exists $kid->{DocNode}->{Reimplemented} ) { + $methodsub->( $node, $kid ); + } } } diff --git a/deal.II/contrib/kdoc/src/Version b/deal.II/contrib/kdoc/src/Version index 9b3dad19f9..bcdcc1dbe4 100644 --- a/deal.II/contrib/kdoc/src/Version +++ b/deal.II/contrib/kdoc/src/Version @@ -1 +1,2 @@ -2.0a35 +2.0a36 + diff --git a/deal.II/contrib/kdoc/src/debian/changelog b/deal.II/contrib/kdoc/src/debian/changelog index 71a274e592..41c789faa2 100644 --- a/deal.II/contrib/kdoc/src/debian/changelog +++ b/deal.II/contrib/kdoc/src/debian/changelog @@ -1,3 +1,9 @@ +kdoc (2.0a35-1.0) unstable; urgency=low + + * New upstream version + + -- Ivan E. Moore II Mon, 21 Feb 2000 23:30:06 -0700 + kdoc (2.0a15-1.0) unstable; urgency=low * New upstream version diff --git a/deal.II/contrib/kdoc/src/debian/control b/deal.II/contrib/kdoc/src/debian/control index a430a44988..f015cab664 100644 --- a/deal.II/contrib/kdoc/src/debian/control +++ b/deal.II/contrib/kdoc/src/debian/control @@ -1,8 +1,9 @@ Source: kdoc +Build-Depends: debhelper, automake, autoconf, perl5 Section: devel Priority: optional Maintainer: Bernd Gehrmann -Standards-Version: 3.0.1 +Standards-Version: 3.1.1 Package: kdoc Architecture: all diff --git a/deal.II/contrib/kdoc/src/debian/copyright b/deal.II/contrib/kdoc/src/debian/copyright index 8af64498d4..f7b975382a 100644 --- a/deal.II/contrib/kdoc/src/debian/copyright +++ b/deal.II/contrib/kdoc/src/debian/copyright @@ -4,4 +4,4 @@ Copyright: KDOC is released under the terms of the GNU GPL. -See /usr/doc/copyright/GPL for the full license. +See /usr/share/common-licenses/GPL for the full license. diff --git a/deal.II/contrib/kdoc/src/debian/rules b/deal.II/contrib/kdoc/src/debian/rules index 8e7b7271a0..b1c1c093fe 100755 --- a/deal.II/contrib/kdoc/src/debian/rules +++ b/deal.II/contrib/kdoc/src/debian/rules @@ -8,7 +8,7 @@ build: dh_testdir - ./configure --prefix=/usr + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info $(MAKE) touch build diff --git a/deal.II/contrib/kdoc/src/doc/Makefile.in b/deal.II/contrib/kdoc/src/doc/Makefile.in index 955d049a08..1b0e3548c7 100644 --- a/deal.II/contrib/kdoc/src/doc/Makefile.in +++ b/deal.II/contrib/kdoc/src/doc/Makefile.in @@ -5,9 +5,9 @@ docdir=@docdir@ install=@INSTALL@ MANPAGES = kdoc.1 makekdedoc.1 qt2kdoc.1 -MAINDOC = @srcdir@/kdoc.docbook @top_srcdir@/README +MAINDOC = @srcdir@/index.docbook @top_srcdir@/README -all: ${MANPAGES} +all: ${MANPAGES} htmldoc install: ${install} -d $(DESTDIR)${mandir} @@ -39,8 +39,9 @@ qt2kdoc.1: @top_srcdir@/qt2kdoc @top_srcdir@/Version clean: rm -rf kdoc.1 makekdedoc.1 qt2kdoc.1 - -html: kdoc.docbook - mkdir html; (cd html && jade -d \ +# This needs to be improved, obviously +htmldoc: @srcdir@/index.docbook + -rm -rf html; mkdir html; (cd html && jade -d \ /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/html/docbook.dsl -t sgml \ ../$< ) + diff --git a/deal.II/contrib/kdoc/src/doc/kdoc.pod b/deal.II/contrib/kdoc/src/doc/kdoc.pod index b784557f2c..466abc4513 100644 --- a/deal.II/contrib/kdoc/src/doc/kdoc.pod +++ b/deal.II/contrib/kdoc/src/doc/kdoc.pod @@ -104,6 +104,11 @@ is required for this, but this requirement will change before 2.0. Directories for inclusion in the preprocessor header search path can be specified via the B<-I> option. +=item B<--docincluded> + +Parse files that are included by the preprocessor #include macro. +This is off by default. + =item B<-cppcmd> , B<-C> Specify the preprocessor command that will be used. The default is: diff --git a/deal.II/contrib/kdoc/src/kdoc b/deal.II/contrib/kdoc/src/kdoc index 86219e287f..cbdd46bd1c 100755 --- a/deal.II/contrib/kdoc/src/kdoc +++ b/deal.II/contrib/kdoc/src/kdoc @@ -21,12 +21,12 @@ use kdocAstUtil; use kdocParseDoc; use vars qw/ %rootNodes $declNodeType %options @formats_wanted - @includeclasses $includeclasses + @includeclasses $includeclasses $skipInternal $libdir $libname $outputdir @libs $striphpath $doPrivate $readstdin $Version $quiet $debug $parseonly $currentfile $cSourceNode $exe %formats %flagnames $rootNode @classStack $cNode - $lastLine $docNode @includes $cpp $defcppcmd $cppcmd $inExtern - %stats /; + $lastLine $docNode @includes $cpp $defcppcmd $cppcmd $docincluded + $inExtern %stats /; ## globals @@ -84,7 +84,7 @@ Getopt::Long::config qw( no_ignore_case permute bundling auto_abbrev ); GetOptions( \%options, "format|f=s", \@formats_wanted, "url|u=s", - "skip-internal|i", + "skip-internal", \$skipInternal, "skip-deprecated|e", "document-all|a", "compress|z", @@ -105,7 +105,8 @@ GetOptions( \%options, "classes|c=s", \@includeclasses, "cpp|P", \$cpp, - "cppcmd|C", \$cppcmd, + "docincluded", \$docincluded, + "cppcmd|C=s", \$cppcmd, "includedir|I=s", \@includes, "quiet|q", \$quiet, @@ -212,18 +213,19 @@ sub parseFiles if ( $currentfile =~ /\.idl\s*$/ ) { # IDL file $lang = "IDL"; - - open( INPUT, "$currentfile" ) - || croak "Can't read from $currentfile"; } + # assume cxx file - elsif( $cpp ) { + if( $cpp ) { # pass through preprocessor my $cmd = $cppcmd; foreach my $dir ( @includes ) { $cmd .= " -I $dir "; } - open( INPUT, $cmd." -DQOBJECTDEFS_H $currentfile|" ) + + $cmd .= " -DQOBJECTDEFS_H $currentfile"; + + open( INPUT, "$cmd |" ) || croak "Can't preprocess $currentfile"; } else { @@ -351,9 +353,16 @@ LOOP: || $p =~ /^\s*Q_OBJECT/ # QObject macro ); + next if ( $p =~ /^\s*Q_ENUMS/ # ignore Q_ENUMS + || $p =~ /^\s*Q_PROPERTY/ # and Q_PROPERTY + || $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff + || $p =~ /^\s*K_SYCOCAFACTORY/ # + || $p =~ /^\s*K_DCOP/ # and DCOP stuff + ); + # remove all preprocessor macros if( $p =~ /^\s*#\s*(\w+)/ ) { - if ($p =~ /^\s*#\s*[0-9]+\s*\".*$/ + if (!$docincluded && $p =~ /^\s*#\s*[0-9]+\s*\".*$/ && not($p =~ /\"$currentfile\"/)) { # include file markers while( ) { diff --git a/deal.II/contrib/kdoc/src/kdocAstUtil.pm b/deal.II/contrib/kdoc/src/kdocAstUtil.pm index 40e1238f54..5da9647cbc 100644 --- a/deal.II/contrib/kdoc/src/kdocAstUtil.pm +++ b/deal.II/contrib/kdoc/src/kdocAstUtil.pm @@ -593,7 +593,10 @@ sub makeClassList my $her = join ( "::", heritage( $node ) ); $node->AddProp( "FullName", $her ); - push @$list, $node; + if ( !exists $node->{DocNode}->{Internal} || + !$main::skipInternal ) { + push @$list, $node; + } } ); @$list = sort { $a->{FullName} cmp $b->{FullName} } @$list; diff --git a/deal.II/contrib/kdoc/src/kdocCxxHTML.pm b/deal.II/contrib/kdoc/src/kdocCxxHTML.pm index 58c1cddfda..73ce4f8903 100644 --- a/deal.II/contrib/kdoc/src/kdocCxxHTML.pm +++ b/deal.II/contrib/kdoc/src/kdocCxxHTML.pm @@ -450,8 +450,9 @@ sub writeClassDoc else { Iter::MembersByType ( $node, sub { print CLASS "

", $_[0], "

    "; }, - sub { my ($node, $kid ) = @_; - listMember( $node, $kid ); }, + sub { my ($node, $kid ) = @_; + listMember( $node, $kid ); + }, sub { print CLASS "
"; } ); } @@ -493,8 +494,11 @@ sub writeClassDoc $ref = kdocAstUtil::findOverride( $rootnode, $node, $kid->{astNodeName} ); if ( defined $ref ) { - print CLASS "

Reimplemented from ", - refName( $ref ), "

\n"; + print CLASS "

Reimplemented from ", refName( $ref ); + if ( exists $kid->{DocNode}->{Reimplemented} ) { + print CLASS " for internal reasons; the API is not affected"; + } + print CLASS ".

\n"; } } diff --git a/deal.II/contrib/kdoc/src/kdocParseDoc.pm b/deal.II/contrib/kdoc/src/kdocParseDoc.pm index 143eccc12b..ec5b14983d 100644 --- a/deal.II/contrib/kdoc/src/kdocParseDoc.pm +++ b/deal.II/contrib/kdoc/src/kdocParseDoc.pm @@ -83,6 +83,9 @@ PARSELOOP: elsif ( $text =~ /^\s*\@deprecated\s*/ ) { codeProp( "Deprecated", 1 ); } + elsif ( $text =~ /^\s*\@reimplemented\s*/ ) { + codeProp( "Reimplemented", 1 ); + } elsif ( $text =~ /^\s*\@group\s*/ ) { # logical group tag in which this node belongs # multiples allowed @@ -136,7 +139,7 @@ PARSELOOP: elsif( $text =~ /^\s*\@(?:throws|exception|raises)\s*/ ) { docListProp( "Throws" ); } - elsif( $text =~ /^\s*\@image\s+(\w+)\s*/ ) { + elsif( $text =~ /^\s*\@image\s+([^\s]+)\s*/ ) { textProp( "Image" ); $extraprops{ "Path" } = $1; } -- 2.39.5