summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/code.l2
-rw-r--r--src/config.xml2
-rw-r--r--src/ftvhelp.cpp4
-rw-r--r--src/htmldocvisitor.cpp9
-rw-r--r--src/index.cpp7
-rwxr-xr-xsrc/languages.py2
-rw-r--r--src/markdown.cpp2
-rw-r--r--src/scanner.l25
-rw-r--r--src/searchindex.cpp1
-rw-r--r--src/template.h4
-rw-r--r--src/translator_cn.h2
-rw-r--r--src/util.cpp8
12 files changed, 54 insertions, 14 deletions
diff --git a/src/code.l b/src/code.l
index fc511a0..d7d5d74 100644
--- a/src/code.l
+++ b/src/code.l
@@ -904,7 +904,7 @@ static bool getLinkInScope(const QCString &c, // scope
return TRUE;
}
}
- else // found member, but is is not linkable, so make sure content inside is not assign
+ else // found member, but it is not linkable, so make sure content inside is not assigned
// to the previous member, see bug762760
{
DBG_CTX((stderr,"unlinkable member %s\n",md->name().data()));
diff --git a/src/config.xml b/src/config.xml
index ca33470..38dfefb 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -1559,7 +1559,7 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn"
<docs>
<![CDATA[
If the \c REFERENCED_BY_RELATION tag is set to \c YES
- then for each documented function all documented
+ then for each documented entity all documented
functions referencing it will be listed.
]]>
</docs>
diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp
index b04da62..14c94a3 100644
--- a/src/ftvhelp.cpp
+++ b/src/ftvhelp.cpp
@@ -302,6 +302,10 @@ void FTVHelp::generateLink(FTextStream &t,FTVNode *n)
else
t << "\" target=\"_self\">";
}
+ else
+ {
+ t << ">";
+ }
t << convertToHtml(n->name);
t << "</a>";
if (!n->ref.isEmpty())
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index 7404a4d..8b6d26c 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -1144,8 +1144,10 @@ void HtmlDocVisitor::visitPre(DocSimpleSect *s)
{
if (m_hide) return;
forceEndParagraph(s);
- m_t << "<dl" << getDirHtmlClassOfNode(getTextDirByConfig(s), "section " + s->typeString())
- << "><dt>";
+ if (s->type() != DocSimpleSect::Return)
+ m_t << "<dl" << getDirHtmlClassOfNode(getTextDirByConfig(s), "section " + s->typeString()) << "><dt>";
+ else
+ m_t << "<dl class=\"section " << s->typeString() << "\"><dt>";
switch(s->type())
{
case DocSimpleSect::See:
@@ -1831,7 +1833,8 @@ void HtmlDocVisitor::visitPre(DocXRefItem *x)
bool anonymousEnum = x->file()=="@";
if (!anonymousEnum)
{
- m_t << "<dl class=\"" << x->key() << "\"><dt><b><a class=\"el\" href=\""
+ m_t << "<dl" << getDirHtmlClassOfNode(getTextDirByConfig(x), x->key())
+ << "><dt><b><a class=\"el\" href=\""
<< x->relPath() << x->file() << Doxygen::htmlFileExtension
<< "#" << x->anchor() << "\">";
}
diff --git a/src/index.cpp b/src/index.cpp
index bfa4954..24c0290 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -1638,10 +1638,15 @@ static void writeAnnotatedClassList(OutputList &ol)
ol.endIndexList();
}
+inline bool isId1(int c)
+{
+ return (c<127 && c>31); // printable ASCII character
+}
+
static QCString letterToLabel(uint startLetter)
{
char s[11]; // max 0x12345678 + '\0'
- if (isId(startLetter)) // printable ASCII character
+ if (isId1(startLetter)) // printable ASCII character
{
s[0]=(char)startLetter;
s[1]=0;
diff --git a/src/languages.py b/src/languages.py
index 2b02b3e..5bb65cf 100755
--- a/src/languages.py
+++ b/src/languages.py
@@ -1,5 +1,5 @@
#
-# This file is an aid to generated the Languages rules file.
+# This file is an aid to generate the Languages rules file.
# usage:
# python languages.py > ..\winbuild\Languages.rules
#
diff --git a/src/markdown.cpp b/src/markdown.cpp
index 1cd06e5..d3ec3f1 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -2061,7 +2061,7 @@ static int writeCodeBlock(GrowBuf &out,const char *data,int size,int refIndent)
}
// start searching for the end of the line start at offset \a i
-// keeping track of possible blocks that need to to skipped.
+// keeping track of possible blocks that need to be skipped.
static void findEndOfLine(GrowBuf &out,const char *data,int size,
int &pi,int&i,int &end)
{
diff --git a/src/scanner.l b/src/scanner.l
index fd1568b..08a5e52 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -755,6 +755,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
%x CopyHereDocEnd
%x RawString
%x RawGString
+%x CSString
%x IDLAttribute
%x IDLProp
@@ -6235,8 +6236,14 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
<CSAccessorDecl>"add" { if (curlyCount==0) current->spec |= Entry::Addable; }
<CSAccessorDecl>"remove" { if (curlyCount==0) current->spec |= Entry::Removable; }
<CSAccessorDecl>"raise" { if (curlyCount==0) current->spec |= Entry::Raisable; }
-<CSAccessorDecl>. {}
+<CSAccessorDecl>"\"" { BEGIN(CSString);}
+<CSAccessorDecl>"." {}
<CSAccessorDecl>\n { lineCount(); }
+<CSString>"\"" { BEGIN(CSAccessorDecl);}
+<CSString>"//" {} /* Otherwise the rule <*>"//" will kick in */
+<CSString>"/*" {} /* Otherwise the rule <*>"/*" will kick in */
+<CSString>\n { lineCount(); }
+<CSString>"." {}
@@ -6611,6 +6618,22 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
BEGIN(SkipString);
}
}
+<*>\? {
+ if (insideCS)
+ {
+ if (current->type.isEmpty())
+ {
+ if (current->name.isEmpty())
+ current->name="?";
+ else
+ current->name+="?";
+ }
+ else
+ {
+ current->type+="?";
+ }
+ }
+ }
<*>.
<SkipComment>"//"|"/*"
<*>"/*" { lastCContext = YY_START ;
diff --git a/src/searchindex.cpp b/src/searchindex.cpp
index 6fb2432..6276eae 100644
--- a/src/searchindex.cpp
+++ b/src/searchindex.cpp
@@ -1180,6 +1180,7 @@ void writeJavascriptSearchIndex()
SearchIndexList *sl;
for (it.toFirst();(sl=it.current());++it) // for each letter
{
+ if ( sl->letter() == '"' ) t << QString( QChar( '\\' ) ).utf8();
t << QString( QChar( sl->letter() ) ).utf8();
}
t << "\"";
diff --git a/src/template.h b/src/template.h
index 98ae7ed..4602c53 100644
--- a/src/template.h
+++ b/src/template.h
@@ -368,7 +368,7 @@ class TemplateListIntf
/** Increase object's reference count */
virtual int addRef() = 0;
- /** Decreases object's referenc count, destroy object if 0 */
+ /** Decreases object's reference count, destroy object if 0 */
virtual int release() = 0;
};
@@ -417,7 +417,7 @@ class TemplateStructIntf
/** Increase object's reference count */
virtual int addRef() = 0;
- /** Decreases object's referenc count, destroy object if 0 */
+ /** Decreases object's reference count, destroy object if 0 */
virtual int release() = 0;
};
diff --git a/src/translator_cn.h b/src/translator_cn.h
index d37da94..fc0cf3c 100644
--- a/src/translator_cn.h
+++ b/src/translator_cn.h
@@ -100,7 +100,7 @@ class TranslatorChinese : public Translator
virtual QCString trMore()
{ return "更多..."; }
- /*! put in the class documention */
+ /*! put in the class documentation */
virtual QCString trListOfAllMembers()
{ return "所有成员列表"; }
diff --git a/src/util.cpp b/src/util.cpp
index 8e936b5..9100706 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1856,7 +1856,11 @@ QCString removeRedundantWhiteSpace(const QCString &s)
case '&':
if (i>0 && isId(pc))
{
- *dst++=' ';
+ if (nc != '=')
+ // avoid splitting operator&=
+ {
+ *dst++=' ';
+ }
}
*dst++=c;
break;
@@ -4191,7 +4195,7 @@ bool getDefs(const QCString &scName,
//}
}
}
- //printf(" >Succes=%d\n",mdist<maxInheritanceDepth);
+ //printf(" >Success=%d\n",mdist<maxInheritanceDepth);
if (mdist<maxInheritanceDepth)
{
if (!md->isLinkable() || md->isStrongEnumValue())
generated by cgit v0.12 at 2024-07-03 10:15:55 (GMT)