summaryrefslogtreecommitdiff
path: root/src/vhdldocgen.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/vhdldocgen.cpp')
-rw-r--r--src/vhdldocgen.cpp51
1 files changed, 22 insertions, 29 deletions
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index 3f7cd1d..029d0bd 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2015 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
@@ -70,7 +70,6 @@ static QDict<QCString> g_vhdlKeyDict0(17,FALSE);
static QDict<QCString> g_vhdlKeyDict1(17,FALSE);
static QDict<QCString> g_vhdlKeyDict2(17,FALSE);
static QDict<QCString> g_vhdlKeyDict3(17,FALSE);
-static QDict<QCString> g_xilinxUcfDict(17,FALSE);
static void initUCF(Entry* root,const char* type,QCString & qcs,int line,QCString & fileName,QCString & brief);
static void writeUCFLink(const MemberDef* mdef,OutputList &ol);
@@ -170,7 +169,6 @@ static void createSVG()
QCString dir="-o \""+ov+"/vhdl_design_overview.html\"";
ov+="/vhdl_design.dot";
- QRegExp ep("[\\s]");
QCString vlargs="-Tsvg \""+ov+"\" "+dir ;
if (portable_system("dot",vlargs)!=0)
@@ -200,7 +198,6 @@ void VhdlDocGen::writeOverview()
QCString ov =Config_getString("HTML_OUTPUT");
QCString fileName=ov+"/vhdl_design.dot";
QFile f(fileName);
- QStringList qli;
FTextStream t(&f);
if (!f.open(IO_WriteOnly))
@@ -502,7 +499,6 @@ static QList<MemberDef>* getPorts(ClassDef *cd)
static void writeTable(QList<MemberDef>* port,FTextStream & t)
{
- QCString space(" ");
MemberDef *md;
uint len=port->count();
@@ -712,7 +708,6 @@ ClassDef *VhdlDocGen::getClass(const char *name)
ClassDef* VhdlDocGen::getPackageName(const QCString & name)
{
ClassDef* cd=0;
- QStringList ql=QStringList::split(".",name,FALSE);
cd=getClass(name);
return cd;
@@ -800,12 +795,9 @@ MemberDef* VhdlDocGen::findMember(const QCString& className, const QCString& mem
if (!packages.contains(ecd)) VhdlDocGen::findAllPackages(ecd);
}
- uint len=packages.count();
- for (uint j=0;j<len;j++)
- {
- for (QMap<ClassDef*,QList<ClassDef> >::Iterator cList=packages.begin();cList != packages.end();cList++)
- {
- if (cList.key()==0) continue;
+ QMap<ClassDef*,QList<ClassDef> >::Iterator cList=packages.find(ecd);
+ if (cList.key()!=0)
+ {
QList<ClassDef> mlist=cList.data();
for (uint j=0;j<mlist.count();j++)
{
@@ -814,8 +806,7 @@ MemberDef* VhdlDocGen::findMember(const QCString& className, const QCString& mem
mdef=VhdlDocGen::findMemberDef(mlist.at(j),memName,MemberListType_pubMethods);
if (mdef) return mdef;
}
- }
- }
+ }
return 0;
}//findMember
@@ -1127,7 +1118,6 @@ ClassDef* VhdlDocGen::findArchitecture(const ClassDef *cd)
void VhdlDocGen::writeVhdlLink(const ClassDef* ccd ,OutputList& ol,QCString& type,QCString& nn,QCString& behav)
{
if (ccd==0) return;
- QCString temp=ccd->getOutputFileBase();
ol.startBold();
ol.docify(type.data());
ol.endBold();
@@ -1185,7 +1175,6 @@ void VhdlDocGen::parseFuncProto(const char* text,QList<Argument>& qlist,
if ((end-index)>0)
{
- QCString tt=s1.mid(index,(end-index+1));
temp=s1.mid(index+1,(end-index-1));
//getFuncParams(qlist,temp);
}
@@ -1820,8 +1809,6 @@ static void setGlobalType(MemberList *ml)
MemberListIterator mmli(*ml);
for ( ; (mdd=mmli.current()); ++mmli )
{
- QCString l=mdd->typeString();
-
if (qstrcmp(mdd->argsString(),"package")==0)
{
mdd->setMemberSpecifiers(VhdlDocGen::INSTANTIATION);
@@ -1982,11 +1969,8 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol,
ClassDef *cd,NamespaceDef *nd,FileDef *fd,GroupDef *gd,
bool /*inGroup*/)
{
- static QRegExp reg("[%]");
-
Definition *d=0;
-
ASSERT(cd!=0 || nd!=0 || fd!=0 || gd!=0 ||
mdef->getMemberSpecifiers()==VhdlDocGen::LIBRARY ||
mdef->getMemberSpecifiers()==VhdlDocGen::USE
@@ -2228,6 +2212,19 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol,
ol.insertMemberAlign();
VhdlDocGen::formatString(ltype,ol,mdef);
break;
+ case VhdlDocGen::RECORD:
+ case VhdlDocGen::UNITS:
+ writeLink(mdef,ol);
+ ol.docify(" ");
+ ol.startBold();
+ if (ltype.isEmpty()) {
+ ol.docify(" ");
+ }
+ ol.insertMemberAlign();
+ if (!ltype.isEmpty())
+ VhdlDocGen::formatString(ltype,ol,mdef);
+ ol.endBold();
+ break;
case VhdlDocGen::TYPE:
bRec=largs.stripPrefix("record") ;
bUnit=largs.stripPrefix("units") ;
@@ -2661,7 +2658,6 @@ void VhdlDocGen::parseUCF(const char* input, Entry* entity,QCString fileName,b
{
QCString ucFile(input);
int lineNo=0;
- QCString newLine="\n";
QCString comment("#!");
QCString brief;
@@ -2717,7 +2713,6 @@ void VhdlDocGen::parseUCF(const char* input, Entry* entity,QCString fileName,b
static void initUCF(Entry* root,const char* type,QCString & qcs,int line,QCString & fileName,QCString & brief)
{
if (qcs.isEmpty())return;
- QRegExp sp("\\s");
QRegExp reg("[\\s=]");
QCString n;
// bool bo=(qstricmp(type,qcs.data())==0);
@@ -2810,7 +2805,8 @@ bool VhdlDocGen::findConstraintFile(LayoutNavEntry *lne)
QCString file;
QCString co("Constraints");
- if (Config_getBool("HAVE_DOT") && Config_getEnum("DOT_IMAGE_FORMAT")=="svg")
+ QCString imgExt = getDotImageExtension();
+ if (Config_getBool("HAVE_DOT") && imgExt=="svg")
{
QCString ov = theTranslator->trDesignOverview();
QCString ofile("vhdl_design_overview");
@@ -2840,7 +2836,6 @@ QCString VhdlDocGen::parseForConfig(QCString & entity,QCString & arch)
{
int index;
QCString label;
- QCString ent("entity");
if (!entity.contains(":")) return "";
QRegExp exp("[:()\\s]");
@@ -2930,7 +2925,7 @@ void assignBinding(VhdlConfNode * conf)
QListIterator<Entry> eli(instList);
Entry *cur=0;
ClassDef *archClass=0,*entClass=0;
- QCString archName,entityName;
+ QCString archName;
QCString arcBind,entBind;
bool others,all;
@@ -2995,7 +2990,7 @@ void assignBinding(VhdlConfNode * conf)
{
if (cur->exception.lower()==label || conf->isInlineConf)
{
- QCString sign,archy;
+ QCString archy;
if (all || others)
{
@@ -3997,7 +3992,6 @@ void FlowChart::writeShape(FTextStream &t,const FlowChart* fl)
}
t<<getNodeName(fl->id).data();
- QCString q=getNodeType(fl->type);
#ifdef DEBUGFLOW
QCString qq(getNodeName(fl->id).data());
@@ -4053,7 +4047,6 @@ void FlowChart::writeShape(FTextStream &t,const FlowChart* fl)
{
if (fl->text.isEmpty()) return;
bool var=(fl->type & FlowChart::VARIABLE_NO);
- QCString repl("<BR ALIGN=\"LEFT\"/>");
QCString q=fl->text;
if (exit)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 09:15:43 +0000