diff options
| -rw-r--r-- | qtools/qgvector.cpp | 2 | ||||
| -rw-r--r-- | src/index.cpp | 7 | ||||
| -rw-r--r-- | src/markdown.cpp | 2 | ||||
| -rw-r--r-- | src/scanner.l | 25 | ||||
| -rw-r--r-- | src/template.h | 4 | ||||
| -rw-r--r-- | src/translator_cn.h | 2 | ||||
| -rw-r--r-- | src/util.cpp | 2 |
7 files changed, 36 insertions, 8 deletions
diff --git a/qtools/qgvector.cpp b/qtools/qgvector.cpp index 88409ce..63cce64 100644 --- a/qtools/qgvector.cpp +++ b/qtools/qgvector.cpp @@ -68,7 +68,7 @@ the QVector collection class. QGVector has some virtual functions that may be reimplemented in - subclasses to to customize behavior. + subclasses to customize behavior. <ul> <li> compareItems() compares two collection/vector items. 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/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/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..3af1a90 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -4191,7 +4191,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()) |