diff options
| -rw-r--r-- | addon/doxysearch/doxysearch.cpp | 6 | ||||
| -rw-r--r-- | addon/doxywizard/expert.cpp | 2 | ||||
| -rw-r--r-- | src/fortrancode.l | 12 | ||||
| -rw-r--r-- | vhdlparser/ErrorHandler.h | 2 |
4 files changed, 12 insertions, 10 deletions
diff --git a/addon/doxysearch/doxysearch.cpp b/addon/doxysearch/doxysearch.cpp index d885502..f6946ef 100644 --- a/addon/doxysearch/doxysearch.cpp +++ b/addon/doxysearch/doxysearch.cpp @@ -116,7 +116,7 @@ static std::string uriDecode(const std::string & sSrc) } /** return list of strings that result when splitting \a s using - * delimeter \a delim + * delimiter \a delim */ static std::vector<std::string> split(const std::string &s, char delim) { @@ -137,7 +137,7 @@ T fromString(const std::string& s) return t; } -/** Class that holds the startin position of a word */ +/** Class that holds the starting position of a word */ struct WordPosition { WordPosition(int s,int i) : start(s), index(i) {} @@ -196,7 +196,7 @@ static bool insideRange(const std::vector<Range> &ranges,int start,int len) } /** Returns a list of text \a fragments from \a s containing one or - * more \a words. The list is sorted occording to the + * more \a words. The list is sorted according to the * number of occurrences of words within the fragment. */ static void highlighter(const std::string &s, diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp index 1cc5d15..3a03c69 100644 --- a/addon/doxywizard/expert.cpp +++ b/addon/doxywizard/expert.cpp @@ -452,7 +452,7 @@ static QString getDocsForNode(const QDomElement &child) // LaTeX name as formula -> LaTeX regexp.setPattern(SA("\\\\f\\$\\\\mbox\\{\\\\LaTeX\\}\\\\f\\$")); docs.replace(regexp,SA("LaTeX")); - // Other forula's (now just 2) so explicitely mentioned. + // Other formula's (now just 2) so explicitly mentioned. regexp.setPattern(SA("\\\\f\\$2\\^\\{\\(16\\+\\\\mbox\\{LOOKUP\\\\_CACHE\\\\_SIZE\\}\\)\\}\\\\f\\$")); docs.replace(regexp,SA("2^(16+LOOKUP_CACHE_SIZE)")); regexp.setPattern(SA("\\\\f\\$2\\^\\{16\\} = 65536\\\\f\\$")); diff --git a/src/fortrancode.l b/src/fortrancode.l index d2f1c42..f1a9da0 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -731,8 +731,8 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I /*-------- ignore ------------------------------------------------------------*/ -<Start>{IGNORE}/{BS}"("? { // do not search keywords, intrinsics... TODO: complete list - codifyLines(yytext); +<Start>{IGNORE}/{BS}"(" { // do not search keywords, intrinsics... TODO: complete list + codifyLines(yytext); } /*-------- inner construct ---------------------------------------------------*/ @@ -757,7 +757,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I codifyLines(yytext); endFontClass(); } -<Start>"end"({BS}{FLOW})/[ \t\n] { // list is a bit long as not all have possible end +<Start>{BS}"end"({BS}{FLOW})/[ \t\n] { // list is a bit long as not all have possible end startFontClass("keywordflow"); codifyLines(yytext); endFontClass(); @@ -979,9 +979,11 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I /*-------- subprog calls -----------------------------------------*/ <Start>"call"{BS_} { - codifyLines(yytext); + startFontClass("keyword"); + codifyLines(yytext); + endFontClass(); yy_push_state(YY_START); - BEGIN(SubCall); + BEGIN(SubCall); } <SubCall>{ID} { // subroutine call g_insideBody=TRUE; diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h index 8197aea..f5e53e4 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()); |