Merge pull request #1412 from k-takata/fix-typo

Fix typos

Tmain/nested-mio.d/stdout-expected.txt

@@ -1 +1 @@
-NOTHING_SPEICAL	input.cst	/^N$/;"	N
+NOTHING_SPECIAL	input.cst	/^N$/;"	N

main/entry.c

@@ -1245,7 +1245,7 @@ extern int makeQualifiedTagEntry (const tagEntryInfo *const e)
 			if (sep == NULL)
 			{
 				/* No root separator. The name of the
-				   oritinal tag and that of full qualified tag
+				   optional tag and that of full qualified tag
 				   are the same; recording the full qualified tag
 				   is meaningless. */
 				return r;
@@ -1257,7 +1257,7 @@ extern int makeQualifiedTagEntry (const tagEntryInfo *const e)
 
 		x.name = vStringValue (fqn);
 		/* makeExtraTagEntry of c.c doesn't clear scope
-		   releated fields. */
+		   related fields. */
 #if 0
 		x.extensionFields.scopeKind = NULL;
 		x.extensionFields.scopeName = NULL;

main/fmt.c

@@ -278,7 +278,7 @@ extern fmtElement *fmtNew (const char*  fmtString)
 				if (width)
 				{
 					if(!strToLong (vStringValue (width), 0, &column_width))
-						error (FATAL | PERROR, "coverting failed: %s", vStringValue (width));
+						error (FATAL | PERROR, "converting failed: %s", vStringValue (width));
 					vStringDelete (width);
 					width = NULL;
 					column_width *= justification_right;

main/kind.h

@@ -66,7 +66,7 @@ struct sKindDefinition {
 	/* Usage of `syncWith' field is a bit tricky.
 
 	   If `LANG_AUTO' is specified to `syncWith' field of a kind
-	   (target kind), the main part of ctags updtes the field with
+	   (target kind), the main part of ctags updates the field with
 	   the id of a  parser (master parser) when initializing
 	   parsers. It also updates `slave' and `master' fields.
 

main/lregex.c

@@ -353,12 +353,12 @@ static void pre_ptrn_flag_multiline_long (const char* const s, const char* const
 	}
 	if (!strToInt (v, 10, data))
 	{
-		error (WARNING, "wrong multiline specificaiton: %s", v);
+		error (WARNING, "wrong multiline specification: %s", v);
 		*((int *)data) = -1;
 	}
 	else if (*((int *)data) < 0 || *((int *)data) >= BACK_REFERENCE_COUNT)
 	{
-		error (WARNING, "out of range(0 ~ %d) multiline specificaiton: %s",
+		error (WARNING, "out of range(0 ~ %d) multiline specification: %s",
 		       (BACK_REFERENCE_COUNT - 1), v);
 		*((int *)data) = -1;
 	}

main/lxcmd.c

@@ -460,7 +460,7 @@ static bool enable_kind_cb (kindDefinition *kind, void *data)
 		kind->enabled = kmr->mode;
 		kmr->result = true;
 	}
-	/* conitnue:
+	/* continue:
 	   There can be more than one paths which deals this kind.
 	   Consider /bin/X and /bin/Y are both parser for a language L.
 	   ctags --langdef=L --xcmd-L=/bin/X --xcmd-L=/bin/Y ... */

main/mio.c

@@ -732,7 +732,7 @@ size_t mio_write (MIO *mio,
  * Writes a character to a #MIO stream. This function behaves the same as
  * fputc().
  *
- * Returns: The written wharacter, or %EOF on error.
+ * Returns: The written character, or %EOF on error.
  */
 int mio_putc (MIO *mio, int c)
 {
@@ -796,7 +796,7 @@ int mio_puts (MIO *mio, const char *s)
 /**
  * mio_vprintf:
  * @mio: A #MIO object
- * @format: A printf fomrat string
+ * @format: A printf format string
  * @ap: The variadic argument list for the format
  *
  * Writes a formatted string into a #MIO stream. This function behaves the same
@@ -1100,7 +1100,7 @@ int mio_error (MIO *mio)
  *          SEEK_CUR from the current position and SEEK_SET from the end of the
  *          stream.
  *
- * Sets the curosr position on a #MIO stream. This functions behaves the same as
+ * Sets the cursor position on a #MIO stream. This functions behaves the same as
  * fseek(). See also mio_tell() and mio_setpos().
  *
  * Returns: 0 on success, -1 otherwise, in which case errno should be set to

main/options.c

@@ -412,7 +412,7 @@ static optionDescription LongOptionDescription [] = {
  {1,"  --version"},
  {1,"       Print version identifier to standard output."},
  {1,"  --with-list-header=[yes|no]"},
- {1,"       Preprend the column descriptions in --list- output. [yes]"},
+ {1,"       Prepend the column descriptions in --list- output. [yes]"},
  {1,"       --list-extras, --list-fields, --list-kinds-full, and --list-params support this option."},
  {1,"       Specify before --list-* option."},
 #ifdef HAVE_COPROC
@@ -1983,7 +1983,7 @@ static void processListRolesOptions (const char *const option CTAGS_ATTR_UNUSED,
 		vString* vstr = vStringNewInit (parameter);
 		vStringCatS (vstr, (sep? "*": ".*"));
 		processListRolesOptions (option, vStringValue (vstr));
-		/* The control should never reache here. */
+		/* The control should never reached here. */
 	}
 
 	kindletters = sep + 1;
@@ -2768,7 +2768,7 @@ static bool processLangSpecificFieldsOption (const char *const option,
 	if (language == LANG_IGNORE)
 	{
 		error (WARNING, "Unknown language: %s (ignoring \"--%s\")", lang, option);
-		/* The option is consumed in tihs function. */
+		/* The option is consumed in this function. */
 		return true;
 	}
 
@@ -2869,7 +2869,7 @@ static bool processLangSpecificExtraOption (const char *const option,
 	if (language == LANG_IGNORE)
 	{
 		error (WARNING, "Unknown language: %s (ignoring \"--%s\")", lang, option);
-		/* The option is consumed in tihs function. */
+		/* The option is consumed in this function. */
 		return true;
 	}
 

main/parse.c

@@ -1117,7 +1117,7 @@ getFileLanguageForRequestInternal (struct GetLanguageRequest *req)
        candidates.
 
        If a hint chooses multiple candidates, and selection failure is
-       occured, the hint records one of the candidates as FALLBACK for
+       occurred, the hint records one of the candidates as FALLBACK for
        the hint. (The candidates are stored in an array. The first
        element of the array is recorded. However, there is no
        specification about the order of elements in the array.)
@@ -1712,7 +1712,7 @@ static void pre_lang_def_flag_base_long (const char* const optflag, const char*
 	base = getNamedLanguage (param, 0);
 	if (base == LANG_IGNORE)
 	{
-		error (WARNING, "Unknown laguage(%s) is specified for \"%s\" flag of --langdef option",
+		error (WARNING, "Unknown language(%s) is specified for \"%s\" flag of --langdef option",
 			   param, optflag);
 		return;
 
@@ -3582,7 +3582,7 @@ static void createCTSTTags (void)
 					case K_NOTHING_SPECIAL:
 						if (!lb)
 						{
-							initTagEntry (&e, "NOTHING_SPEICAL", &CTST_Kinds[i]);
+							initTagEntry (&e, "NOTHING_SPECIAL", &CTST_Kinds[i]);
 							makeTagEntry (&e);
 						}
 						break;

main/parse.h

@@ -51,7 +51,7 @@ typedef void (*parserInitialize) (langType language);
 
    The finalizer is called even when the initializer of the
    same parser is called or not. However, the finalizer can know
-   whether the assoiciated initializer is invoked or not with the
+   whether the associated initializer is invoked or not with the
    second parameter: INITIALIZED. If it is true, the initializer
    is called. */
 typedef void (*parserFinalize) (langType language, bool initialized);

main/read.c

@@ -109,7 +109,7 @@ typedef struct sInputFile {
 	   be referred from tagsEntryInfo instances. sourceTagPathHolder
 	   is used keeping the buffer till all processing about the current
 	   input file is done. After all processing is done, the buffers
-	   in sourceTagPathHolder are destroied. */
+	   in sourceTagPathHolder are destroyed. */
 	stringList  * sourceTagPathHolder;
 	inputLineFposMap lineFposMap;
 	vString *allLines;
@@ -763,7 +763,7 @@ static void readLine (vString *const vLine, MIO *const mio)
 
 		/* Turn line breaks into a canonical form. The three commonly
 		 * used forms of line breaks are: LF (UNIX/Mac OS X), CR-LF (MS-DOS) and
-		 * CR (Mac OS 9). As CR-only EOL isn't haneled by gets() and Mac OS 9
+		 * CR (Mac OS 9). As CR-only EOL isn't handled by gets() and Mac OS 9
 		 * is dead, we only handle CR-LF EOLs and convert them into LF. */
 		if (newLine && vStringLength (vLine) > 1 &&
 			vStringItem (vLine, vStringLength (vLine) - 2) == '\r')

main/read.h

@@ -75,7 +75,7 @@ extern bool isParserMarkedNoEmission (void);
 extern void freeInputFileResources (void);
 extern const unsigned char *getInputFileData (size_t *size);
 
-/* Stream opend by getMio can be passed to openInputFile as the 3rd
+/* Stream opened by getMio can be passed to openInputFile as the 3rd
    argument. If the 3rd argument is NULL, openInputFile calls getMio
    internally. The 3rd argument is introduced for reusing mio object
    created in parser guessing stage. */

main/trashbox.h

@@ -6,7 +6,7 @@
 *   This source code is released for free distribution under the terms of the
 *   GNU General Public License version 2 or (at your option) any later version.
 *
-*   Facility for delayed memory releasing, insptired from AutoreleasePool
+*   Facility for delayed memory releasing, inspired from AutoreleasePool
 *   of OpenStep.
 */
 

main/writer-json.c

@@ -23,7 +23,7 @@
 #ifdef HAVE_JANSSON
 #include <jansson.h>
 
-#ifndef json_boolean /* compat with jannson < 2.4 */
+#ifndef json_boolean /* compat with jansson < 2.4 */
 #define json_boolean(val)      ((val) ? json_true() : json_false())
 #endif
 

main/xtag.h

@@ -42,7 +42,7 @@ typedef struct sXtagDefinition {
 
 	   "enabled" field of Pseudo extra tag depends on where
 	   the output stream is connected to. If it is connected
-	   to standared output, the tag is disabled by default.
+	   to standard output, the tag is disabled by default.
 	   If it is connected to a regular file, the tag is enabled
 	   by default. */
 	bool (* isEnabled) (struct sXtagDefinition *def);

man/ctags.1.rst.in

@@ -612,12 +612,12 @@ built-in language names.
 	suffixed with .ctags or .conf under the directory are read. (On MSDOS or
 	MSWindows this directory traverse feature is temporary disable because
 	the contributor of this feature has no access to the platforms.
-	Volunters are welcome). As a special case, if --options=NONE is
+	Volunteers are welcome). As a special case, if --options=NONE is
 	specified as the first option on the command line, it will disable
 	the automatic reading of any configuration options from either a file
 	or the environment (see FILES).
 
- --quiet[=yes|no]
+--quiet[=yes|no]
 		Write fewer messages(default is no).
 
 --recurse[=yes|no]
@@ -1005,7 +1005,7 @@ TMPDIR
 	files only if either (1) an emacs-style tag file is being
 	generated, (2) the tag file is being sent to standard output, or
 	(3) the program was compiled to use an internal sort algorithm to sort
-	the tag files instead of the the sort utility of the operating system.
+	the tag files instead of the sort utility of the operating system.
 	If the sort utility of the operating system is being used, it will
 	generally observe this variable also. Note that if @CTAGS_NAME_EXECUTABLE@
 	is setuid, the value of TMPDIR will be ignored.

parsers/ada.c

@@ -905,7 +905,7 @@ static adaTokenInfo *adaParseBlock(adaTokenInfo *parent, adaKind kind)
   }
 
   /* we must parse until we hit the "is" string to reach the end of
-   * this package declaration, or a "reanames" keyword */
+   * this package declaration, or a "renames" keyword */
   while(token != NULL)
   {
     skipWhiteSpace();

parsers/cpreprocessor.c

@@ -1639,7 +1639,7 @@ static void saveMacro(const char * macro)
 					while(*c == '#')
 						c++;
 
-					// we just skip this part and the followin spaces
+					// we just skip this part and the following spaces
 					while(*c && isspacetab(*c))
 						c++;
 

parsers/cpreprocessor.h

@@ -78,7 +78,7 @@ extern int cppGetc (void);
 extern int cppSkipOverCComment (void);
 
 /* notify the external parser state for the purpose of conditional
-   branche choice. The CXX parser stores the block level here. */
+   branch choice. The CXX parser stores the block level here. */
 extern void cppPushExternalParserBlock();
 extern void cppPopExternalParserBlock();
 

parsers/cxx/cxx_parser.c

@@ -105,11 +105,11 @@ bool cxxParserParseAndCondenseCurrentSubchain(
 
 //
 // This function parses input until one of the specified tokens appears.
-// The current token is NOT checked agains the specified tokens.
+// The current token is NOT checked against the specified tokens.
 //
 // The algorithm will also build subchains of matching
 // pairs ([...],(...),<...>,{...}): within the subchain analysis
-// of uTokenTypes is completly disabled. Subchains do nest.
+// of uTokenTypes is completely disabled. Subchains do nest.
 //
 // Returns true if it stops before EOF or it stops at EOF and CXXTokenTypeEOF
 // is present in uTokenTypes. Returns false in all the other stop conditions
@@ -221,7 +221,7 @@ bool cxxParserParseAndCondenseSubchainsUpToOneOf(
 			continue; // jump up to avoid checking for mismatched pairs below
 		}
 
-		// Check for mismatched brackets/parenthis
+		// Check for mismatched brackets/parentheses
 		// Note that if we were looking for one of [({ then we would have matched
 		// it at the top of the for
 		if(cxxTokenTypeIsOneOf(g_cxx.pToken,uFinalSubchainMarkerTypes))
@@ -247,10 +247,10 @@ bool cxxParserParseAndCondenseSubchainsUpToOneOf(
 
 //
 // This function parses input until one of the specified tokens appears.
-// The current token is NOT checked agains the specified tokens.
+// The current token is NOT checked against the specified tokens.
 //
 // The algorithm will also build subchains of matching pairs ([...],(...),{...}).
-// Within the subchain analysis of uTokenTypes is completly disabled.
+// Within the subchain analysis of uTokenTypes is completely disabled.
 // Subchains do nest.
 //
 // Please note that this function will skip entire scopes (matching {} pairs)
@@ -921,7 +921,7 @@ static bool cxxParserParseClassStructOrUnionInternal(
 		// }
 
 		// FIXME: Should we add the specialisation arguments somewhere?
-		//        Maye as a separate field?
+		//        Maybe as a separate field?
 
 		bRet = cxxParserParseAndCondenseCurrentSubchain(
 					CXXTokenTypeOpeningParenthesis | CXXTokenTypeOpeningBracket |
@@ -973,7 +973,7 @@ static bool cxxParserParseClassStructOrUnionInternal(
 			(!(uInitialKeywordState & CXXParserKeywordStateSeenTypedef))
 		)
 	{
-		CXX_DEBUG_PRINT("Maybe KnR funciton definition?");
+		CXX_DEBUG_PRINT("Maybe KnR function definition?");
 
 		switch(cxxParserMaybeParseKnRStyleFunctionDefinition())
 		{

parsers/cxx/cxx_parser_block.c

@@ -71,7 +71,7 @@ bool cxxParserParseBlockHandleOpeningBracket(void)
 						(strcmp(vStringValue(g_cxx.pToken->pPrev->pszWord),"override") != 0)
 					) || (
 						// type var[][][]..[] { ... }
-						// (but not '[] { ... }' which is a parameterelss lambda)
+						// (but not '[] { ... }' which is a parameterless lambda)
 						cxxTokenTypeIs(g_cxx.pToken->pPrev,CXXTokenTypeSquareParenthesisChain) &&
 						(
 							pAux = cxxTokenChainPreviousTokenNotOfType(