summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Negreanu <groleo@gmail.com>2015-03-19 08:08:18 (GMT)
committerAdrian Negreanu <groleo@gmail.com>2015-03-19 08:08:18 (GMT)
commit85249aa2546d66354fbfab56459a22b97223e813 (patch)
tree532923411fda456b6954e8f862b62cb0fb84fe83
parentb63191ef6ffbe38826e0804d851c37f471a91ffe (diff)
parent1c8bbb64e7e6f72789dd0df5c22c5840f858be75 (diff)
downloadDoxygen-85249aa2546d66354fbfab56459a22b97223e813.zip
Doxygen-85249aa2546d66354fbfab56459a22b97223e813.tar.gz
Doxygen-85249aa2546d66354fbfab56459a22b97223e813.tar.bz2
Merge https://github.com/doxygen/doxygen
-rw-r--r--qtools/qfeatures.h2
-rw-r--r--src/arguments.h2
-rw-r--r--src/classdef.cpp3
-rw-r--r--src/doxygen.md4
-rw-r--r--src/htmlentity.cpp2
-rw-r--r--src/printdocvisitor.h2
-rw-r--r--src/translator_ar.h2
-rw-r--r--src/translator_en.h2
-rw-r--r--src/translator_fa.h2
-rw-r--r--src/translator_lt.h2
-rw-r--r--src/translator_lv.h2
-rw-r--r--src/translator_si.h2
-rw-r--r--src/xmlgen.cpp6
-rw-r--r--templates/xml/compound.xsd1
-rw-r--r--vhdlparser/TokenManager.h2
15 files changed, 24 insertions, 12 deletions
diff --git a/qtools/qfeatures.h b/qtools/qfeatures.h
index d6c2882..1042ce6 100644
--- a/qtools/qfeatures.h
+++ b/qtools/qfeatures.h
@@ -378,7 +378,7 @@
*/
//#define QT_NO_QWS_DEPTH_1
/*!
- 4-bit greyscale
+ 4-bit grayscale
*/
//#define QT_NO_QWS_DEPTH_4
/*!
diff --git a/src/arguments.h b/src/arguments.h
index 778fc32..8b3d211 100644
--- a/src/arguments.h
+++ b/src/arguments.h
@@ -70,7 +70,7 @@ struct Argument
QCString array; /*!< Argument's array specifier (may be empty) */
QCString defval; /*!< Argument's default value (may be empty) */
QCString docs; /*!< Argument's documentation (may be empty) */
- QCString typeConstraint; /*!< Used for Java generics: <T extends C> */
+ QCString typeConstraint; /*!< Used for Java generics: \<T extends C\> */
};
/*! \brief This class represents an function or template argument list.
diff --git a/src/classdef.cpp b/src/classdef.cpp
index ea6eece..d48efd0 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -2532,9 +2532,10 @@ bool ClassDef::hasExamples() const
void ClassDef::addTypeConstraint(const QCString &typeConstraint,const QCString &type)
{
+ //printf("addTypeContraint(%s,%s)\n",type.data(),typeConstraint.data());
static bool hideUndocRelation = Config_getBool("HIDE_UNDOC_RELATIONS");
if (typeConstraint.isEmpty() || type.isEmpty()) return;
- ClassDef *cd = getClass(typeConstraint);
+ ClassDef *cd = getResolvedClass(this,getFileDef(),typeConstraint);
if (cd==0 && !hideUndocRelation)
{
cd = new ClassDef(getDefFileName(),getDefLine(),getDefColumn(),typeConstraint,ClassDef::Class);
diff --git a/src/doxygen.md b/src/doxygen.md
index 9a9d726..ccb47b9 100644
--- a/src/doxygen.md
+++ b/src/doxygen.md
@@ -168,6 +168,10 @@ easy ways to get debug information.
command is specified)
- validate<br>
Currently not used
+ - lex<br>
+ Provide output of the `lex` files used. When a lexer is started and when a lexer
+ ends the name of the `lex` file is given so it is possible to see in which lexer the
+ problem occurs. This makes it easier to select the file to be compiled in `lex` debug mode.
Producing output
----------------
diff --git a/src/htmlentity.cpp b/src/htmlentity.cpp
index 7b61ead..c4c601f 100644
--- a/src/htmlentity.cpp
+++ b/src/htmlentity.cpp
@@ -59,7 +59,7 @@ static struct htmlEntityInfo
{ SYM(shy), "\xc2\xad", "&shy;", "<shy/>", "&#173;", "{$\\-$}", NULL, "\\-", { NULL, DocSymbol::Perl_unknown }},
{ SYM(reg), "\xc2\xae", "&reg;", "<registered/>", "&#174;", "\\textregistered{}", "(R)", "\\'AE", { "registered", DocSymbol::Perl_symbol }},
{ SYM(macr), "\xc2\xaf", "&macr;", "<macr/>", "&#175;", "\\={}", NULL, "\\'AF", { NULL, DocSymbol::Perl_unknown }},
- { SYM(deg), "\xc2\xb0", "&deg;", "<deg/>", "&#176;", "\\textdegree", NULL, "\\'B0", { "deg", DocSymbol::Perl_symbol }},
+ { SYM(deg), "\xc2\xb0", "&deg;", "<deg/>", "&#176;", "\\textdegree{}", NULL, "\\'B0", { "deg", DocSymbol::Perl_symbol }},
{ SYM(plusmn), "\xc2\xb1", "&plusmn;", "<plusmn/>", "&#177;", "{$\\pm$}", NULL, "\\'B1", { "+/-", DocSymbol::Perl_string }},
{ SYM(sup2), "\xc2\xb2", "&sup2;", "<sup2/>", "&#178;", "\\texttwosuperior{}", NULL, "\\'B2", { NULL, DocSymbol::Perl_unknown }},
{ SYM(sup3), "\xc2\xb3", "&sup3;", "<sup3/>", "&#179;", "\\textthreesuperior{}", NULL, "\\'B3", { NULL, DocSymbol::Perl_unknown }},
diff --git a/src/printdocvisitor.h b/src/printdocvisitor.h
index 874497f..95e7e47 100644
--- a/src/printdocvisitor.h
+++ b/src/printdocvisitor.h
@@ -189,7 +189,7 @@ class PrintDocVisitor : public DocVisitor
void visit(DocFormula *f)
{
indent_leaf();
- printf("<formula name=%s test=%s/>",f->name().data(),f->text().data());
+ printf("<formula name=%s text=%s/>",f->name().data(),f->text().data());
}
void visit(DocIndexEntry *i)
{
diff --git a/src/translator_ar.h b/src/translator_ar.h
index f23d6df..5daaa4c 100644
--- a/src/translator_ar.h
+++ b/src/translator_ar.h
@@ -1051,7 +1051,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6
"<li>%A filled black box represents the struct or class for which the "
"graph is generated.\n"
"<li>%A box with a black border denotes a documented struct or class.\n"
- "<li>%A box with a grey border denotes an undocumented struct or class.\n"
+ "<li>%A box with a gray border denotes an undocumented struct or class.\n"
"<li>%A box with a red border denotes a documented struct or class for"
"which not all inheritance/containment relations are shown. %A graph is "
"truncated if it does not fit within the specified boundaries.\n"
diff --git a/src/translator_en.h b/src/translator_en.h
index 93998d2..ba89726 100644
--- a/src/translator_en.h
+++ b/src/translator_en.h
@@ -1022,7 +1022,7 @@ class TranslatorEnglish : public Translator
"<li>%A filled gray box represents the struct or class for which the "
"graph is generated.</li>\n"
"<li>%A box with a black border denotes a documented struct or class.</li>\n"
- "<li>%A box with a grey border denotes an undocumented struct or class.</li>\n"
+ "<li>%A box with a gray border denotes an undocumented struct or class.</li>\n"
"<li>%A box with a red border denotes a documented struct or class for"
"which not all inheritance/containment relations are shown. %A graph is "
"truncated if it does not fit within the specified boundaries.</li>\n"
diff --git a/src/translator_fa.h b/src/translator_fa.h
index e18e118..7effafe 100644
--- a/src/translator_fa.h
+++ b/src/translator_fa.h
@@ -1022,7 +1022,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5
"<li>%A filled black box represents the struct or class for which the "
"graph is generated.\n"
"<li>%A box with a black border denotes a documented struct or class.\n"
- "<li>%A box with a grey border denotes an undocumented struct or class.\n"
+ "<li>%A box with a gray border denotes an undocumented struct or class.\n"
"<li>%A box with a red border denotes a documented struct or class for"
"which not all inheritance/containment relations are shown. %A graph is "
"truncated if it does not fit within the specified boundaries.\n"
diff --git a/src/translator_lt.h b/src/translator_lt.h
index f6e07bf..faf4197 100644
--- a/src/translator_lt.h
+++ b/src/translator_lt.h
@@ -1013,7 +1013,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6
"<li>%A filled black box represents the struct or class for which the "
"graph is generated.\n"
"<li>%A box with a black border denotes a documented struct or class.\n"
- "<li>%A box with a grey border denotes an undocumented struct or class.\n"
+ "<li>%A box with a gray border denotes an undocumented struct or class.\n"
"<li>%A box with a red border denotes a documented struct or class for"
"which not all inheritance/containment relations are shown. %A graph is "
"truncated if it does not fit within the specified boundaries.\n"
diff --git a/src/translator_lv.h b/src/translator_lv.h
index 1161d48..20b2a38 100644
--- a/src/translator_lv.h
+++ b/src/translator_lv.h
@@ -1028,7 +1028,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4
"<li>%A filled gray box represents the struct or class for which the "
"graph is generated.</li>\n"
"<li>%A box with a black border denotes a documented struct or class.</li>\n"
- "<li>%A box with a grey border denotes an undocumented struct or class.</li>\n"
+ "<li>%A box with a gray border denotes an undocumented struct or class.</li>\n"
"<li>%A box with a red border denotes a documented struct or class for"
"which not all inheritance/containment relations are shown. %A graph is "
"truncated if it does not fit within the specified boundaries.</li>\n"
diff --git a/src/translator_si.h b/src/translator_si.h
index 10193a6..97a1931 100644
--- a/src/translator_si.h
+++ b/src/translator_si.h
@@ -691,7 +691,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6
"<li>%A filled black box represents the struct or class for which the "
"graph is generated.\n"
"<li>%A box with a black border denotes a documented struct or class.\n"
- "<li>%A box with a grey border denotes an undocumented struct or class.\n"
+ "<li>%A box with a gray border denotes an undocumented struct or class.\n"
"<li>%A box with a red border denotes a documented struct or class for\n"
"which not all inheritance/containment relations are shown. %A graph is "
"truncated if it does not fit within the specified boundaries."
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index c2eddd5..215b88a 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -394,6 +394,12 @@ static void writeTemplateArgumentList(ArgumentList *al,
linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a->defval);
t << "</defval>" << endl;
}
+ if (!a->typeConstraint.isEmpty())
+ {
+ t << indentStr << " <typeconstraint>";
+ linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a->typeConstraint);
+ t << "</typeconstraint>" << endl;
+ }
t << indentStr << " </param>" << endl;
}
t << indentStr << "</templateparamlist>" << endl;
diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd
index ff516e3..c960c7b 100644
--- a/templates/xml/compound.xsd
+++ b/templates/xml/compound.xsd
@@ -220,6 +220,7 @@
<xsd:element name="defname" minOccurs="0" />
<xsd:element name="array" minOccurs="0" />
<xsd:element name="defval" type="linkedTextType" minOccurs="0" />
+ <xsd:element name="typeconstraint" type="linkedTextType" minOccurs="0" />
<xsd:element name="briefdescription" type="descriptionType" minOccurs="0" />
</xsd:sequence>
</xsd:complexType>
diff --git a/vhdlparser/TokenManager.h b/vhdlparser/TokenManager.h
index 775e43d..68fbe2f 100644
--- a/vhdlparser/TokenManager.h
+++ b/vhdlparser/TokenManager.h
@@ -16,7 +16,7 @@ namespace parser {
class TokenManager {
public:
/** This gets the next token from the input stream.
- * A token of kind 0 (<EOF>) should be returned on EOF.
+ * A token of kind 0 (\<EOF\>) should be returned on EOF.
*/
virtual ~TokenManager() { }
virtual Token *getNextToken() = 0;