Skip to content

D
doxverilog
Commit ff31b2f1 authored by dimitri's avatar dimitri
Browse files
Options

Release-1.2.15-20020421

parent bc629c90
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1607 additions and 1227 deletions
INSTALL
View file @ ff31b2f1
DOXYGEN Version 1.2.15-20020407
DOXYGEN Version 1.2.15-20020421
Please read the installation section of the manual for instructions.
--------
Dimitri van Heesch (07 April 2002)
Dimitri van Heesch (21 April 2002)
README
View file @ ff31b2f1
DOXYGEN Version 1.2.15_20020407
DOXYGEN Version 1.2.15_20020421
Please read INSTALL for compilation instructions.
......@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
Enjoy,
Dimitri van Heesch (dimitri@stack.nl) (07 April 2002)
Dimitri van Heesch (dimitri@stack.nl) (21 April 2002)
VERSION
View file @ ff31b2f1
1.2.15-20020407
1.2.15-20020421
addon/doxmlparser/include/doxmlintf.h
View file @ ff31b2f1
This diff is collapsed.
addon/doxmlparser/src/compoundhandler.cpp
View file @ ff31b2f1
......@@ -144,7 +144,8 @@ void compoundhandler_exit()
CompoundHandler::CompoundHandler(const QString &xmlDir)
: m_brief(0), m_detailed(0), m_programListing(0),
m_xmlDir(xmlDir), m_refCount(1), m_memberDict(257), m_memberNameDict(257),
m_mainHandler(0), m_inheritanceGraph(0), m_collaborationGraph(0)
m_mainHandler(0), m_inheritanceGraph(0), m_collaborationGraph(0),
m_includeDependencyGraph(0), m_includedByDependencyGraph(0)
{
m_superClasses.setAutoDelete(TRUE);
m_subClasses.setAutoDelete(TRUE);
......@@ -182,9 +183,14 @@ CompoundHandler::CompoundHandler(const QString &xmlDir)
addStartHandler("collaborationgraph",this,&CompoundHandler::startCollaborationGraph);
addStartHandler("incdepgraph",this,&CompoundHandler::startIncludeDependencyGraph);
addStartHandler("invincdepgraph",this,&CompoundHandler::startIncludedByDependencyGraph);
addStartHandler("innerclass",this,&CompoundHandler::startInnerClass);
addEndHandler("innerclass");
}
CompoundHandler::~CompoundHandler()
......@@ -195,6 +201,8 @@ CompoundHandler::~CompoundHandler()
delete m_programListing;
delete m_inheritanceGraph;
delete m_collaborationGraph;
delete m_includeDependencyGraph;
delete m_includedByDependencyGraph;
}
void CompoundHandler::startSection(const QXmlAttributes& attrib)
......@@ -303,7 +311,7 @@ void CompoundHandler::addSubClass(const QXmlAttributes& attrib)
m_subClasses.append(sc);
}
bool CompoundHandler::parseXML(const QString &compId)
bool CompoundHandler::parseXML(const char *compId)
{
QFile xmlFile(m_xmlDir+"/"+compId+".xml");
if (!xmlFile.exists()) return FALSE;
......@@ -329,12 +337,12 @@ void CompoundHandler::initialize(MainHandler *mh)
void CompoundHandler::insertMember(MemberHandler *mh)
{
m_memberDict.insert(mh->id(),mh);
QList<MemberHandler> *mhl = m_memberNameDict.find(mh->id());
m_memberDict.insert(mh->id()->latin1(),mh);
QList<MemberHandler> *mhl = m_memberNameDict.find(mh->id()->latin1());
if (mhl==0)
{
mhl = new QList<MemberHandler>;
m_memberNameDict.insert(mh->name(),mhl);
m_memberNameDict.insert(mh->name()->latin1(),mhl);
}
mhl->append(mh);
}
......@@ -372,7 +380,7 @@ ISectionIterator *CompoundHandler::sections() const
return new SectionIterator(m_sections);
}
IMemberIterator *CompoundHandler::memberByName(const QString &name) const
IMemberIterator *CompoundHandler::memberByName(const char *name) const
{
QList<MemberHandler> *ml = m_memberNameDict[name];
if (ml==0) return 0;
......@@ -391,6 +399,18 @@ void CompoundHandler::startCollaborationGraph(const QXmlAttributes &attrib)
m_collaborationGraph->startGraph(attrib);
}
void CompoundHandler::startIncludeDependencyGraph(const QXmlAttributes &attrib)
{
m_includeDependencyGraph = new GraphHandler(this,"incdepgraph");
m_includeDependencyGraph->startGraph(attrib);
}
void CompoundHandler::startIncludedByDependencyGraph(const QXmlAttributes &attrib)
{
m_includedByDependencyGraph = new GraphHandler(this,"invincdepgraph");
m_includedByDependencyGraph->startGraph(attrib);
}
IDocRoot *CompoundHandler::briefDescription() const
{
return m_brief;
......@@ -401,7 +421,7 @@ IDocRoot *CompoundHandler::detailedDescription() const
return m_detailed;
}
IMember *CompoundHandler::memberById(const QString &id) const
IMember *CompoundHandler::memberById(const char *id) const
{
return m_memberDict[id];
}
......@@ -416,6 +436,16 @@ IGraph *CompoundHandler::collaborationGraph() const
return m_collaborationGraph;
}
IGraph *CompoundHandler::includeDependencyGraph() const
{
return m_includeDependencyGraph;
}
IGraph *CompoundHandler::includedByDependencyGraph() const
{
return m_includedByDependencyGraph;
}
IRelatedCompoundIterator *CompoundHandler::baseClasses() const
{
return new RelatedCompoundIterator(m_superClasses);
......
addon/doxmlparser/src/compoundhandler.h
View file @ ff31b2f1
......@@ -20,6 +20,7 @@
#include <qxml.h>
#include <doxmlintf.h>
#include "stringimpl.h"
#include "basehandler.h"
#include "baseiterator.h"
......@@ -74,6 +75,7 @@ class CompoundHandler : public IClass,
public BaseHandler<CompoundHandler>
{
friend class RelatedCompound;
public:
virtual void startSection(const QXmlAttributes& attrib);
virtual void startCompound(const QXmlAttributes& attrib);
......@@ -87,26 +89,28 @@ class CompoundHandler : public IClass,
virtual void startProgramListing(const QXmlAttributes& attrib);
virtual void startInheritanceGraph(const QXmlAttributes& attrib);
virtual void startCollaborationGraph(const QXmlAttributes& attrib);
virtual void startIncludeDependencyGraph(const QXmlAttributes& attrib);
virtual void startIncludedByDependencyGraph(const QXmlAttributes& attrib);
virtual void startInnerClass(const QXmlAttributes& attrib);
virtual void addref() { m_refCount++; }
CompoundHandler(const QString &dirName);
virtual ~CompoundHandler();
bool parseXML(const QString &compId);
bool parseXML(const char *compId);
void initialize(MainHandler *mh);
void insertMember(MemberHandler *mh);
ICompound *toICompound() const;
// ICompound implementation
QString name() const { return m_name; }
QString id() const { return m_id; }
const IString *name() const { return &m_name; }
const IString *id() const { return &m_id; }
CompoundKind kind() const { return m_kind; }
QString kindString() const { return m_kindString; }
const IString *kindString() const { return &m_kindString; }
ISectionIterator *sections() const;
IDocRoot *briefDescription() const;
IDocRoot *detailedDescription() const;
IMember *memberById(const QString &id) const;
IMemberIterator *memberByName(const QString &name) const;
IMember *memberById(const char *id) const;
IMemberIterator *memberByName(const char *name) const;
void release();
// IClass implementation
......@@ -116,6 +120,10 @@ class CompoundHandler : public IClass,
IRelatedCompoundIterator *derivedClasses() const;
ICompoundIterator *nestedClasses() const;
// IFile implementation
IGraph *includeDependencyGraph() const;
IGraph *includedByDependencyGraph() const;
private:
QList<RelatedCompound> m_superClasses;
QList<RelatedCompound> m_subClasses;
......@@ -123,10 +131,10 @@ class CompoundHandler : public IClass,
DocHandler *m_brief;
DocHandler *m_detailed;
ProgramListingHandler *m_programListing;
QString m_id;
QString m_kindString;
StringImpl m_id;
StringImpl m_kindString;
CompoundKind m_kind;
QString m_name;
StringImpl m_name;
QString m_defFile;
int m_defLine;
QString m_xmlDir;
......@@ -136,6 +144,8 @@ class CompoundHandler : public IClass,
MainHandler *m_mainHandler;
GraphHandler *m_inheritanceGraph;
GraphHandler *m_collaborationGraph;
GraphHandler *m_includeDependencyGraph;
GraphHandler *m_includedByDependencyGraph;
QList<QString> m_innerClasses;
};
......
addon/doxmlparser/src/dochandler.cpp
View file @ ff31b2f1
......@@ -117,6 +117,9 @@ MarkupHandler::MarkupHandler(QList<DocImpl> &children,QString &curString)
addStartHandler("superscript",this,&MarkupHandler::startSuperscript);
addEndHandler("superscript",this,&MarkupHandler::endSuperscript);
addStartHandler("preformatted",this,&MarkupHandler::startPreformatted);
addEndHandler("preformatted",this,&MarkupHandler::endPreformatted);
}
MarkupHandler::~MarkupHandler()
......@@ -231,6 +234,20 @@ void MarkupHandler::endSuperscript()
m_curMarkup &= ~IDocMarkup::Superscript;
}
void MarkupHandler::startPreformatted(const QXmlAttributes & /*attrib*/)
{
addTextNode();
m_children.append(new MarkupModifierNode(IDocMarkup::Preformatted,TRUE));
m_curMarkup |= IDocMarkup::Preformatted;
}
void MarkupHandler::endPreformatted()
{
addTextNode();
m_children.append(new MarkupModifierNode(IDocMarkup::Preformatted,FALSE));
m_curMarkup &= ~IDocMarkup::Preformatted;
}
//----------------------------------------------------------------------
// ListItemHandler
//----------------------------------------------------------------------
......
addon/doxmlparser/src/dochandler.h
View file @ ff31b2f1
......@@ -21,6 +21,7 @@
#include <qxml.h>
#include <doxmlintf.h>
#include "stringimpl.h"
#include "basehandler.h"
#include "baseiterator.h"
......@@ -80,11 +81,11 @@ class TextNode : public DocTextImpl
// IDocText
virtual Kind kind() const { return DocImpl::Text; }
virtual QString text() const { return m_text; }
virtual const IString *text() const { return &m_text; }
virtual int markup() const { return m_markup; }
private:
QString m_text;
StringImpl m_text;
int m_markup;
};
......@@ -137,6 +138,8 @@ class MarkupHandler : public BaseFallBackHandler<MarkupHandler>
virtual void endSubscript();
virtual void startSuperscript(const QXmlAttributes &attrib);
virtual void endSuperscript();
virtual void startPreformatted(const QXmlAttributes &attrib);
virtual void endPreformatted();
private:
......@@ -322,12 +325,12 @@ class ParameterHandler : public DocParameterImpl,
// IDocParameter
virtual Kind kind() const { return DocImpl::Parameter; }
virtual QString name() const { return m_name; }
virtual const IString *name() const { return &m_name; }
virtual IDocPara *description() const { return m_description; }
private:
IBaseHandler *m_parent;
QString m_name;
StringImpl m_name;
ParagraphHandler *m_description;
};
......@@ -404,13 +407,13 @@ class LinkHandler : public DocLinkImpl, public BaseHandler<LinkHandler>
// IDocLink
virtual Kind kind() const { return DocImpl::Link; }
virtual QString refId() const { return m_ref; }
virtual QString text() const { return m_text; }
virtual const IString *refId() const { return &m_ref; }
virtual const IString *text() const { return &m_text; }
private:
IBaseHandler *m_parent;
QString m_ref;
QString m_text;
StringImpl m_ref;
StringImpl m_text;
};
......@@ -430,11 +433,11 @@ class EMailHandler : public DocEMailImpl, public BaseHandler<EMailHandler>
// IDocEMail
virtual Kind kind() const { return DocImpl::EMail; }
virtual QString address() const { return m_address; }
virtual const IString *address() const { return &m_address; }
private:
IBaseHandler *m_parent;
QString m_address;
StringImpl m_address;
};
......@@ -454,13 +457,13 @@ class ULinkHandler : public DocULinkImpl, public BaseHandler<ULinkHandler>
// IDocULink
virtual Kind kind() const { return DocImpl::ULink; }
virtual QString url() const { return m_url; }
virtual QString text() const { return m_text; }
virtual const IString * url() const { return &m_url; }
virtual const IString * text() const { return &m_text; }
private:
IBaseHandler *m_parent;
QString m_url;
QString m_text;
StringImpl m_url;
StringImpl m_text;
};
//-----------------------------------------------------------------------------
......@@ -499,16 +502,16 @@ class RefHandler : public DocRefImpl, public BaseHandler<RefHandler>
// IDocRef
virtual Kind kind() const { return DocImpl::Ref; }
virtual QString refId() const { return m_refId; }
virtual const IString *refId() const { return &m_refId; }
virtual TargetKind targetKind() const { return m_targetKind; }
virtual QString external() const { return m_extId; }
virtual QString text() const { return m_linkText; }
virtual const IString *external() const { return &m_extId; }
virtual const IString *text() const { return &m_linkText; }
private:
IBaseHandler *m_parent;
QString m_refId;
QString m_extId;
QString m_linkText;
StringImpl m_refId;
StringImpl m_extId;
StringImpl m_linkText;
TargetKind m_targetKind;
};
......@@ -569,7 +572,7 @@ class SimpleSectHandler : public DocSimpleSectImpl,
// IDocSimpleSect
virtual Kind kind() const { return DocImpl::SimpleSect; }
virtual Types type() const { return m_type; }
virtual QString typeString() const { return m_typeString; }
virtual const IString *typeString() const { return &m_typeString; }
virtual IDocTitle *title() const { return m_title; }
virtual IDocPara *description() const { return m_paragraph; }
......@@ -577,7 +580,7 @@ class SimpleSectHandler : public DocSimpleSectImpl,
IBaseHandler *m_parent;
ParagraphHandler *m_paragraph;
Types m_type;
QString m_typeString;
StringImpl m_typeString;
TitleHandler *m_title;
};
......@@ -603,12 +606,12 @@ class VariableListEntryHandler : public DocVariableListEntryImpl,
// IDocVariableListEntry
virtual Kind kind() const { return DocImpl::VariableListEntry; }
virtual QString term() const { return m_term; }
virtual const IString *term() const { return &m_term; }
virtual IDocPara *description() const { return m_description; }
private:
IBaseHandler *m_parent;
QString m_term;
StringImpl m_term;
ParagraphHandler *m_description;
};
......@@ -710,7 +713,7 @@ class CodeLineHandler : public DocCodeLineImpl, public BaseHandler<CodeLineHandl
// IDocCodeLine
virtual Kind kind() const { return DocImpl::CodeLine; }
virtual int lineNumber() const { return m_lineNumber; }
virtual QString refId() const { return m_refId; }
virtual const IString *refId() const { return &m_refId; }
virtual IDocIterator *codeElements() const;
private:
......@@ -718,7 +721,7 @@ class CodeLineHandler : public DocCodeLineImpl, public BaseHandler<CodeLineHandl
IBaseHandler *m_parent;
int m_lineNumber;
QString m_refId;
StringImpl m_refId;
QList<DocImpl> m_children;
};
......@@ -782,13 +785,13 @@ class FormulaHandler : public DocFormulaImpl, public BaseHandler<FormulaHandler>
// IDocFormula
virtual Kind kind() const { return DocImpl::Formula; }
virtual QString id() const { return m_id; }
virtual QString text() const { return m_text; }
virtual const IString *id() const { return &m_id; }
virtual const IString *text() const { return &m_text; }
private:
IBaseHandler *m_parent;
QString m_id;
QString m_text;
StringImpl m_id;
StringImpl m_text;
};
//-----------------------------------------------------------------------------
......@@ -807,13 +810,13 @@ class ImageHandler : public DocImageImpl, public BaseHandler<ImageHandler>
// IDocImage
virtual Kind kind() const { return DocImpl::Image; }
virtual QString name() const { return m_name; }
virtual QString caption() const { return m_caption; }
virtual const IString *name() const { return &m_name; }
virtual const IString *caption() const { return &m_caption; }
private:
IBaseHandler *m_parent;
QString m_name;
QString m_caption;
StringImpl m_name;
StringImpl m_caption;
};
//-----------------------------------------------------------------------------
......@@ -832,13 +835,13 @@ class DotFileHandler : public DocDotFileImpl, public BaseHandler<DotFileHandler>
// IDocDotFile
virtual Kind kind() const { return DocImpl::DotFile; }
virtual QString name() const { return m_name; }
virtual QString caption() const { return m_caption; }
virtual const IString *name() const { return &m_name; }
virtual const IString *caption() const { return &m_caption; }
private:
IBaseHandler *m_parent;
QString m_name;
QString m_caption;
StringImpl m_name;
StringImpl m_caption;
};
//-----------------------------------------------------------------------------
......@@ -861,13 +864,13 @@ class IndexEntryHandler : public DocIndexEntryImpl, public BaseHandler<IndexEntr
// IDocIndexEntry
virtual Kind kind() const { return DocImpl::IndexEntry; }
virtual QString primary() const { return m_primary; }
virtual QString secondary() const { return m_secondary; }
virtual const IString *primary() const { return &m_primary; }
virtual const IString *secondary() const { return &m_secondary; }
private:
IBaseHandler *m_parent;
QString m_primary;
QString m_secondary;
StringImpl m_primary;
StringImpl m_secondary;
};
//-----------------------------------------------------------------------------
......@@ -956,13 +959,13 @@ class TableHandler : public DocTableImpl, public BaseHandler<TableHandler>
virtual Kind kind() const { return DocImpl::Table; }
virtual IDocIterator *rows() const;
virtual int numColumns() const { return m_numColumns; }
virtual QString caption() const { return m_caption; }
virtual const IString *caption() const { return &m_caption; }
private:
IBaseHandler *m_parent;
QList<RowHandler> m_children;
int m_numColumns;
QString m_caption;
StringImpl m_caption;
};
class TableIterator : public BaseIteratorVia<IDocIterator,IDoc,RowHandler,DocImpl>
......@@ -995,7 +998,7 @@ class DocSectionHandler : public DocSectionImpl, public BaseHandler<DocSectionHa
// IDocSection
virtual Kind kind() const { return DocImpl::Section; }
virtual QString id() const { return m_id; }
virtual const IString *id() const { return &m_id; }
virtual int level() const { return m_level; }
virtual IDocIterator *title() const;
......@@ -1003,7 +1006,7 @@ class DocSectionHandler : public DocSectionImpl, public BaseHandler<DocSectionHa
IBaseHandler *m_parent;
QList<DocImpl> m_children;
MarkupHandler *m_markupHandler;
QString m_id;
StringImpl m_id;
int m_level;
};
......
addon/doxmlparser/src/doxmlintf.h
View file @ ff31b2f1
This diff is collapsed.
addon/doxmlparser/src/doxmlparser.pro.in
View file @ ff31b2f1
......@@ -4,7 +4,7 @@ HEADERS = basehandler.h mainhandler.h \
compoundhandler.h sectionhandler.h \
memberhandler.h paramhandler.h \
dochandler.h linkedtexthandler.h \
debug.h graphhandler.h
debug.h graphhandler.h stringimpl.h
SOURCES = mainhandler.cpp \
compoundhandler.cpp sectionhandler.cpp \
memberhandler.cpp paramhandler.cpp \
......
addon/doxmlparser/src/graphhandler.h
View file @ ff31b2f1
......@@ -16,6 +16,7 @@
#ifndef _GRAPHHANDLER_H
#define _GRAPHHANDLER_H
#include "stringimpl.h"
#include "doxmlintf.h"
#include "basehandler.h"
#include "baseiterator.h"
......@@ -63,16 +64,16 @@ class NodeHandler : public INode, public BaseHandler<NodeHandler>
void startChildNode(const QXmlAttributes &attrib);
// INode
virtual QString id() const { return m_id; }
virtual QString label() const { return m_label; }
virtual QString linkId() const { return m_link; }
virtual const IString *id() const { return &m_id; }
virtual const IString *label() const { return &m_label; }
virtual const IString *linkId() const { return &m_link; }
virtual IChildNodeIterator *children() const;
private:
IBaseHandler *m_parent;
QString m_id;
QString m_label;
QString m_link;
StringImpl m_id;
StringImpl m_label;
StringImpl m_link;
QList<ChildNodeHandler> m_children;
GraphHandler *m_graph;
};
......@@ -100,14 +101,14 @@ class ChildNodeHandler : public IChildNode, public BaseHandler<ChildNodeHandler>
// IChildNode
virtual INode *node() const;
virtual NodeRelation relation() const { return m_relation; }
virtual QString relationString() const { return m_relationString; }
virtual const IString * relationString() const { return &m_relationString; }
virtual IEdgeLabelIterator *edgeLabels() const;
private:
IBaseHandler *m_parent;
QString m_id;
NodeRelation m_relation;
QString m_relationString;
StringImpl m_relationString;
QList<EdgeLabelHandler> m_edgeLabels;
GraphHandler *m_graph;
};
......@@ -132,11 +133,11 @@ class EdgeLabelHandler : public IEdgeLabel, public BaseHandler<EdgeLabelHandler>
void endEdgeLabel();
// IEdgeLabel
virtual QString label() const { return m_label; }
virtual const IString *label() const { return &m_label; }
private:
IBaseHandler *m_parent;
QString m_label;
StringImpl m_label;
};
class EdgeLabelIterator : public BaseIterator<IEdgeLabelIterator,IEdgeLabel,EdgeLabelHandler>
......
addon/doxmlparser/src/linkedtexthandler.cpp
View file @ ff31b2f1
......@@ -15,6 +15,7 @@
#include "linkedtexthandler.h"
#include "debug.h"
#include <doxmlintf.h>
#include "stringimpl.h"
class LT_Text : public LinkedTextImpl, public ILT_Text
{
......@@ -23,10 +24,10 @@ class LT_Text : public LinkedTextImpl, public ILT_Text
virtual ~LT_Text() {}
// ILT_Text
virtual QString text() const { return m_text; }
virtual const IString *text() const { return &m_text; }
virtual Kind kind() const { return LinkedTextImpl::Kind_Text; }
private:
QString m_text;
StringImpl m_text;
};
class LT_Ref : public LinkedTextImpl, public ILT_Ref
......@@ -40,16 +41,16 @@ class LT_Ref : public LinkedTextImpl, public ILT_Ref
void setTargetKind(TargetKind k) { m_targetKind=k; }
// ILT_Ref
virtual QString text() const { return m_text; }
virtual QString id() const { return m_refId; }
virtual const IString *text() const { return &m_text; }
virtual const IString * id() const { return &m_refId; }
virtual TargetKind targetKind() const { return m_targetKind; }
virtual QString external() const { return m_extId; }
virtual const IString *external() const { return &m_extId; }
virtual Kind kind() const { return LinkedTextImpl::Kind_Ref; }
private:
QString m_refId;
QString m_extId;
QString m_text;
StringImpl m_refId;
StringImpl m_extId;
StringImpl m_text;
TargetKind m_targetKind;
};
......@@ -106,7 +107,7 @@ void LinkedTextHandler::endRef()
{
m_ref->setText(m_curString);
m_children.append(m_ref);
debug(2,"LinkedTextHandler: add ref `%s'\n",m_ref->text().data());
debug(2,"LinkedTextHandler: add ref `%s'\n",m_ref->text()->latin1());
m_ref=0;
}
......@@ -120,10 +121,10 @@ QString LinkedTextHandler::toString(const QList<LinkedTextImpl> &list)
switch(lt->kind())
{
case ILinkedText::Kind_Text:
result+=dynamic_cast<ILT_Text*>(lt)->text();
result+=dynamic_cast<ILT_Text*>(lt)->text()->latin1();
break;
case ILinkedText::Kind_Ref:
result+=dynamic_cast<ILT_Ref *>(lt)->text();
result+=dynamic_cast<ILT_Ref *>(lt)->text()->latin1();
break;
}
}
......
addon/doxmlparser/src/mainhandler.cpp
View file @ ff31b2f1
......@@ -194,16 +194,17 @@ ICompoundIterator *MainHandler::compounds() const
return new CompoundEntryIterator(this,m_compounds);
}
ICompound *MainHandler::compoundById(const QString &id) const
ICompound *MainHandler::compoundById(const char *id) const
{
if (id.isEmpty()) return 0;
CompoundHandler *ch = m_compoundsLoaded[id];
QString ids = id;
if (ids.isEmpty()) return 0;
CompoundHandler *ch = m_compoundsLoaded[ids];
if (ch) // compound already in memory
{
ch->addref(); // returning alias -> increase reference counter
return ch->toICompound();
}
CompoundEntry *ce = m_compoundDict.find(id);
CompoundEntry *ce = m_compoundDict.find(ids);
if (ce==0) return 0; // id not found
// create and load a new compound
ch = new CompoundHandler(m_xmlDirName);
......@@ -224,28 +225,31 @@ ICompound *MainHandler::compoundById(const QString &id) const
void MainHandler::unloadCompound(CompoundHandler *ch)
{
m_compoundsLoaded.remove(ch->id());
m_compoundsLoaded.remove(ch->id()->latin1());
}
ICompound *MainHandler::compoundByName(const QString &name) const
ICompound *MainHandler::compoundByName(const char *name) const
{
if (name.isEmpty()) return 0;
QString nameStr = name;
if (nameStr.isEmpty()) return 0;
CompoundEntry *ce = m_compoundNameDict[name];
if (ce==0) return 0; // name not found
return compoundById(ce->id);
}
ICompound *MainHandler::memberById(const QString &id) const
ICompound *MainHandler::memberById(const char *id) const
{
if (id.isEmpty()) return 0;
QString ids = id;
if (ids.isEmpty()) return 0;
MemberEntry *me = m_memberDict[id];
if (me==0) return 0; // id not found
return compoundById(me->id);
}
ICompoundIterator *MainHandler::memberByName(const QString &name) const
ICompoundIterator *MainHandler::memberByName(const char *name) const
{
if (name.isEmpty()) return 0;
QString nameStr = name;
if (nameStr.isEmpty()) return 0;
QList<CompoundEntry> *cel = m_memberNameDict[name];
if (cel==0) return 0; // name not found
return new CompoundEntryIterator(this,*cel);
......@@ -267,7 +271,7 @@ void MainHandler::release()
CompoundHandler *ch;
for (chi.toFirst();(ch=chi.current());++chi)
{
debug(1,"Compound %s not released\n",ch->name().data());
debug(1,"Compound %s not released\n",ch->name()->latin1());
}
graphhandler_exit();
dochandler_exit();
......
addon/doxmlparser/src/mainhandler.h
View file @ ff31b2f1
......@@ -55,10 +55,10 @@ class MainHandler : public IDoxygen, public BaseHandler<MainHandler>
// IDoxygen
ICompoundIterator *compounds() const;
ICompound *compoundById(const QString &id) const;
virtual ICompound *compoundByName(const QString &name) const;
virtual ICompound *memberById(const QString &id) const;
virtual ICompoundIterator *memberByName(const QString &name) const;
ICompound *compoundById(const char *id) const;
virtual ICompound *compoundByName(const char *name) const;
virtual ICompound *memberById(const char *id) const;
virtual ICompoundIterator *memberByName(const char *name) const;
virtual void release();
void setDebugLevel(int level);
......
addon/doxmlparser/src/memberhandler.h
View file @ ff31b2f1
......@@ -35,11 +35,11 @@ struct MemberReference : public IMemberReference
{
virtual ~MemberReference() {}
virtual IMember *member() const;
virtual QString memberName() const { return m_name; }
virtual const IString *memberName() const { return &m_name; }
void initialize(MainHandler *m);
QString m_memId;
QString m_name;
StringImpl m_name;
MainHandler *m_mainHandler;
};
......@@ -61,8 +61,8 @@ class EnumValueHandler : public IEnumValue, public BaseHandler<EnumValueHandler>
virtual void endEnumValue();
// IEnumValue
virtual QString name() const { return m_name; }
virtual QString initializer() const { return m_initializer; }
virtual const IString *name() const { return &m_name; }
virtual const IString *initializer() const { return &m_initializer; }
void setName(const QString &name) { m_name=name; }
void setInitializer(const QString &init) { m_initializer=init; }
......@@ -71,8 +71,8 @@ class EnumValueHandler : public IEnumValue, public BaseHandler<EnumValueHandler>
EnumValueHandler(IBaseHandler *parent);
private:
QString m_name;
QString m_initializer;
StringImpl m_name;
StringImpl m_initializer;
IBaseHandler *m_parent;
};
......@@ -115,24 +115,27 @@ class MemberHandler : public IMember, public BaseHandler<MemberHandler>
virtual ISection *section() const;
virtual MemberKind kind() const
{ return m_kind; }
virtual QString kindString() const
{ return m_kindString; }
virtual QString id() const
{ return m_id; }
virtual QString protection() const
{ return m_protection; }
virtual QString virtualness() const
{ return m_virtualness; }
virtual QString name() const
{ return m_name; }
virtual const IString *kindString() const
{ return &m_kindString; }
virtual const IString *id() const
{ return &m_id; }
virtual const IString *protection() const
{ return &m_protection; }
virtual const IString *virtualness() const
{ return &m_virtualness; }
virtual const IString *name() const
{ return &m_name; }
virtual bool isConst() const
{ return m_isConst; }
virtual bool isVolatile() const
{ return m_isVolatile; }
virtual ILinkedTextIterator *type() const
{ return new LinkedTextIterator(m_type); }
virtual QString typeString() const
{ return LinkedTextHandler::toString(m_type); }
virtual const IString *typeString() const
{ MemberHandler *that = (MemberHandler *)this;
that->m_typeString = LinkedTextHandler::toString(m_type);
return &m_typeString;
}
virtual IParamIterator *params() const
{ return new ParamIterator(m_params); }
virtual IMemberReferenceIterator *references() const
......@@ -147,8 +150,8 @@ class MemberHandler : public IMember, public BaseHandler<MemberHandler>
{ return m_bodyStart; }
virtual int bodyEnd() const
{ return m_bodyEnd; }
virtual QString definitionFile() const
{ return m_defFile; }
virtual const IString *definitionFile() const
{ return &m_defFile; }
virtual int definitionLine() const
{ return m_defLine; }
virtual IMemberReference *reimplements() const
......@@ -171,14 +174,15 @@ class MemberHandler : public IMember, public BaseHandler<MemberHandler>
CompoundHandler *m_compound;
SectionHandler *m_section;
MemberKind m_kind;
QString m_kindString;
QString m_id;
QString m_protection;
QString m_virtualness;
StringImpl m_kindString;
StringImpl m_id;
StringImpl m_protection;
StringImpl m_virtualness;
StringImpl m_typeString;
QList<LinkedTextImpl> m_type;
QList<LinkedTextImpl> m_initializer;
QList<LinkedTextImpl> m_exception;
QString m_name;
StringImpl m_name;
DocHandler *m_brief;
DocHandler *m_detailed;
QList<ParamHandler> m_params;
......@@ -186,7 +190,7 @@ class MemberHandler : public IMember, public BaseHandler<MemberHandler>
QList<MemberReference> m_referencedBy;
MemberReference *m_reimplements;
QList<MemberReference> m_reimplementedBy;
QString m_defFile;
StringImpl m_defFile;
int m_defLine;
int m_bodyStart;
int m_bodyEnd;
......
addon/doxmlparser/src/paramhandler.h
View file @ ff31b2f1
......@@ -21,6 +21,7 @@
#include <qxml.h>
#include <doxmlintf.h>
#include "stringimpl.h"
#include "basehandler.h"
#include "baseiterator.h"
#include "linkedtexthandler.h"
......@@ -43,20 +44,20 @@ class ParamHandler : public IParam, public BaseHandler<ParamHandler>
// IParam
virtual ILinkedTextIterator *type() const
{ return new LinkedTextIterator(m_type); }
virtual QString declarationName() const { return m_declName; }
virtual QString definitionName() const { return m_defName; }
virtual QString attrib() const { return m_attrib; }
virtual QString arraySpecifier() const { return m_array; }
virtual const IString * declarationName() const { return &m_declName; }
virtual const IString * definitionName() const { return &m_defName; }
virtual const IString * attrib() const { return &m_attrib; }
virtual const IString * arraySpecifier() const { return &m_array; }
virtual ILinkedTextIterator *defaultValue() const
{ return new LinkedTextIterator(m_defVal); }
private:
IBaseHandler *m_parent;
QList<LinkedTextImpl> m_type;
QString m_declName;
QString m_defName;
QString m_attrib;
QString m_array;
StringImpl m_declName;
StringImpl m_defName;
StringImpl m_attrib;
StringImpl m_array;
QList<LinkedTextImpl> m_defVal;
LinkedTextHandler *m_linkedTextHandler;
};
......
addon/doxmlparser/src/sectionhandler.h
View file @ ff31b2f1
......@@ -46,8 +46,8 @@ class SectionHandler : public ISection, public BaseHandler<SectionHandler>
virtual ~SectionHandler();
// ISection
virtual QString kindString() const
{ return m_kindString; }
virtual const IString *kindString() const
{ return &m_kindString; }
virtual SectionKind kind() const
{ return m_kind; }
virtual IMemberIterator *members() const
......@@ -78,7 +78,7 @@ class SectionHandler : public ISection, public BaseHandler<SectionHandler>
private:
IBaseHandler *m_parent;
SectionKind m_kind;
QString m_kindString;
StringImpl m_kindString;
QList<MemberHandler> m_members;
};
......
addon/doxmlparser/src/stringimpl.h 0 → 100644
View file @ ff31b2f1
#ifndef STRINGIMPL_H
#define STRINGIMPL_H
#include <qstring.h>
#include "doxmlintf.h"
class StringImpl : public QString, public IString
{
public:
StringImpl() {}
StringImpl(const QString &str) : QString(str) {}
virtual ~StringImpl() {}
// IString
const char *latin1() const
{ return QString::latin1(); }
unsigned short unicodeCharAt(int index) const
{ return QString::unicode()[index].unicode(); }
bool isEmpty() const
{ return QString::isEmpty(); }
int length() const
{ return QString::length(); }
};
#endif
addon/doxmlparser/test/main.cpp
View file @ ff31b2f1
This diff is collapsed.
packages/rpm/doxygen.spec
View file @ ff31b2f1
Summary: A documentation system for C/C++.
Name: doxygen
Version: 1.2.15_20020407
Version: 1.2.15_20020421
Release: 1
Epoch: 1
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
......
src/classdef.cpp
View file @ ff31b2f1
......@@ -923,7 +923,7 @@ void ClassDef::writeDocumentation(OutputList &ol)
ol.pushGeneratorState();
ol.disable(OutputGenerator::Man);
ol.startDotGraph();
parseText(ol,theTranslator->trClassDiagram(name()));
parseText(ol,theTranslator->trClassDiagram(displayName()));
ol.endDotGraph(inheritanceGraph);
if (Config_getBool("GENERATE_LEGEND"))
{
......
src/config.l
View file @ ff31b2f1
......@@ -1103,7 +1103,8 @@ void Config::check()
exit(1);
}
else if (cgiURL.left(7)!="http://" &&
cgiURL.left(8)!="https://"
cgiURL.left(8)!="https://" &&
cgiURL.left(4)!="cgi:"
)
{
config_err("Error: tag CGI_URL: URL to cgi directory is invalid (must "
......@@ -2224,6 +2225,13 @@ void Config::create()
"recommended to install and use dot, since it yield more powerful graphs. \n",
TRUE
);
cb = addBool(
"HIDE_UNDOC_RELATIONS",
"If set to YES, the inheritance and collaboration graphs will hide \n"
"inheritance and usage relations if the target is undocumented \n"
"or is not a class. \n",
TRUE
);
cb = addBool(
"HAVE_DOT",
"If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is \n"
......@@ -2257,14 +2265,6 @@ void Config::create()
TRUE
);
cb->addDependency("HAVE_DOT");
cb = addBool(
"HIDE_UNDOC_RELATIONS",
"If set to YES, the inheritance and collaboration graphs will hide \n"
"inheritance and usage relations if the target is undocumented \n"
"or is not a class. \n",
TRUE
);
cb->addDependency("HAVE_DOT");
cb = addBool(
"INCLUDE_GRAPH",
"If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT \n"
......
src/definition.cpp
View file @ ff31b2f1
......@@ -123,7 +123,9 @@ void Definition::setBriefDescription(const char *b,const char *briefFile,int bri
switch(m_brief.at(bl-1))
{
case '.': case '!': case '?': break;
default: m_brief+='.'; break;
default:
if (isupper(m_brief.at(0))) m_brief+='.';
break;
}
}
m_briefFile = briefFile;
......
src/doc.l
View file @ ff31b2f1
......@@ -1161,12 +1161,12 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
BEGIN( DocScan );
}
<DocScan>{CMD}"verbatim"/[^a-z_A-Z0-9] {
outDoc->startCodeFragment();
outDoc->startVerbatimFragment();
insideVerbatim=TRUE;
BEGIN(DocVerbatim);
}
<DocVerbatim>{CMD}"endverbatim"/[^a-z_A-Z0-9] {
outDoc->endCodeFragment();
outDoc->endVerbatimFragment();
insideVerbatim=FALSE;
BEGIN(DocScan);
}
......@@ -1225,7 +1225,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
BEGIN( DocLinkText );
}
<DocJavaLink>([a-z_A-Z0-9]+".")+ { /* Skip scope prefix (TODO: fix) */ }
<DocJavaLink>([a-z_A-Z0-9]*"#")?[a-z_A-Z0-9]+("("[a-z_A-Z0-9.,:~&*()\[\]]*")")?({B}*("const"|"volatile"))? { // TODO: support operators as well!
<DocJavaLink>([a-z_A-Z0-9]*"#")?[a-z_A-Z0-9]+("("[a-z_A-Z0-9.,:~&*()\ \[\]]*")")?({B}*("const"|"volatile"))? { // TODO: support operators as well!
linkRef = yytext;
linkText = "";
BEGIN( DocJavaLinkText );
......@@ -1272,6 +1272,10 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
BEGIN(DocScan);
}
<DocScan>{CMD}("arg"|"li")/{BN} {
if (insideItemList)
{
forceEndItemList();
}
if (insideArgumentList)
{
outDoc->writeListItem();
......
src/dot.cpp
View file @ ff31b2f1
......@@ -468,7 +468,7 @@ void DotNode::write(QTextStream &t,
}
}
void DotNode::writeXML(QTextStream &t)
void DotNode::writeXML(QTextStream &t,bool isClassGraph)
{
t << " <node id=\"" << m_number << "\">" << endl;
t << " <label>" << convertToXML(m_label) << "</label>" << endl;
......@@ -498,6 +498,8 @@ void DotNode::writeXML(QTextStream &t)
{
edgeInfo=eli.current();
t << " <childnode id=\"" << childNode->m_number << "\" relation=\"";
if (isClassGraph)
{
switch(edgeInfo->m_color)
{
case EdgeInfo::Blue: t << "public-inheritance"; break;
......@@ -507,6 +509,11 @@ void DotNode::writeXML(QTextStream &t)
case EdgeInfo::Orange: t << "template-instance"; break;
case EdgeInfo::Grey: ASSERT(0); break;
}
}
else // include graph
{
t << "include";
}
t << "\">" << endl;
if (!edgeInfo->m_label.isEmpty())
{
......@@ -1430,7 +1437,7 @@ void DotClassGraph::writeXML(QTextStream &t)
DotNode *node;
for (;(node=dni.current());++dni)
{
node->writeXML(t);
node->writeXML(t,TRUE);
}
}
......@@ -1661,7 +1668,7 @@ void DotInclDepGraph::writeXML(QTextStream &t)
DotNode *node;
for (;(node=dni.current());++dni)
{
node->writeXML(t);
node->writeXML(t,FALSE);
}
}
......
src/dot.h
View file @ ff31b2f1
......@@ -76,7 +76,7 @@ class DotNode
int maxDistance=1000,bool backArrows=TRUE);
int m_subgraphId;
void clearWriteFlag();
void writeXML(QTextStream &t);
void writeXML(QTextStream &t,bool isClassGraph);
void writeDEF(QTextStream &t);
QCString label() const { return m_label; }
int number() const { return m_number; }
......
src/doxygen.cpp
View file @ ff31b2f1
/******************************************************************************
*
* $Id$
*
*
*
* Copyright (C) 1997-2002 by Dimitri van Heesch.
......@@ -541,19 +541,8 @@ ArgumentList *getTemplateArgumentsFromName(
return ali.current();
}
//----------------------------------------------------------------------
// build a list of all classes mentioned in the documentation
// and all classes that have a documentation block before their definition.
static void buildClassList(Entry *root)
static void addClassToContext(Entry *root)
{
if (
((root->section & Entry::COMPOUNDDOC_MASK) ||
((root->section & Entry::COMPOUND_MASK))
) &&
!root->name.isEmpty()
)
{
QCString fullName=removeRedundantWhiteSpace(root->name);
if (fullName.isEmpty())
{
......@@ -561,7 +550,7 @@ static void buildClassList(Entry *root)
warn(root->fileName,root->startLine,
"Warning: invalid class name found!"
);
goto error;
return;
}
Debug::print(Debug::Classes,0," Found class with raw name %s\n",fullName.data());
......@@ -765,8 +754,19 @@ static void buildClassList(Entry *root)
cd->setOuterScope(d);
}
}
}
//----------------------------------------------------------------------
// build a list of all classes mentioned in the documentation
// and all classes that have a documentation block before their definition.
static void buildClassList(Entry *root)
{
if (
(root->section & Entry::COMPOUND_MASK) && !root->name.isEmpty()
)
{
addClassToContext(root);
}
error:
EntryListIterator eli(*root->sublist);
Entry *e;
for (;(e=eli.current());++eli)
......@@ -775,18 +775,41 @@ error:
}
}
static void buildClassDocList(Entry *root)
{
if (
(root->section & Entry::COMPOUNDDOC_MASK) && !root->name.isEmpty()
)
{
addClassToContext(root);
}
EntryListIterator eli(*root->sublist);
Entry *e;
for (;(e=eli.current());++eli)
{
buildClassDocList(e);
}
}
//----------------------------------------------------------------------
// build a list of all namespaces mentioned in the documentation
// and all namespaces that have a documentation block before their definition.
static void buildNamespaceList(Entry *root)
{
if (
(root->section==Entry::NAMESPACE_SEC) ||
(root->section==Entry::NAMESPACEDOC_SEC) &&
(root->section==Entry::NAMESPACE_SEC ||
root->section==Entry::NAMESPACEDOC_SEC ||
root->section==Entry::PACKAGEDOC_SEC
) &&
!root->name.isEmpty()
)
{
QCString fullName=stripAnonymousNamespaceScope(root->name.copy());
QCString fullName = root->name;
if (root->section==Entry::PACKAGEDOC_SEC)
{
fullName=substitute(fullName,".","::");
}
fullName = stripAnonymousNamespaceScope(fullName);
if (!fullName.isEmpty())
{
//printf("Found namespace %s in %s at line %d\n",root->name.data(),
......@@ -5564,50 +5587,50 @@ static void findMainPage(Entry *root)
//----------------------------------------------------------------------------
/*! Search for all Java package statements
*/
static void buildPackageList(Entry *root)
{
if (root->section == Entry::PACKAGE_SEC || root->section == Entry::PACKAGEDOC_SEC && !root->name.isEmpty())
{
PackageDef *pd=0;
if ((pd=Doxygen::packageDict.find(root->name))==0)
{
QCString tagName;
if (root->tagInfo)
{
tagName=root->tagInfo->tagName;
}
pd = new PackageDef(root->fileName,root->startLine,root->name,tagName);
Doxygen::packageDict.inSort(root->name,pd);
pd->setDocumentation(root->doc,root->docFile,root->docLine);
pd->setBriefDescription(root->brief,root->briefFile,root->briefLine);
}
else
{
if (!pd->documentation() && !root->doc.isEmpty())
{
pd->setDocumentation(root->doc,root->docFile,root->docLine);
}
if (!pd->briefDescription() && !root->brief.isEmpty())
{
pd->setBriefDescription(root->brief,root->briefFile,root->briefLine);
}
}
bool ambig;
FileDef *fd=findFileDef(Doxygen::inputNameDict,root->fileName,ambig);
if (fd)
{
fd->setPackageDef(pd);
}
}
EntryListIterator eli(*root->sublist);
Entry *e;
for (;(e=eli.current());++eli)
{
buildPackageList(e);
}
}
///*! Search for all Java package statements
// */
//static void buildPackageList(Entry *root)
//{
// if (root->section == Entry::PACKAGE_SEC || root->section == Entry::PACKAGEDOC_SEC && !root->name.isEmpty())
// {
// PackageDef *pd=0;
// if ((pd=Doxygen::packageDict.find(root->name))==0)
// {
// QCString tagName;
// if (root->tagInfo)
// {
// tagName=root->tagInfo->tagName;
// }
// pd = new PackageDef(root->fileName,root->startLine,root->name,tagName);
// Doxygen::packageDict.inSort(root->name,pd);
// pd->setDocumentation(root->doc,root->docFile,root->docLine);
// pd->setBriefDescription(root->brief,root->briefFile,root->briefLine);
// }
// else
// {
// if (!pd->documentation() && !root->doc.isEmpty())
// {
// pd->setDocumentation(root->doc,root->docFile,root->docLine);
// }
// if (!pd->briefDescription() && !root->brief.isEmpty())
// {
// pd->setBriefDescription(root->brief,root->briefFile,root->briefLine);
// }
// }
// bool ambig;
// FileDef *fd=findFileDef(Doxygen::inputNameDict,root->fileName,ambig);
// if (fd)
// {
// fd->setPackageDef(pd);
// }
// }
// EntryListIterator eli(*root->sublist);
// Entry *e;
// for (;(e=eli.current());++eli)
// {
// buildPackageList(e);
// }
//}
//----------------------------------------------------------------------------
......@@ -5814,20 +5837,20 @@ static void generateGroupDocs()
//----------------------------------------------------------------------------
static void generatePackageDocs()
{
writePackageIndex(*outputList);
if (Doxygen::packageDict.count()>0)
{
PackageSDict::Iterator pdi(Doxygen::packageDict);
PackageDef *pd;
for (pdi.toFirst();(pd=pdi.current());++pdi)
{
pd->writeDocumentation(*outputList);
}
}
}
//static void generatePackageDocs()
//{
// writePackageIndex(*outputList);
//
// if (Doxygen::packageDict.count()>0)
// {
// PackageSDict::Iterator pdi(Doxygen::packageDict);
// PackageDef *pd;
// for (pdi.toFirst();(pd=pdi.current());++pdi)
// {
// pd->writeDocumentation(*outputList);
// }
// }
//}
//----------------------------------------------------------------------------
// generate module pages
......@@ -7220,6 +7243,7 @@ void parseInput()
msg("Building class list...\n");
buildClassList(root);
buildClassDocList(root);
findUsingDeclarations(root);
msg("Building example list...\n");
......@@ -7268,8 +7292,8 @@ void parseInput()
msg("Building page list...\n");
buildPageList(root);
msg("Building package list...\n");
buildPackageList(root);
//msg("Building package list...\n");
//buildPackageList(root);
msg("Search for main page...\n");
findMainPage(root);
......@@ -7426,8 +7450,8 @@ void generateOutput()
msg("Generating group index...\n");
writeGroupIndex(*outputList);
msg("Generating package index...\n");
generatePackageDocs();
//msg("Generating package index...\n");
//generatePackageDocs();
msg("Generating example index...\n");
writeExampleIndex(*outputList);
......
src/htmlgen.h
View file @ ff31b2f1
......@@ -124,6 +124,8 @@ class HtmlGenerator : public OutputGenerator
void endCodeFragment() { t << "</pre></div>"; }
void startPreFragment() { t << "<pre>"; }
void endPreFragment() { t << "</pre>"; }
void startVerbatimFragment() { t << "<div class=\"fragment\"><pre>"; }
void endVerbatimFragment() { t << "</pre></div>"; }
void writeLineNumber(const char *,const char *,const char *,int);
void startCodeLine() { col=0; }
void endCodeLine() { codify("\n"); }
......
src/index.cpp
View file @ ff31b2f1
......@@ -1230,48 +1230,48 @@ void writeAnnotatedClassList(OutputList &ol)
//----------------------------------------------------------------------------
// OBSOLETE
void writePackageList(OutputList &ol)
{
bool &generateHtml = Config_getBool("GENERATE_HTML") ;
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
ol.startIndexList();
PackageSDict::Iterator pdi(Doxygen::packageDict);
PackageDef *pd;
for (;(pd=pdi.current());++pdi)
{
if (!pd->isReference())
{
//ol.writeStartAnnoItem("package",pd->getOutputFileBase(),0,pd->name());
ol.startIndexKey();
ol.writeObjectLink(0,pd->getOutputFileBase(),0,pd->name());
ol.endIndexKey();
bool hasBrief = !pd->briefDescription().isEmpty();
ol.startIndexValue(hasBrief);
if (hasBrief)
{
//ol.docify(" (");
parseDoc(ol,
pd->getDefFileName(),pd->getDefLine(),
pd->name(),0,
abbreviate(pd->briefDescription(),pd->name()));
//ol.docify(")");
}
ol.endIndexValue(pd->getOutputFileBase(),hasBrief);
//ol.writeEndAnnoItem(pd->getOutputFileBase());
if (hasHtmlHelp)
{
HtmlHelp::getInstance()->addContentsItem(FALSE,pd->name(),pd->getOutputFileBase());
}
if (hasFtvHelp)
{
FTVHelp::getInstance()->addContentsItem(FALSE,pd->getReference(),pd->getOutputFileBase(),0,pd->name());
}
}
}
ol.endIndexList();
}
//void writePackageList(OutputList &ol)
//{
// bool &generateHtml = Config_getBool("GENERATE_HTML") ;
// bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
// bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
// ol.startIndexList();
// PackageSDict::Iterator pdi(Doxygen::packageDict);
// PackageDef *pd;
// for (;(pd=pdi.current());++pdi)
// {
// if (!pd->isReference())
// {
// //ol.writeStartAnnoItem("package",pd->getOutputFileBase(),0,pd->name());
// ol.startIndexKey();
// ol.writeObjectLink(0,pd->getOutputFileBase(),0,pd->name());
// ol.endIndexKey();
// bool hasBrief = !pd->briefDescription().isEmpty();
// ol.startIndexValue(hasBrief);
// if (hasBrief)
// {
// //ol.docify(" (");
// parseDoc(ol,
// pd->getDefFileName(),pd->getDefLine(),
// pd->name(),0,
// abbreviate(pd->briefDescription(),pd->name()));
// //ol.docify(")");
// }
// ol.endIndexValue(pd->getOutputFileBase(),hasBrief);
//
// //ol.writeEndAnnoItem(pd->getOutputFileBase());
// if (hasHtmlHelp)
// {
// HtmlHelp::getInstance()->addContentsItem(FALSE,pd->name(),pd->getOutputFileBase());
// }
// if (hasFtvHelp)
// {
// FTVHelp::getInstance()->addContentsItem(FALSE,pd->getReference(),pd->getOutputFileBase(),0,pd->name());
// }
// }
// }
// ol.endIndexList();
//}
//----------------------------------------------------------------------------
......@@ -1496,54 +1496,54 @@ void writeAnnotatedIndex(OutputList &ol)
//----------------------------------------------------------------------------
void writePackageIndex(OutputList &ol)
{
bool &generateHtml = Config_getBool("GENERATE_HTML") ;
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (documentedPackages==0) return;
ol.pushGeneratorState();
ol.disable(OutputGenerator::Man);
startFile(ol,"packages",0,"Package Index");
startTitle(ol,0);
QCString title = theTranslator->trPackageList();
QCString htmlHelpTitle = title;
QCString ftvHelpTitle = title;
if (!Config_getString("PROJECT_NAME").isEmpty()) title.prepend(Config_getString("PROJECT_NAME")+" ");
parseText(ol,title);
endTitle(ol,0,0);
ol.startTextBlock();
HtmlHelp *htmlHelp = 0;
FTVHelp *ftvHelp = 0;
if (hasHtmlHelp)
{
htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(TRUE,htmlHelpTitle,"packages");
htmlHelp->incContentsDepth();
}
if (hasFtvHelp)
{
ftvHelp = FTVHelp::getInstance();
ftvHelp->addContentsItem(TRUE,0,"packages",0,ftvHelpTitle);
ftvHelp->incContentsDepth();
}
parseText(ol,theTranslator->trPackageListDescription());
ol.endTextBlock();
writePackageList(ol);
if (hasHtmlHelp)
{
htmlHelp->decContentsDepth();
}
if (hasFtvHelp)
{
ftvHelp->decContentsDepth();
}
endFile(ol);
ol.popGeneratorState();
}
//void writePackageIndex(OutputList &ol)
//{
// bool &generateHtml = Config_getBool("GENERATE_HTML") ;
// bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
// bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
//
// if (documentedPackages==0) return;
//
// ol.pushGeneratorState();
// ol.disable(OutputGenerator::Man);
// startFile(ol,"packages",0,"Package Index");
// startTitle(ol,0);
// QCString title = theTranslator->trPackageList();
// QCString htmlHelpTitle = title;
// QCString ftvHelpTitle = title;
// if (!Config_getString("PROJECT_NAME").isEmpty()) title.prepend(Config_getString("PROJECT_NAME")+" ");
// parseText(ol,title);
// endTitle(ol,0,0);
// ol.startTextBlock();
// HtmlHelp *htmlHelp = 0;
// FTVHelp *ftvHelp = 0;
// if (hasHtmlHelp)
// {
// htmlHelp = HtmlHelp::getInstance();
// htmlHelp->addContentsItem(TRUE,htmlHelpTitle,"packages");
// htmlHelp->incContentsDepth();
// }
// if (hasFtvHelp)
// {
// ftvHelp = FTVHelp::getInstance();
// ftvHelp->addContentsItem(TRUE,0,"packages",0,ftvHelpTitle);
// ftvHelp->incContentsDepth();
// }
// parseText(ol,theTranslator->trPackageListDescription());
// ol.endTextBlock();
// writePackageList(ol);
// if (hasHtmlHelp)
// {
// htmlHelp->decContentsDepth();
// }
// if (hasFtvHelp)
// {
// ftvHelp->decContentsDepth();
// }
//
// endFile(ol);
// ol.popGeneratorState();
//}
//----------------------------------------------------------------------------
......
src/latexgen.h
View file @ ff31b2f1
......@@ -122,6 +122,8 @@ class LatexGenerator : public OutputGenerator
void endPreFragment() { t << "\\end{alltt}\\normalsize " << endl;
insidePre=FALSE;
}
void startVerbatimFragment() { t << endl << endl << "\\footnotesize\\begin{verbatim}"; }
void endVerbatimFragment() { t << "\\end{verbatim}\\normalsize " << endl; }
void writeLineNumber(const char *,const char *,const char *,int l) { t << l << " "; }
void startCodeLine() { col=0; }
void endCodeLine() { codify("\n"); }
......
src/mangen.h
View file @ ff31b2f1
......@@ -114,6 +114,8 @@ class ManGenerator : public OutputGenerator
void endCodeFragment();
void startPreFragment() { startCodeFragment(); }
void endPreFragment() { endCodeFragment(); }
void startVerbatimFragment() { startCodeFragment(); }
void endVerbatimFragment() { endCodeFragment(); }
void writeLineNumber(const char *,const char *,const char *,int l) { t << l << " "; }
void startCodeLine() {}
void endCodeLine() { codify("\n"); col=0; }
......
src/outputgen.h
View file @ ff31b2f1
......@@ -163,11 +163,19 @@ class BaseOutputDocInterface
/*! Starts a fragment of preformatted text. This means that
* spacing, tabs and newlines should be kept in the output
*/
virtual void startPreFragment() = 0;
/*! Ens a preformatted text fragment. */
/*! Ends a preformatted text fragment. */
virtual void endPreFragment() = 0;
/*! Starts a fragment of verbatim test. This is preformatted text,
* without any special internal structure.
*/
virtual void startVerbatimFragment() = 0;
/*! Ends a verbatim text fragment. */
virtual void endVerbatimFragment() = 0;
/*! Writes a horizontal ruler to the output */
virtual void writeRuler() = 0;
......
src/outputlist.h
View file @ ff31b2f1
......@@ -210,6 +210,10 @@ class OutputList : public OutputDocInterface
{ forall(&OutputGenerator::startPreFragment); }
void endPreFragment()
{ forall(&OutputGenerator::endPreFragment); }
void startVerbatimFragment()
{ forall(&OutputGenerator::startVerbatimFragment); }
void endVerbatimFragment()
{ forall(&OutputGenerator::endVerbatimFragment); }
void startCodeLine()
{ forall(&OutputGenerator::startCodeLine); }
void endCodeLine()
......
src/pre.l
View file @ ff31b2f1
......@@ -1518,7 +1518,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
g_defVarArgs = FALSE;
if ( g_defName!=g_lastGuardName )
{ // define may appear in the output
QCString tmp=(QCString)"#define "+g_defName+g_defArgsStr;
QCString tmp=(QCString)"#define "+g_defName;
outputArray(tmp.data(),tmp.length());
g_quoteArg=FALSE;
BEGIN(DefineText);
......@@ -1527,10 +1527,10 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
{
//printf("Found a guard %s\n",yytext);
Define *def=0;
//if (g_includeStack.isEmpty())
//{
// addDefine();
//}
if (g_includeStack.isEmpty())
{
addDefine();
}
if ((def=g_fileDefineDict->find(g_defName))==0)
{
g_fileDefineDict->insert(g_defName,newDefine());
......@@ -1551,6 +1551,8 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
//printf("Error: define %s is defined more than once!\n",g_defName.data());
}
}
QCString tmp=(QCString)"#define "+g_defName;
outputArray(tmp.data(),tmp.length());
//outputChar('\n');
g_lastGuardName.resize(0);
BEGIN(Start);
......
src/rtfgen.cpp
View file @ ff31b2f1
......@@ -2076,6 +2076,14 @@ void RTFGenerator::writeSectionRefItem(const char *,const char *lab,
// writeSectionRef(name,lab,title);
//}
char* RTFGenerator::getMultiByte(int c)
{
static char s[10];
sprintf(s,"\\'%X",c);
return s;
}
void RTFGenerator::docify(const char *str)
{
if (str)
......@@ -2085,8 +2093,23 @@ void RTFGenerator::docify(const char *str)
unsigned char pc='\0';
while (*p)
{
static bool MultiByte = FALSE;
c=*p++;
switch(c)
if ( MultiByte )
{
t << getMultiByte( c );
MultiByte = FALSE;
continue;
}
if ( c >= 0x80 )
{
MultiByte = TRUE;
t << getMultiByte( c );
continue;
}
switch (c)
{
case '{': t << "\\{"; break;
case '}': t << "\\}"; break;
......@@ -2111,12 +2134,29 @@ void RTFGenerator::codify(const char *str)
//static char spaces[]=" ";
if (str)
{
const char *p=str;
char c;
const unsigned char *p=(const unsigned char *)str;
unsigned char c;
int spacesToNextTabStop;
while (*p)
{
static bool MultiByte = FALSE;
c=*p++;
if( MultiByte )
{
t << getMultiByte( c );
MultiByte = FALSE;
continue;
}
if( c >= 0x80 )
{
MultiByte = TRUE;
t << getMultiByte( c );
continue;
}
switch(c)
{
case '\t': spacesToNextTabStop = Config_getInt("TAB_SIZE") - (col%Config_getInt("TAB_SIZE"));
......@@ -2129,7 +2169,7 @@ void RTFGenerator::codify(const char *str)
case '{': t << "\\{"; col++; break;
case '}': t << "\\}"; col++; break;
case '\\': t << "\\\\"; col++; break;
default: t << c; col++; break;
default: t << (char)c; col++; break;
}
}
}
......
src/rtfgen.h
View file @ ff31b2f1
......@@ -114,6 +114,8 @@ class RTFGenerator : public OutputGenerator
void endCodeFragment();
void startPreFragment() { startCodeFragment(); }
void endPreFragment() { endCodeFragment(); }
void startVerbatimFragment() { startVerbatimFragment(); }
void endVerbatimFragment() { endVerbatimFragment(); }
void writeLineNumber(const char *,const char *,const char *,int l) { t << l << " "; }
void startCodeLine() { col=0; }
void endCodeLine() { lineBreak(); }
......@@ -275,6 +277,7 @@ class RTFGenerator : public OutputGenerator
void RtfwriteRuler_thick() { t << "{\\pard\\widctlpar\\brdrb\\brdrs\\brdrw75\\brsp20 \\adjustright \\par}" << endl; };
void RtfwriteRuler_thin() { t << "{\\pard\\widctlpar\\brdrb\\brdrs\\brdrw5\\brsp20 \\adjustright \\par}" << endl; };
void WriteRTFReference(const char *label);
char *getMultiByte(int c);
};
#endif
src/scanner.l
View file @ ff31b2f1
......@@ -868,6 +868,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
lineCount();
BEGIN( CompoundName );
}
<FindMembers>{B}*(("typedef"{BN}+)?)("volatile"{BN}+)?"class{" |
<FindMembers>{B}*(("typedef"{BN}+)?)("volatile"{BN}+)?"class"{BN}+ {
isTypedef=((QCString)yytext).find("typedef")!=-1;
current->section = Entry::CLASS_SEC;
......@@ -886,6 +887,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
// current->mtArgList = 0;
//}
lineCount() ;
if (yytext[yyleng-1]=='{') unput('{');
BEGIN( CompoundName ) ;
}
<FindMembers>{B}*(("typedef"{BN}+)?)("volatile"{BN}+)?"struct{" |
......@@ -907,6 +909,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
// current->mtArgList = 0;
//}
lineCount() ;
if (yytext[yyleng-1]=='{') unput('{');
BEGIN( CompoundName ) ;
}
<FindMembers>{B}*(("typedef"{BN}+)?)("volatile"{BN}+)?"union{" |
......@@ -919,6 +922,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
current->startLine = yyLineNr;
current->bodyLine = yyLineNr;
lineCount() ;
if (yytext[yyleng-1]=='{') unput('{');
BEGIN( CompoundName ) ;
}
<FindMembers>{B}*(("typedef"{BN}+)?)"enum{" |
......@@ -931,6 +935,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
current->startLine = yyLineNr;
current->bodyLine = yyLineNr;
lineCount() ;
if (yytext[yyleng-1]=='{') unput('{');
BEGIN( CompoundName ) ;
}
<Operator>"("{BN}*")"{BN}*/"(" {
......@@ -3622,6 +3627,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
insideFormula=FALSE;
BEGIN(lastFormulaContext);
}
<ReadFormulaLong>\n { formulaText+=*yytext; }
<ReadFormulaLong,ReadFormulaShort>. { formulaText+=*yytext; }
<ExampleDoc,PageDoc,ClassDocBrief,ClassDoc,ReadFormulaShort,ReadFormulaLong>{B}*"*/" {
checkDocs();
......
src/translator_jp.h
View file @ ff31b2f1
This diff is collapsed.
src/translator_si.h
View file @ ff31b2f1
......@@ -21,7 +21,7 @@
#define TRANSLATOR_SI_H
class TranslatorSlovene : public TranslatorAdapter_1_2_13
class TranslatorSlovene : public Translator
{
public:
QCString idLanguage()
......@@ -991,6 +991,26 @@ class TranslatorSlovene : public TranslatorAdapter_1_2_13
{
return "Reference";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.13
//////////////////////////////////////////////////////////////////////////
/*! used in member documentation blocks to produce a list of
* members that are implemented by this one.
*/
virtual QCString trImplementedFromList(int numEntries)
{
return "Implementira "+trWriteList(numEntries)+".";
}
/*! used in member documentation blocks to produce a list of
* all members that implement this abstract member.
*/
virtual QCString trImplementedInList(int numEntries)
{
return "Implementirano v "+trWriteList(numEntries)+".";
}
};
#endif
......
src/xmlgen.cpp
View file @ ff31b2f1
......@@ -343,12 +343,23 @@ class XMLGenerator : public OutputDocInterface
{
XML_DB(("(startPreFragment)\n"));
startParMode();
m_t << "<programlisting>";
m_t << "<preformatted>";
}
void endPreFragment()
{
XML_DB(("(endPreFragment)\n"));
m_t << "</programlisting>";
m_t << "</preformatted>";
}
void startVerbatimFragment()
{
XML_DB(("(startVerbatimFragment)\n"));
startParMode();
m_t << "<preformatted>";
}
void endVerbatimFragment()
{
XML_DB(("(endVerbatimFragment)\n"));
m_t << "</preformatted>";
}
void writeRuler()
{
......@@ -616,20 +627,21 @@ class XMLGenerator : public OutputDocInterface
startParMode();
m_t << "<table cols=\"" << cols << "\">\n";
}
void endTable(bool)
void endTable(bool hasCaption)
{
XML_DB(("endTable\n"));
m_t << "</row>\n</table>";
if (!hasCaption) m_t << "</row>\n";
m_t << "</table>";
}
void startCaption()
{
XML_DB(("startCaption"));
m_t << "<caption>";
m_t << "</row><caption>";
}
void endCaption()
{
XML_DB(("encCaption"));
m_t << "</caption";
m_t << "</caption>";
}
void nextTableRow()
{
......@@ -639,7 +651,7 @@ class XMLGenerator : public OutputDocInterface
// we need manually add a para here because cells are
// parsed before the table is generated, and thus
// are already parsed as if they are inside a paragraph.
m_t << "<para>";
//m_t << "<para>";
}
void endTableRow()
{
......
tmake/lib/osf1-cxx/tmake.conf
View file @ ff31b2f1
......@@ -8,7 +8,7 @@ TEMPLATE = app
CONFIG = qt warn_on release
TMAKE_CC = cxx
TMAKE_CFLAGS = -x cxx -w -D_POSIX_SOURCE -D_OSF_SOURCE -D_AES_SOURCE
TMAKE_CFLAGS = -x cc -w -D_POSIX_SOURCE -D_OSF_SOURCE -D_AES_SOURCE
TMAKE_CFLAGS_WARN_ON =
TMAKE_CFLAGS_WARN_OFF =
TMAKE_CFLAGS_RELEASE = -O2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment