diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2015-04-04 20:48:14 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-04-04 20:48:14 (GMT) |
commit | d7ce7981985c493241bf6b138b3bba69ce80d222 (patch) | |
tree | e24e7a324ee94d401a9e36847e3e1b1fc676e68a | |
parent | f5e70723391bacc2d68c19d367ab414e70f786b4 (diff) | |
parent | 9d631b571bcf1826d00287bb82d8aac2da0a55c8 (diff) | |
download | Doxygen-d7ce7981985c493241bf6b138b3bba69ce80d222.zip Doxygen-d7ce7981985c493241bf6b138b3bba69ce80d222.tar.gz Doxygen-d7ce7981985c493241bf6b138b3bba69ce80d222.tar.bz2 |
Merge branch 'master' of github.com:doxygen/doxygen
-rw-r--r-- | doc/commands.doc | 2 | ||||
-rw-r--r-- | jquery/jquery.ui-1.8.18.core.js | 2 | ||||
-rw-r--r-- | qtools/qfeatures.h | 2 | ||||
-rw-r--r-- | src/arguments.h | 2 | ||||
-rw-r--r-- | src/commentcnv.l | 1 | ||||
-rw-r--r-- | src/docparser.cpp | 4 | ||||
-rw-r--r-- | src/doxygen.cpp | 7 | ||||
-rw-r--r-- | src/doxygen.md | 4 | ||||
-rw-r--r-- | src/htmlentity.cpp | 2 | ||||
-rw-r--r-- | src/index.cpp | 2 | ||||
-rw-r--r-- | src/memberdef.cpp | 6 | ||||
-rw-r--r-- | src/memberlist.cpp | 2 | ||||
-rw-r--r-- | src/sqlite3gen.cpp | 15 | ||||
-rw-r--r-- | src/translator_ar.h | 2 | ||||
-rw-r--r-- | src/translator_en.h | 2 | ||||
-rw-r--r-- | src/translator_fa.h | 2 | ||||
-rw-r--r-- | src/translator_lt.h | 2 | ||||
-rw-r--r-- | src/translator_lv.h | 2 | ||||
-rw-r--r-- | src/translator_si.h | 2 | ||||
-rw-r--r-- | testing/011/category_integer_07_arithmetic_08.xml | 2 | ||||
-rw-r--r-- | testing/011_category.m | 2 | ||||
-rw-r--r-- | testing/049/indexpage.xml | 2 | ||||
-rw-r--r-- | testing/049_snippet.cpp | 2 | ||||
-rwxr-xr-x | testing/runtests.pl | 2 | ||||
-rw-r--r-- | vhdlparser/TokenManager.h | 2 |
25 files changed, 43 insertions, 32 deletions
diff --git a/doc/commands.doc b/doc/commands.doc index c899c1d..c8f77eb 100644 --- a/doc/commands.doc +++ b/doc/commands.doc @@ -3230,7 +3230,7 @@ class Receiver \addindex \\\. This command writes a dot (`.`) to the output. This can be useful to - prevent ending a brief description when JAVADOC_AUTOBRIEF is enabled + prevent ending a brief description when \ref cfg_javadoc_autobrief "JAVADOC_AUTOBRIEF" is enabled or to prevent starting a numbered list when the dot follows a number at the start of a line. diff --git a/jquery/jquery.ui-1.8.18.core.js b/jquery/jquery.ui-1.8.18.core.js index 98b4f9b..e6f1212 100644 --- a/jquery/jquery.ui-1.8.18.core.js +++ b/jquery/jquery.ui-1.8.18.core.js @@ -226,7 +226,7 @@ $(function() { div = body.appendChild( div = document.createElement( "div" ) ); // access offsetHeight before setting the style to prevent a layout bug - // in IE 9 which causes the elemnt to continue to take up space even + // in IE 9 which causes the element to continue to take up space even // after it is removed from the DOM (#8026) div.offsetHeight; 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/commentcnv.l b/src/commentcnv.l index 8c73ecb..979e6ee 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -1028,6 +1028,7 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName) "Nesting level %d %s",g_nestingCount+1,tmp.data()); // add one for "normal" expected end of comment } g_commentStack.clear(); + g_nestingCount = 0; if (Debug::isFlagSet(Debug::CommentCnv)) { g_outBuf->at(g_outBuf->curPos())='\0'; diff --git a/src/docparser.cpp b/src/docparser.cpp index fa77784..7944bf7 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -519,8 +519,8 @@ static void checkUndocumentedParams() } else { - warn_doc_error(g_memberDef->docFile(), - g_memberDef->docLine(), + warn_doc_error(g_memberDef->getDefFileName(), + g_memberDef->getDefLine(), substitute(errMsg,"%","%%")); } } diff --git a/src/doxygen.cpp b/src/doxygen.cpp index d966738..0b5d58c 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -8726,9 +8726,8 @@ static void findMainPage(EntryNav *rootNav) { Entry *root = rootNav->entry(); warn(root->fileName,root->startLine, - "found more than one \\mainpage comment block! Skipping this " - "block." - ); + "found more than one \\mainpage comment block! (first occurrence: %s, line %d), Skipping current block!", + Doxygen::mainPage->docFile().data(),Doxygen::mainPage->docLine()); } rootNav->releaseEntry(); @@ -11673,7 +11672,7 @@ void generateOutput() QString oldDir = QDir::currentDirPath(); QDir::setCurrent(Config_getString("HTML_OUTPUT")); portable_sysTimerStart(); - if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", FALSE)) + if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))) { err("failed to run html help compiler on index.hhp\n"); } 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/>", "­", "{$\\-$}", NULL, "\\-", { NULL, DocSymbol::Perl_unknown }}, { SYM(reg), "\xc2\xae", "®", "<registered/>", "®", "\\textregistered{}", "(R)", "\\'AE", { "registered", DocSymbol::Perl_symbol }}, { SYM(macr), "\xc2\xaf", "¯", "<macr/>", "¯", "\\={}", NULL, "\\'AF", { NULL, DocSymbol::Perl_unknown }}, - { SYM(deg), "\xc2\xb0", "°", "<deg/>", "°", "\\textdegree", NULL, "\\'B0", { "deg", DocSymbol::Perl_symbol }}, + { SYM(deg), "\xc2\xb0", "°", "<deg/>", "°", "\\textdegree{}", NULL, "\\'B0", { "deg", DocSymbol::Perl_symbol }}, { SYM(plusmn), "\xc2\xb1", "±", "<plusmn/>", "±", "{$\\pm$}", NULL, "\\'B1", { "+/-", DocSymbol::Perl_string }}, { SYM(sup2), "\xc2\xb2", "²", "<sup2/>", "²", "\\texttwosuperior{}", NULL, "\\'B2", { NULL, DocSymbol::Perl_unknown }}, { SYM(sup3), "\xc2\xb3", "³", "<sup3/>", "³", "\\textthreesuperior{}", NULL, "\\'B3", { NULL, DocSymbol::Perl_unknown }}, diff --git a/src/index.cpp b/src/index.cpp index 2cb7de2..e7ba8e7 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -4140,7 +4140,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry case LayoutNavEntry::Classes: if (annotatedClasses>0 && addToIndex) { - Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,0,0); + Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,"annotated",0); Doxygen::indexList->incContentsDepth(); needsClosing=TRUE; } diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 5061ed8..23c171a 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -2995,13 +2995,13 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, { if (!hasDocumentedParams()) { - warn_doc_error(docFile(),docLine(), + warn_doc_error(getDefFileName(),getDefLine(), "parameters of member %s are not (all) documented", qPrint(qualifiedName())); } if (!hasDocumentedReturnType() && isFunction() && hasDocumentation()) { - warn_doc_error(docFile(),docLine(), + warn_doc_error(getDefFileName(),getDefLine(), "return type of member %s is not documented", qPrint(qualifiedName())); } @@ -3234,7 +3234,7 @@ void MemberDef::warnIfUndocumented() !isReference() ) { - warn_undoc(getDefFileName(),getDefLine(),"Member %s%s (%s) of %s %s is not documented.", + warn_undoc(d->getDefFileName(),d->getDefLine(),"Member %s%s (%s) of %s %s is not documented.", qPrint(name()),qPrint(argsString()),qPrint(memberTypeName()),t,qPrint(d->name())); } } diff --git a/src/memberlist.cpp b/src/memberlist.cpp index fae285f..64fe44a 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -409,7 +409,6 @@ void MemberList::writePlainDeclarations(OutputList &ol, { ol.endDoxyAnchor(md->getOutputFileBase(),md->anchor()); } - ol.endMemberItem(); if (!md->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) { DocRoot *rootNode = validatingParseDoc( @@ -437,6 +436,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, delete rootNode; } ol.endMemberDeclaration(md->anchor(),inheritId); + ol.endMemberItem(); } md->warnIfUndocumented(); break; diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp index acd3995..40d744a 100644 --- a/src/sqlite3gen.cpp +++ b/src/sqlite3gen.cpp @@ -754,7 +754,7 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def) bindIntParameter(memberdef_insert,":new",md->isNew()); bindIntParameter(memberdef_insert,":optional",md->isOptional()); bindIntParameter(memberdef_insert,":required",md->isRequired()); - + bindIntParameter(memberdef_insert,":virt",md->virtualness()); } // place in the arguments and linkify the arguments @@ -1027,9 +1027,16 @@ static void generateSqlite3ForClass(sqlite3 *db, ClassDef *cd) BaseClassDef *bcd; for (bcli.toFirst();(bcd=bcli.current());++bcli) { - bindTextParameter(derivedcompoundref_insert,":base",cd->displayName()); - bindTextParameter(derivedcompoundref_insert,":dervied",bcd->classDef->displayName()); - bindTextParameter(derivedcompoundref_insert,":refid",bcd->classDef->getOutputFileBase()); + bindTextParameter(derivedcompoundref_insert,":base",cd->displayName(),FALSE); + if (!bcd->templSpecifiers.isEmpty()) + { + bindTextParameter(derivedcompoundref_insert,":derived",insertTemplateSpecifierInScope(bcd->classDef->name(),bcd->templSpecifiers),FALSE); + } + else + { + bindTextParameter(derivedcompoundref_insert,":derived",bcd->classDef->displayName(),FALSE); + } + bindTextParameter(derivedcompoundref_insert,":refid",bcd->classDef->getOutputFileBase(),FALSE); bindIntParameter(derivedcompoundref_insert,":prot",bcd->prot); bindIntParameter(derivedcompoundref_insert,":virt",bcd->virt); step(db,derivedcompoundref_insert); 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/testing/011/category_integer_07_arithmetic_08.xml b/testing/011/category_integer_07_arithmetic_08.xml index 73308db..12b6b6d 100644 --- a/testing/011/category_integer_07_arithmetic_08.xml +++ b/testing/011/category_integer_07_arithmetic_08.xml @@ -33,7 +33,7 @@ <briefdescription> </briefdescription> <detaileddescription> - <para>substract operation </para> + <para>subtract operation </para> </detaileddescription> <inbodydescription> </inbodydescription> diff --git a/testing/011_category.m b/testing/011_category.m index 8cb4d3a..f57c1d1 100644 --- a/testing/011_category.m +++ b/testing/011_category.m @@ -17,7 +17,7 @@ @interface Integer (Arithmetic) /** add operation */ - (id) add: (Integer *) addend; -/** substract operation */ +/** subtract operation */ - (id) sub: (Integer *) subtrahend; @end diff --git a/testing/049/indexpage.xml b/testing/049/indexpage.xml index 0f3a63b..a6c9b97 100644 --- a/testing/049/indexpage.xml +++ b/testing/049/indexpage.xml @@ -4,7 +4,7 @@ <compoundname>index</compoundname> <title>My Project</title> <detaileddescription> - <para>A bubble sort algoritm First get the inputs <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i<n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>printf(</highlight><highlight class="stringliteral">"<sp/>Array[%d]<sp/>=<sp/>"</highlight><highlight class="normal">,i);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>scanf(</highlight><highlight class="stringliteral">"%d"</highlight><highlight class="normal">,&arr[i]);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting>Then do the bubbling <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i<n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(j=0<sp/>;<sp/>j<n-i-1<sp/>;<sp/>j++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">if</highlight><highlight class="normal">(arr[j]>arr[j+1])<sp/></highlight><highlight class="comment">//Swapping<sp/>Condition<sp/>is<sp/>Checked</highlight><highlight class="normal"/></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>temp=arr[j];</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>arr[j]=arr[j+1];</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>arr[j+1]=temp;</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/>}</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>}</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting>Then write the result <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i<n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>printf(</highlight><highlight class="stringliteral">"<sp/>%4d"</highlight><highlight class="normal">,arr[i]);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting></para> + <para>A bubble sort algorithm First get the inputs <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i<n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>printf(</highlight><highlight class="stringliteral">"<sp/>Array[%d]<sp/>=<sp/>"</highlight><highlight class="normal">,i);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>scanf(</highlight><highlight class="stringliteral">"%d"</highlight><highlight class="normal">,&arr[i]);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting>Then do the bubbling <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i<n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(j=0<sp/>;<sp/>j<n-i-1<sp/>;<sp/>j++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">if</highlight><highlight class="normal">(arr[j]>arr[j+1])<sp/></highlight><highlight class="comment">//Swapping<sp/>Condition<sp/>is<sp/>Checked</highlight><highlight class="normal"/></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>temp=arr[j];</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>arr[j]=arr[j+1];</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/><sp/><sp/>arr[j+1]=temp;</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/>}</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>}</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting>Then write the result <programlisting><codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">for</highlight><highlight class="normal">(i=0<sp/>;<sp/>i<n<sp/>;<sp/>i++)</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>{</highlight></codeline><codeline><highlight class="normal"><sp/><sp/><sp/><sp/>printf(</highlight><highlight class="stringliteral">"<sp/>%4d"</highlight><highlight class="normal">,arr[i]);</highlight></codeline><codeline><highlight class="normal"><sp/><sp/>}</highlight></codeline></programlisting></para> </detaileddescription> </compounddef> </doxygen> diff --git a/testing/049_snippet.cpp b/testing/049_snippet.cpp index 2749a62..614a43c 100644 --- a/testing/049_snippet.cpp +++ b/testing/049_snippet.cpp @@ -3,7 +3,7 @@ // config: EXAMPLE_PATH = . /** \mainpage - * A bubble sort algoritm + * A bubble sort algorithm * First get the inputs * \snippet snippet_test.cpp input * Then do the bubbling diff --git a/testing/runtests.pl b/testing/runtests.pl index 30fe969..0e1938d 100755 --- a/testing/runtests.pl +++ b/testing/runtests.pl @@ -81,7 +81,7 @@ sub compare_ok { sub chop_volatile { my $line = shift; - $line =~ s/version="\d\.\d+\.\d+(\.\d+)?"/version=""/g; # strip version + $line =~ s/version="\d\.\d+\.\d+(\.\d+)?(\-\d+)?"/version=""/g; # strip version $line =~ s/file=".*\/(.*)"/file="$1"/g; # strip location return $line; } 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; |