diff options
47 files changed, 97 insertions, 97 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 472b90f..cd0fcaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ option(win_static "Link with /MT in stead of /MD on windows" OFF) option(english_only "Only compile in support for the English language" OFF) option(force_qt4 "Forces doxywizard to build using Qt4 even if Qt5 is installed" OFF) -SET(enlarge_lex_buffers "262144" CACHE INTERNAL "Sets the lex input and read buffere to the specified size") +SET(enlarge_lex_buffers "262144" CACHE INTERNAL "Sets the lex input and read buffers to the specified size") list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") set(TOP "${CMAKE_SOURCE_DIR}") diff --git a/addon/doxmlparser/src/memberhandler.cpp b/addon/doxmlparser/src/memberhandler.cpp index 6042f91..df8c04f 100644 --- a/addon/doxmlparser/src/memberhandler.cpp +++ b/addon/doxmlparser/src/memberhandler.cpp @@ -453,7 +453,7 @@ void MemberHandler::startArgsString(const QXmlAttributes&) void MemberHandler::endArgsString() { m_argsstring = m_curString.stripWhiteSpace(); - debug(2,"arggstring=%s\n",m_argsstring.data()); + debug(2,"argstring=%s\n",m_argsstring.data()); } void MemberHandler::startParam(const QXmlAttributes& attrib) diff --git a/doc/changelog.doc b/doc/changelog.doc index 96652eb..e1f2d8a 100644 --- a/doc/changelog.doc +++ b/doc/changelog.doc @@ -311,7 +311,7 @@ href="https://github.com/doxygen/doxygen/commit/9d83d43f0d8b7058e2f89371a6ab276c <li>delayed creation and update of .md5 files after successful creation of output files [<a href="https://github.com/doxygen/doxygen/commit/572035ffcd0e4f7313bab23d375d63008ebbe5a3">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/9dda0c6ddc5117f800afcb19fb8c6be031fe6c27">view</a>]</li> <li>do not clobber version placeholder [<a href="https://github.com/doxygen/doxygen/commit/faafe83a69d2f3c27daca0974c9a063bdb81ecdc">view</a>]</li> <li>doxyparse addon new features and bugfixes [<a href="https://github.com/doxygen/doxygen/commit/69f51747c37bb24b7e296ff01bb7e45a624f6225">view</a>]</li> -<li>doxysearch: added wildcard, partial and phrase sesarch [<a href="https://github.com/doxygen/doxygen/commit/6217e3026d29a6f54e0138452706caa1bbc86307">view</a>]</li> +<li>doxysearch: added wildcard, partial and phrase search [<a href="https://github.com/doxygen/doxygen/commit/6217e3026d29a6f54e0138452706caa1bbc86307">view</a>]</li> <li>enable debug for re-entrant lexers [<a href="https://github.com/doxygen/doxygen/commit/2c8eec16b0a0ce46f69af9f09b66c2475066bbe6">view</a>]</li> <li>https link to sourceforge.net [<a href="https://github.com/doxygen/doxygen/commit/5705d50298b7b91f81f87baf0dc3a58224acd982">view</a>]</li> <li>make similar javadoc banner change for stripping special comments from code [<a href="https://github.com/doxygen/doxygen/commit/77dae25c166c71a57d9ecd64b765bcc616d435ec">view</a>]</li> @@ -763,7 +763,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/6128">6128</a> - Usage of underscore's in parameter names [<a href="https://github.com/doxygen/doxygen/commit/c10af45c61a1f9b25c514f397ace16c94cc7c8df">view</a>]</li> <li>Bug <a href="https://github.com/doxygen/doxygen/issues/6135">6135</a> - [1.8.13 Regression] Segfault building the breathe docs [<a href="https://github.com/doxygen/doxygen/commit/0f02761a158a5e9ddbd5801682482af8986dbc35">view</a>]</li> <li>Bug <a href="https://github.com/doxygen/doxygen/issues/6137">6137</a> - XML Parsing Error for operator<< methods when outputting to XHTML [<a href="https://github.com/doxygen/doxygen/commit/0e8530e42b69c909ef2c26468b24dfb88cc0997f">view</a>]</li> -<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6139">6139</a> - Menu does not work without Javascript [<a href="https://github.com/doxygen/doxygen/commit/1be97720b7820361e85242d08d4cac3e46570bfe">view</a>]</li> +<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6139">6139</a> - Menu does not work without JavaScript [<a href="https://github.com/doxygen/doxygen/commit/1be97720b7820361e85242d08d4cac3e46570bfe">view</a>]</li> <li>Bug <a href="https://github.com/doxygen/doxygen/issues/6141">6141</a> - Too greedy behavior of @ref const matching [<a href="https://github.com/doxygen/doxygen/commit/04001c8926fb0f37dfcf284b3637b182125bba75">view</a>]</li> <li>Bug <a href="https://github.com/doxygen/doxygen/issues/6169">6169</a> - doxygen build fails [<a href="https://github.com/doxygen/doxygen/commit/bb5c8dd29782ecbb05a4ef9788f2507e9a156848">view</a>]</li> <li>Bug <a href="https://github.com/doxygen/doxygen/issues/6170">6170</a> - Add "\~" command to internationalization article [<a href="https://github.com/doxygen/doxygen/commit/e204b982eebd54bd15148a520da6608935e33e50">view</a>]</li> @@ -812,7 +812,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887 <li>Fixed problem where automatic line breaking caused missing vertical bars in the parameter table for Latex output. [<a href="https://github.com/doxygen/doxygen/commit/5fc82b2275e202438ac61b070ac5f4be0df792d6">view</a>]</li> <li>Fixes for cross platform build with new LLVM/CLANG version [<a href="https://github.com/doxygen/doxygen/commit/b0aae61c97966cb9d424b500d7ced5bdf500d8db">view</a>]</li> <li>Fixup man page NAME section when page has title [<a href="https://github.com/doxygen/doxygen/commit/9d0908359363dbb43236767669c214721700acf7">view</a>]</li> -<li>Function declaration following a function definition incorrectly listed as calling dependencing [<a href="https://github.com/doxygen/doxygen/commit/436fc7ed1158d517dd6f6d25aa3e05568f8c3d94">view</a>]</li> +<li>Function declaration following a function definition incorrectly listed as calling dependency [<a href="https://github.com/doxygen/doxygen/commit/436fc7ed1158d517dd6f6d25aa3e05568f8c3d94">view</a>]</li> <li>Further cleanup of lodepng code [<a href="https://github.com/doxygen/doxygen/commit/c627108f3315144f5d9fb84d0197502b939caf7d">view</a>]</li> <li>Implement "double-space line breaks" syntax in Markdown [<a href="https://github.com/doxygen/doxygen/commit/e4596c7eab90ba4d307e2c212cefeab8ac820269">view</a>]</li> <li>Improve Chinese translation [<a href="https://github.com/doxygen/doxygen/commit/ded5247523ec8d47129405df3999ce391cca9e2d">view</a>]</li> @@ -1183,7 +1183,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887 <li>Fix error documentation of in flex debug script [<a href="https://github.com/doxygen/doxygen/commit/09c4e990e4e214900e613343fb9bfbbb08f1bc53">view</a>]</li> <li>Fix for broken link in the manual [<a href="https://github.com/doxygen/doxygen/commit/355370151b61f79633b3867634d76eaf8bacce54">view</a>]</li> <li>Fix hexChar for inputs 0 <= i < 10 [<a href="https://github.com/doxygen/doxygen/commit/327422d131ed5e6ddf280043b5a56a6fb92d3bbc">view</a> and [<a href="https://github.com/doxygen/doxygen/commit/62da4521880a03b8a92887539eaf76ccad2ee770">view</a>]</li> -<li>Fix spelling in doc/commands.doc (descriptionm) [<a href="https://github.com/doxygen/doxygen/commit/bd7da008fac074202e3265787907434fbfb40e71">view</a>]</li> +<li>Fix spelling in doc/commands.doc (description) [<a href="https://github.com/doxygen/doxygen/commit/bd7da008fac074202e3265787907434fbfb40e71">view</a>]</li> <li>Fix typo in function name [<a href="https://github.com/doxygen/doxygen/commit/ace0af42e330a96ad691b2d9a08dd3ff4abb2629">view</a> and [<a href="https://github.com/doxygen/doxygen/commit/b890f40d195b9dc5db12aaa398707de138093c66">view</a>]</li> <li>Fixed a couple of small memory leaks [<a href="https://github.com/doxygen/doxygen/commit/85ddfc814f33943199928447b4627d05b0920b99">view</a>]</li> <li>Fixed a number of memory leaks in the template engine [<a href="https://github.com/doxygen/doxygen/commit/d14bcd1f8f5bd4a2034bae842000630f4e098eb6">view</a>]</li> @@ -3993,7 +3993,7 @@ make sure you add the following: <h3>Changes</h3> <ul> <li> id <a href="https://github.com/doxygen/doxygen/issues/3372">3372</a>, <a href="https://github.com/doxygen/doxygen/issues/3012">3012</a>: Replaced the PHP based search engine by a - Javascript/DHTML based one. + JavaScript/DHTML based one. As a result the search feature no longer requires a HTTP server with PHP enabled to be usable. Searching is limited to symbols though, but it is now possible to filter on symbol type.</li> @@ -4286,7 +4286,7 @@ make sure you add the following: <li> Added new config options <code>GENERATE_QHP</code> which enables generating .qch (Qt compiled help) file via the Qt's qthelpgenerator tool (part of Qt 4.4+). - This type of files can be read with Qt's Assisant to browse the + This type of files can be read with Qt's Assistant to browse the documentation in a similar way as is possible with Microsoft's compiled HTML help (.chm). To further customize the output and run the help generator from within doxygen, the following options @@ -5363,7 +5363,7 @@ make sure you add the following: command always ended at the first dot.</li> <li> id 311207: The /* and */ inside a \code ... \endcode code fragment were stripped.</li> -<li> id 311577: Putting a documentated class name in the title of the main +<li> id 311577: Putting a documented class name in the title of the main page caused a LaTeX error if pdf hyperlinks were enabled.</li> <li> id 311665: Fixed compile issue for Solaris.</li> <li> id 312688: Typedefs of arrays were auto-linked to the base type @@ -5371,7 +5371,7 @@ make sure you add the following: <li> id 312678: Fixed excessive memory usage for @fn commands due to a memory leak of the scanner buffer 256K of memory was leaked for each command!</li> -<li> id 312791: Undocumentated members did not result in warnings if +<li> id 312791: Undocumented members did not result in warnings if SOURCE_BROWSER was enable and the member's definition was part of the INPUT.</li> <li> A C-comment inside a \code block could lead to parse problems in the @@ -5966,7 +5966,7 @@ make sure you add the following: \htmlonly </p> <h1>Doxygen Release 1.3.9.1</h1> -<h3>Bug fixes</h3>(ids refer to the old buzilla issue, just use it in the search box of the <a href="https://github.com/doxygen/doxygen/issues">issue tracker</a>)<br/> +<h3>Bug fixes</h3>(ids refer to the old bugzilla issue, just use it in the search box of the <a href="https://github.com/doxygen/doxygen/issues">issue tracker</a>)<br/> <ul> <li> Due to an error in the packaging script, an old version of doxywizard was bundled with the Mac OS X version of doxygen.</li> @@ -6367,7 +6367,7 @@ make sure you add the following: Please try it on your favorite legacy C project and report any problems.</li> <li> Included languages updates for Traditional Chinese, - Danish, German, Korian translation.</li> + Danish, German, Korean translation.</li> <li> id 120464: doxygen's XML output does now assign a prot="..." attribute for nested classes (thanks to Paul Ross for the patch).</li> <li> Added new configuration switch XML_PROGRAMLISTING to enable/disable @@ -8188,7 +8188,7 @@ make sure you add the following: the documentation (thanks to John Harris for reporting this).</li> <li> Applied a number of patches sent by Jens Seidel.</li> <li> Fixed compiler limit problem on Windows (thanks to Trevor Robinson).</li> -<li> Add -dBATCH in system calls to ghostscipt (needed for formulas) +<li> Add -dBATCH in system calls to ghostscript (needed for formulas) to avoid a command prompt for newer versions of ghostscript (thanks to Marvin Wolfthal).</li> <li> In some situations doxygen wanted to write a files containing a \n.</li> @@ -9392,7 +9392,7 @@ make sure you add the following: methods were also not correctly recognized.</li> <li> C/C++ comments inside initializers where not handled properly.</li> <li> If the type of an argument of a member definition was prefixed - with a (redudant) scope name of an indirect base class, + with a (redundant) scope name of an indirect base class, then it was not matched against the member declaration if that omitted the scope.</li> <li> \name did not work within //! comments</li> diff --git a/doc/faq.doc b/doc/faq.doc index 0ba9450..8a3aee8 100644 --- a/doc/faq.doc +++ b/doc/faq.doc @@ -216,7 +216,7 @@ If you don't mind spending some time on it, there are several options: - If the grammar of X is somewhat different than you can write an input filter that translates X into something similar enough to C/C++ for doxygen to understand (this approach is taken for VB, Object Pascal, and - Javascript, see http://www.doxygen.org/download.html#helpers). + JavaScript, see http://www.doxygen.org/download.html#helpers). - If the grammar is completely different one could write a parser for X and write a backend that produces a similar syntax tree as is done by \c src/scanner.l (and also by \c src/tagreader.cpp while reading tag files). diff --git a/doc/features.doc b/doc/features.doc index 8b19898..65fc343 100644 --- a/doc/features.doc +++ b/doc/features.doc @@ -69,7 +69,7 @@ generated automatically. <li>Includes a fast, rank based search engine to search for strings or words in the class and member documentation (PHP based). -<li>Includes an Javascript based live search feature to search for symbols +<li>Includes an JavaScript based live search feature to search for symbols as you type (for small to medium sized projects). <li>You can type normal HTML tags in your documentation. Doxygen will convert them to their equivalent \LaTeX, RTF, and man-page diff --git a/doc/searching.doc b/doc/searching.doc index 1716729..880c3f4 100644 --- a/doc/searching.doc +++ b/doc/searching.doc @@ -30,7 +30,7 @@ has its own advantages and disadvantages: <h2>1. Client side searching</h2> The easiest way to enable searching is to enable the built-in client - side search engine. This engine is implemented using Javascript and DHTML + side search engine. This engine is implemented using JavaScript and DHTML only and runs entirely on the clients browser. So no additional tooling is required to make it work. diff --git a/doc/starting.doc b/doc/starting.doc index 154cc03..045f66c 100644 --- a/doc/starting.doc +++ b/doc/starting.doc @@ -187,7 +187,7 @@ IE8, IE9, and Opera to test the generated output). Some of the features the HTML section (such as \ref cfg_generate_treeview "GENERATE_TREEVIEW" or the search engine) -require a browser that supports Dynamic HTML and Javascript enabled. +require a browser that supports Dynamic HTML and JavaScript enabled. \subsection latex_out LaTeX output \addindex LaTeX diff --git a/liblodepng/lodepng.cpp b/liblodepng/lodepng.cpp index 6e28587..e281abe 100644 --- a/liblodepng/lodepng.cpp +++ b/liblodepng/lodepng.cpp @@ -435,7 +435,7 @@ static unsigned HuffmanTree_make2DTree(HuffmanTree* tree) if(!uivector_resize(&tree->tree2d, tree->numcodes * 2)) return 9901; /*if failed return not enough memory error*/ /*convert tree1d[] to tree2d[][]. In the 2D array, a value of 32767 means uninited, a value >= numcodes is an address to another bit, a value < numcodes is a code. The 2 rows are the 2 possible bit values (0 or 1), there are as many columns as codes - 1 - a good huffmann tree has N * 2 - 1 nodes, of which N - 1 are internal nodes. Here, the internal nodes are stored (what their 0 and 1 option point to). There is only memory for such good tree currently, if there are more nodes (due to too long length codes), error 55 will happen*/ + a good huffman tree has N * 2 - 1 nodes, of which N - 1 are internal nodes. Here, the internal nodes are stored (what their 0 and 1 option point to). There is only memory for such good tree currently, if there are more nodes (due to too long length codes), error 55 will happen*/ for(n = 0; n < tree->numcodes * 2; n++) tree->tree2d.data[n] = 32767; /*32767 here means the tree2d isn't filled there yet*/ for(n = 0; n < tree->numcodes; n++) /*the codes*/ @@ -1509,7 +1509,7 @@ static unsigned getNumColorChannels(unsigned colorType) case 4: return 2; /*grey + alpha*/ case 6: return 4; /*RGBA*/ } - return 0; /*unexisting color type*/ + return 0; /*nonexistent color type*/ } static unsigned getBpp(unsigned colorType, unsigned bitDepth) @@ -2023,7 +2023,7 @@ static void filterScanline(unsigned char* out, const unsigned char* scanline, co for(i = bytewidth; i < length; i++) out[i] = (unsigned char)(scanline[i] - paethPredictor(scanline[i - bytewidth], 0, 0)); } break; - default: return; /*unexisting filter type given*/ + default: return; /*nonexistent filter type given*/ } } @@ -2341,10 +2341,10 @@ void LodePNG_encode(LodePNG_Encoder* encoder, unsigned char** out, size_t* outsi } if(encoder->settings.zlibsettings.windowSize > 32768) { encoder->error = 60; return; } /*error: windowsize larger than allowed*/ - if(encoder->settings.zlibsettings.btype > 2) { encoder->error = 61; return; } /*error: unexisting btype*/ - if(encoder->infoPng.interlaceMethod > 1) { encoder->error = 71; return; } /*error: unexisting interlace mode*/ - if((encoder->error = checkColorValidity(info.color.colorType, info.color.bitDepth))) return; /*error: unexisting color type given*/ - if((encoder->error = checkColorValidity(encoder->infoRaw.color.colorType, encoder->infoRaw.color.bitDepth))) return; /*error: unexisting color type given*/ + if(encoder->settings.zlibsettings.btype > 2) { encoder->error = 61; return; } /*error: nonexistent btype*/ + if(encoder->infoPng.interlaceMethod > 1) { encoder->error = 71; return; } /*error: nonexistent interlace mode*/ + if((encoder->error = checkColorValidity(info.color.colorType, info.color.bitDepth))) return; /*error: nonexistent color type given*/ + if((encoder->error = checkColorValidity(encoder->infoRaw.color.colorType, encoder->infoRaw.color.bitDepth))) return; /*error: nonexistent color type given*/ if(!LodePNG_InfoColor_equal(&encoder->infoRaw.color, &info.color)) { diff --git a/libmscgen/gd.c b/libmscgen/gd.c index da7731d..7e8b241 100644 --- a/libmscgen/gd.c +++ b/libmscgen/gd.c @@ -2273,7 +2273,7 @@ BGD_DECLARE(void) gdImageFillToBorder (gdImagePtr im, int x, int y, int border, /* Seek left */ int leftLimit, rightLimit; int i; - int restoreAlphaBleding; + int restoreAlphaBlending; if (border < 0 || color < 0) { /* Refuse to fill to a non-solid border */ @@ -2288,7 +2288,7 @@ BGD_DECLARE(void) gdImageFillToBorder (gdImagePtr im, int x, int y, int border, leftLimit = (-1); - restoreAlphaBleding = im->alphaBlendingFlag; + restoreAlphaBlending = im->alphaBlendingFlag; im->alphaBlendingFlag = 0; if (x >= im->sx) { @@ -2310,7 +2310,7 @@ BGD_DECLARE(void) gdImageFillToBorder (gdImagePtr im, int x, int y, int border, leftLimit = i; } if (leftLimit == (-1)) { - im->alphaBlendingFlag = restoreAlphaBleding; + im->alphaBlendingFlag = restoreAlphaBlending; return; } /* Seek right */ @@ -2354,7 +2354,7 @@ BGD_DECLARE(void) gdImageFillToBorder (gdImagePtr im, int x, int y, int border, } } } - im->alphaBlendingFlag = restoreAlphaBleding; + im->alphaBlendingFlag = restoreAlphaBlending; } /* diff --git a/libmscgen/gd.h b/libmscgen/gd.h index c1a5754..67da1b7 100644 --- a/libmscgen/gd.h +++ b/libmscgen/gd.h @@ -101,7 +101,7 @@ extern "C" { pixels are represented by integers, which must be 32 bits wide or more. - True colors are repsented as follows: + True colors are represented as follows: ARGB @@ -268,7 +268,7 @@ enum gdPaletteQuantizationMethod { * GD_GENERALIZED_CUBIC - Generalized cubic * GD_HERMITE - Hermite * GD_HAMMING - Hamming - * GD_HANNING - Hannig + * GD_HANNING - Hanning * GD_MITCHELL - Mitchell * GD_NEAREST_NEIGHBOUR - Nearest neighbour interpolation * GD_POWER - Power @@ -1499,7 +1499,7 @@ BGD_DECLARE(void) gdImageFlipHorizontal(gdImagePtr im); BGD_DECLARE(void) gdImageFlipVertical(gdImagePtr im); BGD_DECLARE(void) gdImageFlipBoth(gdImagePtr im); -#define GD_FLIP_HORINZONTAL 1 +#define GD_FLIP_HORIZONTAL 1 #define GD_FLIP_VERTICAL 2 #define GD_FLIP_BOTH 3 diff --git a/libmscgen/mscgen_adraw.h b/libmscgen/mscgen_adraw.h index 9ac1037..84b0f36 100644 --- a/libmscgen/mscgen_adraw.h +++ b/libmscgen/mscgen_adraw.h @@ -253,7 +253,7 @@ ADraw; * image functions to be executed. * * \param[in] w The width of the output image. - * \param[in] h The height of the oupput image. + * \param[in] h The height of the output image. * \param[in] file The file to which the image should be written. * \param[in] fontName The name of the font to use for rendering. * \param[in] type The output type to generate. diff --git a/libmscgen/mscgen_api.c b/libmscgen/mscgen_api.c index c5a9eb3..b28d653 100644 --- a/libmscgen/mscgen_api.c +++ b/libmscgen/mscgen_api.c @@ -67,7 +67,7 @@ typedef struct GlobalOptionsTag /** Size of 'corner' added to note boxes. */ unsigned int noteCorner; - /** Anguluar box slope in pixels. */ + /** Angular box slope in pixels. */ unsigned int aboxSlope; /** If TRUE, wrap arc text as well as box contents. */ @@ -1062,7 +1062,7 @@ static void arcBox(Context *ctx, * \param arcIdUrl The URL for rendering the test identifier as a hyperlink. * This maybe \a NULL if not required. * \param arcTextColour Colour for the arc text, or NULL to use default. - * \param arcTextColour Colour for the arc text backgroun, or NULL to use default. + * \param arcTextColour Colour for the arc text background, or NULL to use default. * \param arcType The type of arc, used to control output semantics. */ static void arcText(Context *ctx, diff --git a/libmscgen/mscgen_msc.c b/libmscgen/mscgen_msc.c index 0a17395..a18e261 100644 --- a/libmscgen/mscgen_msc.c +++ b/libmscgen/mscgen_msc.c @@ -91,7 +91,7 @@ struct MscTag * Local Functions ***************************************************************************/ -/** Find come attrbute in an attribute list. +/** Find come attribute in an attribute list. * * \param[in] attr Head of the linked list to search. * \param[in] a The attribute type to find. diff --git a/libmscgen/mscgen_msc.h b/libmscgen/mscgen_msc.h index bcbdf3a..1299bf9 100644 --- a/libmscgen/mscgen_msc.h +++ b/libmscgen/mscgen_msc.h @@ -205,7 +205,7 @@ Boolean MscGetOptAsBoolean(struct MscTag *m, MscOptType type, Boolean *cons * * \param m The MSC to analyse. * \param label The label to find. - * \retval -1 If the label was not found, otherwise the columnn index. + * \retval -1 If the label was not found, otherwise the column index. */ int MscGetEntityIndex(struct MscTag *m, const char *label); diff --git a/libmscgen/mscgen_utf8.c b/libmscgen/mscgen_utf8.c index e23eef3..4821164 100644 --- a/libmscgen/mscgen_utf8.c +++ b/libmscgen/mscgen_utf8.c @@ -27,7 +27,7 @@ #include "mscgen_utf8.h"
/**************************************************************************
- * Manfest Constants
+ * Manifest Constants
**************************************************************************/
/**************************************************************************
diff --git a/qtools/qcstringlist.cpp b/qtools/qcstringlist.cpp index 5725971..4bb231d 100644 --- a/qtools/qcstringlist.cpp +++ b/qtools/qcstringlist.cpp @@ -157,11 +157,11 @@ QCStringList QCStringList::grep( const QRegExp &expr ) const QCString QCStringList::join( const QCString &sep ) const { QCString res; - bool alredy = FALSE; + bool already = FALSE; for ( QCStringList::ConstIterator it = begin(); it != end(); ++it ) { - if ( alredy ) + if ( already ) res += sep; - alredy = TRUE; + already = TRUE; res += *it; } diff --git a/qtools/qglobal.cpp b/qtools/qglobal.cpp index 50f5202..444cb3b 100644 --- a/qtools/qglobal.cpp +++ b/qtools/qglobal.cpp @@ -73,7 +73,7 @@ static bool si_bigEndian; or to FALSE if this is a little-endian machine. This function calls qFatal() with a message if the computer is truly weird - (i.e. different endianness for 16 bit and 32 bit integers). + (i.e. different endianess for 16 bit and 32 bit integers). */ bool qSysInfo( int *wordSize, bool *bigEndian ) diff --git a/qtools/qglobal.h b/qtools/qglobal.h index 56b2d40..d37bdf2 100644 --- a/qtools/qglobal.h +++ b/qtools/qglobal.h @@ -400,7 +400,7 @@ inline int qRound( double d ) // -// Size-dependent types (architechture-dependent byte order) +// Size-dependent types (architecture-dependent byte order) // // QT_CLEAN_NAMESPACE is not defined by default; it would break too diff --git a/qtools/qstring.cpp b/qtools/qstring.cpp index e809d0d..3d57839 100644 --- a/qtools/qstring.cpp +++ b/qtools/qstring.cpp @@ -15300,7 +15300,7 @@ const void* qt_winTchar(const QString& str_in, bool addnul) if ( addnul ) buf[str.length()] = 0; #else - // Same endianness of TCHAR + // Same endianess of TCHAR if ( addnul ) { EXTEND memcpy(buf,uc,sizeof(TCHAR)*str.length()); @@ -15344,7 +15344,7 @@ QString qt_winQString(void* tc) r += QChar(((TCHAR*)tc)[i]&0xff,((TCHAR*)tc)[i]>>8); return r; #else - // Same endianness of TCHAR + // Same endianess of TCHAR return QString((QChar*)tc,len); #endif #undef EXTEND diff --git a/qtools/qstringlist.cpp b/qtools/qstringlist.cpp index 7696340..aa7ac16 100644 --- a/qtools/qstringlist.cpp +++ b/qtools/qstringlist.cpp @@ -269,11 +269,11 @@ QStringList QStringList::grep( const QRegExp &expr ) const QString QStringList::join( const QString &sep ) const { QString res; - bool alredy = FALSE; + bool already = FALSE; for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { - if ( alredy ) + if ( already ) res += sep; - alredy = TRUE; + already = TRUE; res += *it; } diff --git a/qtools/qxml.cpp b/qtools/qxml.cpp index f8a4e0d..b7a68fc 100644 --- a/qtools/qxml.cpp +++ b/qtools/qxml.cpp @@ -5175,11 +5175,11 @@ bool QXmlSimpleReader::parseEntityValue() const signed char Init = 0; const signed char Dq = 1; // EntityValue is double quoted const signed char DqC = 2; // signed character - const signed char DqPER = 3; // PERefence + const signed char DqPER = 3; // PEReference const signed char DqRef = 4; // Reference const signed char Sq = 5; // EntityValue is double quoted const signed char SqC = 6; // signed character - const signed char SqPER = 7; // PERefence + const signed char SqPER = 7; // PEReference const signed char SqRef = 8; // Reference const signed char Done = 9; diff --git a/src/config.xml b/src/config.xml index bf74fff..7dc95b4 100644 --- a/src/config.xml +++ b/src/config.xml @@ -648,7 +648,7 @@ Go to the <a href="commands.html">next</a> section or return to the With this tag you can assign which parser to use for a given extension. Doxygen has a built-in mapping, but you can override or extend it using this tag. The format is <code>ext=language</code>, where \c ext is a file extension, and language is one of - the parsers supported by doxygen: IDL, Java, Javascript, Csharp (C#), C, C++, D, PHP, + the parsers supported by doxygen: IDL, Java, JavaScript, Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: Fortran. In the later case the parser tries to guess whether the code is fixed or free @@ -2034,9 +2034,9 @@ hr.footer { <![CDATA[ If the \c HTML_DYNAMIC_MENUS tag is set to \c YES then the generated HTML documentation will contain a main index with vertical navigation menus that - are dynamically created via Javascript. If disabled, the navigation index will consists of + are dynamically created via JavaScript. If disabled, the navigation index will consists of multiple levels of tabs that are statically embedded in every HTML page. - Disable this option to support browsers that do not have Javascript, like + Disable this option to support browsers that do not have JavaScript, like the Qt help browser. ]]> </docs> @@ -2383,7 +2383,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. <docs> <![CDATA[ Enable the \c USE_MATHJAX option to render \f$\mbox{\LaTeX}\f$ formulas using MathJax - (see https://www.mathjax.org) which uses client side Javascript for the + (see https://www.mathjax.org) which uses client side JavaScript for the rendering instead of using pre-rendered bitmaps. Use this if you do not have \f$\mbox{\LaTeX}\f$ installed or if you want to formulas look prettier in the HTML output. When enabled you may also need to install MathJax separately and @@ -2493,7 +2493,7 @@ MATHJAX_CODEFILE = disableRenderer.js <docs> <![CDATA[ When the \c SERVER_BASED_SEARCH tag is enabled the search engine will be -implemented using a web server instead of a web client using Javascript. +implemented using a web server instead of a web client using JavaScript. There are two flavors of web server based searching depending on the \ref cfg_external_search "EXTERNAL_SEARCH" setting. When disabled, diff --git a/src/defgen.cpp b/src/defgen.cpp index b145f0e..cc3d5af 100644 --- a/src/defgen.cpp +++ b/src/defgen.cpp @@ -288,7 +288,7 @@ void generateDEFForMember(MemberDef *md, { if (rmd->getStartBodyLine()!=-1 && rmd->getBodyDef()) { - t << memPrefix << "referenceby = {" << endl; + t << memPrefix << "referencedby = {" << endl; t << refPrefix << "id = '" << rmd->getBodyDef()->getOutputFileBase() << "_1" // encoded ':' character (see util.cpp:convertNameToFile) diff --git a/src/docparser.cpp b/src/docparser.cpp index a1509fc..a8d13d9 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -7532,7 +7532,7 @@ QCString getDirHtmlClassOfPage(QCString pageTitle) return result; } -QCString getHtmlDirEmbedingChar(QString::Direction textDir) +QCString getHtmlDirEmbeddingChar(QString::Direction textDir) { if (textDir == QString::DirLTR) return "‪"; @@ -7541,7 +7541,7 @@ QCString getHtmlDirEmbedingChar(QString::Direction textDir) return ""; } -QCString getJsDirEmbedingChar(QString::Direction textDir) +QCString getJsDirEmbeddingChar(QString::Direction textDir) { if (textDir == QString::DirLTR) return "\\u202A"; diff --git a/src/docparser.h b/src/docparser.h index 5999eae..2d53429 100644 --- a/src/docparser.h +++ b/src/docparser.h @@ -40,8 +40,8 @@ QString::Direction getTextDirByConfig(const DocNode *node); QString::Direction getTextDirByConfig(const DocPara *para, int nodeIndex); QCString getDirHtmlClassOfNode(QString::Direction textDir, const QCString &initValue=""); QCString getDirHtmlClassOfPage(QCString pageTitle); -QCString getHtmlDirEmbedingChar(QString::Direction textDir); -QCString getJsDirEmbedingChar(QString::Direction textDir); +QCString getHtmlDirEmbeddingChar(QString::Direction textDir); +QCString getJsDirEmbeddingChar(QString::Direction textDir); //--------------------------------------------------------------------------- diff --git a/src/docsets.cpp b/src/docsets.cpp index 439e924..a838923 100644 --- a/src/docsets.cpp +++ b/src/docsets.cpp @@ -322,7 +322,7 @@ void DocSets::addIndexItem(const Definition *context,const MemberDef *md, case SrcLangExt_PHP: lang="php"; break; // PHP4/5 case SrcLangExt_D: lang="d"; break; // D case SrcLangExt_Java: lang="java"; break; // Java - case SrcLangExt_JS: lang="javascript"; break; // Javascript + case SrcLangExt_JS: lang="javascript"; break; // JavaScript case SrcLangExt_Python: lang="python"; break; // Python case SrcLangExt_Fortran: lang="fortran"; break; // Fortran case SrcLangExt_VHDL: lang="vhdl"; break; // VHDL diff --git a/src/doxygen.cpp b/src/doxygen.cpp index ed1c5a8..d760678 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -1230,7 +1230,7 @@ static void resolveClassNestingRelations() Definition *d = buildScopeFromQualifiedName(name,name.contains("::"),cd->getLanguage(),0); if (d!=cd && !cd->getDefFileName().isEmpty()) // avoid recursion in case of redundant scopes, i.e: namespace N { class N::C {}; } - // for this case doxygen assumes the exitance of a namespace N::N in which C is to be found! + // for this case doxygen assumes the existence of a namespace N::N in which C is to be found! // also avoid warning for stuff imported via a tagfile. { d->addInnerCompound(cd); @@ -4432,7 +4432,7 @@ static bool findClassRelation( // base class has template specifiers { // TODO: here we should try to find the correct template specialization - // but for now, we only look for the unspecializated base class. + // but for now, we only look for the unspecialized base class. int e=findEndOfTemplate(baseClassName,i+1); //printf("baseClass==0 i=%d e=%d\n",i,e); if (e!=-1) // end of template was found at e @@ -11456,7 +11456,7 @@ void generateOutput() g_s.begin("Generating search indices...\n"); if (searchEngine && !serverBasedSearch && (generateHtml || g_useOutputTemplate)) { - createJavascriptSearchIndex(); + createJavaScriptSearchIndex(); } // generate search indices (need to do this before writing other HTML @@ -11474,7 +11474,7 @@ void generateOutput() HtmlGenerator::writeSearchData(searchDirName); if (!serverBasedSearch) // client side search index { - writeJavascriptSearchIndex(); + writeJavaScriptSearchIndex(); } } g_s.end(); diff --git a/src/doxygen.md b/src/doxygen.md index 7680a94..c124e09 100644 --- a/src/doxygen.md +++ b/src/doxygen.md @@ -188,7 +188,7 @@ Topics TODO - Qt Help (qhp) - Eclipse Help - Search index - - Javascript based + - JavaScript based - Server based - External - Citations diff --git a/src/fortrancode.l b/src/fortrancode.l index 21d1fa5..c4532f3 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -1250,7 +1250,7 @@ LANGUAGE_BIND_SPEC BIND{BS}"("{BS}C{BS}(,{BS}NAME{BS}"="{BS}"\""(.*)"\""{BS})?") else { codifyLines(yytext); - // comment cannot extend over the end of a line so should always be terminatd at the end of the line. + // comment cannot extend over the end of a line so should always be terminated at the end of the line. if (g_currentFontClass && !strcmp(g_currentFontClass,"comment")) endFontClass(); } g_contLineNr++; diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index e1466da..6312a65 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -1259,7 +1259,7 @@ void HtmlDocVisitor::visitPre(DocPara *p) if (needsTag) m_t << "<p" << getDirHtmlClassOfNode(getTextDirByConfig(p), contexts[t]) << htmlAttribsToString(p->attribs()) << ">"; else if(!paragraphAlreadyStarted) - m_t << getHtmlDirEmbedingChar(getTextDirByConfig(p)) << htmlAttribsToString(p->attribs()); + m_t << getHtmlDirEmbeddingChar(getTextDirByConfig(p)) << htmlAttribsToString(p->attribs()); } void HtmlDocVisitor::visitPost(DocPara *p) @@ -1757,7 +1757,7 @@ void HtmlDocVisitor::visitPre(DocImage *img) else { m_t << "<div class=\"caption\">" << endl; - m_t << getHtmlDirEmbedingChar(getTextDirByConfig(img)); + m_t << getHtmlDirEmbeddingChar(getTextDirByConfig(img)); } } else if (inlineImage) @@ -2491,7 +2491,7 @@ void HtmlDocVisitor::forceStartParagraph(DocNode *n) if (needsTag) m_t << "<p" << getDirHtmlClassOfNode(getTextDirByConfig(para, nodeIndex)) << ">"; else - m_t << getHtmlDirEmbedingChar(getTextDirByConfig(para, nodeIndex)); + m_t << getHtmlDirEmbeddingChar(getTextDirByConfig(para, nodeIndex)); } } diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index d47a38c..52ffecc 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -229,7 +229,7 @@ static QCString substituteHtmlKeywords(const QCString &s, const QCString &relPath, const QCString &navPath=QCString()) { - // Build CSS/Javascript tags depending on treeview, search engine settings + // Build CSS/JavaScript tags depending on treeview, search engine settings QCString cssFile; QStrList extraCssFile; QCString generatedBy; @@ -487,7 +487,7 @@ void HtmlCodeGenerator::codify(const char *str) void HtmlCodeGenerator::docify(const char *str) { - m_t << getHtmlDirEmbedingChar(getTextDirByConfig(str)); + m_t << getHtmlDirEmbeddingChar(getTextDirByConfig(str)); if (str && m_streamSet) { diff --git a/src/latexgen.cpp b/src/latexgen.cpp index addde4c..7d54f7a 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -1938,7 +1938,7 @@ void LatexGenerator::writeNonBreakableSpace(int) // startDescTable() // - startDescTableRow() // - startDescTableTitle() -// - endDescTabelTitle() +// - endDescTableTitle() // - startDescTableData() // - endDescTableData() // - endDescTableRow() diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 99ed224..e03d1df 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -2181,7 +2181,7 @@ bool MemberDefImpl::isBriefSectionVisible() const //printf("visibleIfStatic=%d visibleIfDocumented=%d visibleIfEnabled=%d " - // "visibleIfPrivate=%d visibltIfNotDefaultCDTor=%d " + // "visibleIfPrivate=%d visibleIfNotDefaultCDTor=%d " // "visibleIfFriendCompound=%d !annScope=%d\n", // visibleIfStatic,visibleIfDocumented, // visibleIfEnabled,visibleIfPrivate,visibleIfNotDefaultCDTor, @@ -2744,7 +2744,7 @@ bool MemberDefImpl::isDetailedSectionVisible(bool inGroup,bool inFile) const bool visible = isDetailedSectionLinkable() && groupFilter && fileFilter && !isReference(); bool result = visible || simpleFilter; - //printf("%s::isDetailedSectionVisble: %d groupFilter=%d fileFilter=%d\n", + //printf("%s::isDetailedSectionVisible: %d groupFilter=%d fileFilter=%d\n", // name().data(),result,groupFilter,fileFilter); return result; } diff --git a/src/plantuml.h b/src/plantuml.h index 6c99eba..d3a01f5 100644 --- a/src/plantuml.h +++ b/src/plantuml.h @@ -64,7 +64,7 @@ class PlantumlManager QDict< QList<QCString> > m_pngPlantumlFiles; QDict< QList<QCString> > m_svgPlantumlFiles; QDict< QList<QCString> > m_epsPlantumlFiles; - QDict< QCString > m_pngPlantumlContent; // use circular queue for using multi-proecessor (multi threading) + QDict< QCString > m_pngPlantumlContent; // use circular queue for using multi-processor (multi threading) QDict< QCString > m_svgPlantumlContent; QDict< QCString > m_epsPlantumlContent; QCString m_cachedPlantumlAllContent; // read from CACHE_FILENAME file diff --git a/src/searchindex.cpp b/src/searchindex.cpp index 22d33b6..eee1aa1 100644 --- a/src/searchindex.cpp +++ b/src/searchindex.cpp @@ -731,7 +731,7 @@ static QCString searchId(const QCString &s) return result; } -void createJavascriptSearchIndex() +void createJavaScriptSearchIndex() { bool sliceOpt = Config_getBool(OPTIMIZE_OUTPUT_SLICE); @@ -953,7 +953,7 @@ void createJavascriptSearchIndex() } } -void writeJavascriptSearchIndex() +void writeJavaScriptSearchIndex() { int i; int cnt = 0; diff --git a/src/searchindex.h b/src/searchindex.h index 8cbe352..923973c 100644 --- a/src/searchindex.h +++ b/src/searchindex.h @@ -165,8 +165,8 @@ struct SearchIndexInfo QCString text; }; -void createJavascriptSearchIndex(); -void writeJavascriptSearchIndex(); +void createJavaScriptSearchIndex(); +void writeJavaScriptSearchIndex(); const SearchIndexInfo *getSearchIndices(); #endif diff --git a/src/translator.h b/src/translator.h index ac55911..188b775 100644 --- a/src/translator.h +++ b/src/translator.h @@ -51,12 +51,12 @@ class Translator */ virtual QCString latexFontenc() { return "T1"; } /*! - * Sets the commands to be insered directly after the `\\begin{document}` + * Sets the commands to be inserted directly after the `\\begin{document}` * in the LaTeX document. */ virtual QCString latexDocumentPre() { return ""; } /*! - * Sets the commands to be insered directly before the `\\end{document}` + * Sets the commands to be inserted directly before the `\\end{document}` * in the LaTeX document. */ virtual QCString latexDocumentPost() { return ""; } diff --git a/src/util.cpp b/src/util.cpp index 4c3ebb0..9c46516 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -3376,7 +3376,7 @@ static QCString getCanonicalTypeForIdentifier( if (cd && cd->isUsedOnly()) cd=0; // ignore types introduced by usage relations //printf("cd=%p mtype=%p\n",cd,mType); - //printf(" getCanonicalTypeForIdentifer: symbol=%s word=%s cd=%s d=%s fs=%s cd->isTemplate=%d\n", + //printf(" getCanonicalTypeForIdentifier: symbol=%s word=%s cd=%s d=%s fs=%s cd->isTemplate=%d\n", // symName.data(), // word.data(), // cd?cd->name().data():"<none>", @@ -5966,7 +5966,7 @@ QCString convertToHtml(const char *s,bool keepEntities) static GrowBuf growBuf; growBuf.clear(); if (s==0) return ""; - growBuf.addStr(getHtmlDirEmbedingChar(getTextDirByConfig(s))); + growBuf.addStr(getHtmlDirEmbeddingChar(getTextDirByConfig(s))); const char *p=s; char c; while ((c=*p++)) @@ -6014,7 +6014,7 @@ QCString convertToJSString(const char *s, bool applyTextDir) growBuf.clear(); if (s==0) return ""; if (applyTextDir) - growBuf.addStr(getJsDirEmbedingChar(getTextDirByConfig(s))); + growBuf.addStr(getJsDirEmbeddingChar(getTextDirByConfig(s))); const char *p=s; char c; while ((c=*p++)) @@ -8395,7 +8395,7 @@ QCString langToString(SrcLangExt lang) case SrcLangExt_PHP: return "PHP"; case SrcLangExt_ObjC: return "Objective-C"; case SrcLangExt_Cpp: return "C++"; - case SrcLangExt_JS: return "Javascript"; + case SrcLangExt_JS: return "JavaScript"; case SrcLangExt_Python: return "Python"; case SrcLangExt_Fortran: return "Fortran"; case SrcLangExt_VHDL: return "VHDL"; diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index 66d8384..3c30174 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -82,7 +82,7 @@ static QList<MemberDef>* getPorts(ClassDef *cd); static void writeVhdlEntityToolTip(FTextStream& t,ClassDef *cd); static void endDot(FTextStream &t); static void writeTable(QList<MemberDef>* port,FTextStream & t); -static void endTabel(FTextStream &t); +static void endTable(FTextStream &t); static void writeClassToDot(FTextStream &t,ClassDef* cd); static void writeVhdlDotLink(FTextStream &t,const QCString &a,const QCString &b,const QCString &style); //static void writeVhdlPortToolTip(FTextStream& t,QList<MemberDef>* port,ClassDef *cd); @@ -228,7 +228,7 @@ void VhdlDocGen::writeOverview() startTable(t,cd->name()); writeClassToDot(t,cd); writeTable(port,t); - endTabel(t); + endTable(t); // writeVhdlPortToolTip(t,port,cd); writeVhdlEntityToolTip(t,cd); @@ -448,7 +448,7 @@ static void writeColumn(FTextStream &t,MemberDef *md,bool start) } } -static void endTabel(FTextStream &t) +static void endTable(FTextStream &t) { t << "</TABLE>>\n"; t << "] \n"; diff --git a/src/vhdljjparser.h b/src/vhdljjparser.h index f6cd17d..f3e7d70 100644 --- a/src/vhdljjparser.h +++ b/src/vhdljjparser.h @@ -61,7 +61,7 @@ struct VhdlConfNode { arch=a; // architecture e.g. for iobuffer arch=arch.lower(); - binding=b; // binding e.g. use entiy work.xxx(bev) + binding=b; // binding e.g. use entity work.xxx(bev) binding=binding.lower(); confVhdl=config; // configuration foo is bar compSpec=cs; diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty index 83891a5..78a5254 100644 --- a/templates/latex/doxygen.sty +++ b/templates/latex/doxygen.sty @@ -94,7 +94,7 @@ \end{alltt}% \normalsize% } -% Necessary for redefining not defined charcaters, i.e. "Replacement Character" in tex output. +% Necessary for redefining not defined characters, i.e. "Replacement Character" in tex output. \newlength{\CodeWidthChar} \newlength{\CodeHeightChar} \settowidth{\CodeWidthChar}{?} diff --git a/templates/latex/tabu_doxygen.sty b/templates/latex/tabu_doxygen.sty index a5ab3dc..60fd7e8 100755 --- a/templates/latex/tabu_doxygen.sty +++ b/templates/latex/tabu_doxygen.sty @@ -1184,7 +1184,7 @@ \ifcase \count@
\global\let\tabu@elapsedtime \relax
\tabu@seteverycr
- \expandafter \tabuthepreamble % vertical adjustment (inheritated from outer)
+ \expandafter \tabuthepreamble % vertical adjustment (inherited from outer)
\or % exit in vertical measure + struts per cell because no X and outer in mode 3
\tabu@evr{\tabu@verticalinit}\tabu@celllalign@def{\tabu@verticalmeasure}%
\def\tabu@cellralign{\tabu@verticalspacing}%
diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd index 954141d..60a0b09 100644 --- a/templates/xml/compound.xsd +++ b/templates/xml/compound.xsd @@ -765,7 +765,7 @@ <xsd:enumeration value="PHP" /> <xsd:enumeration value="Objective-C" /> <xsd:enumeration value="C++" /> - <xsd:enumeration value="Javascript" /> + <xsd:enumeration value="JavaScript" /> <xsd:enumeration value="Python" /> <xsd:enumeration value="Fortran" /> <xsd:enumeration value="VHDL" /> diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h index 2543ad1..69b8ab5 100644 --- a/vhdlparser/CharStream.h +++ b/vhdlparser/CharStream.h @@ -61,7 +61,7 @@ public: * Backs up the input stream by amount steps. Lexer calls this method if it * had already read some characters, but could not use them to match a * (longer) token. So, they will be used again as the prefix of the next - * token and it is the implemetation's responsibility to do this right. + * token and it is the implementation's responsibility to do this right. */ virtual inline void backup(int amount) { inBuf += amount; diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h index 9f7dc07..224500e 100644 --- a/vhdlparser/ErrorHandler.h +++ b/vhdlparser/ErrorHandler.h @@ -31,7 +31,7 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str); // Called when the parser cannot continue parsing. // last - the last token successfully parsed. // unexpected - the token at which the error occurs. - // production - the production in which this error occurrs. + // production - the production in which this error occurs. virtual void handleParseError(Token *last, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *parser) { error_count++; fprintf(stderr, "Encountered: %s at: %d:%d while parsing: %s\n", addUnicodeEscapes(unexpected->image).c_str(), unexpected->beginLine, unexpected->beginColumn, production.c_str()); diff --git a/vhdlparser/ParseException.cc b/vhdlparser/ParseException.cc index 6ef9738..375ff6c 100644 --- a/vhdlparser/ParseException.cc +++ b/vhdlparser/ParseException.cc @@ -53,7 +53,7 @@ namespace parser { /** * This is the last token that has been consumed successfully. If * this object has been created due to a parse error, the token - * followng this token will (therefore) be the first error token. + * following this token will (therefore) be the first error token. */ Token currentToken; diff --git a/vhdlparser/ParseException.h b/vhdlparser/ParseException.h index c36613f..4a22772 100644 --- a/vhdlparser/ParseException.h +++ b/vhdlparser/ParseException.h @@ -50,7 +50,7 @@ class ParseException { /** * This is the last token that has been consumed successfully. If * this object has been created due to a parse error, the token - * followng this token will (therefore) be the first error token. + * following this token will (therefore) be the first error token. */ Token currentToken; |