CPreProcessor,refactor: make `enum eCppCharacters' CPreProcessor private

Except STRING_SYMBOL and CHAR_SYMBOL, the character names are
used only in CPreProcessor.

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

parsers/asm.c

@@ -399,7 +399,7 @@ static bool collectCppMacroArguments (ptrArray *args)
 			ptrArrayAdd (args, cstr);
 			s = vStringNew ();
 		}
-		else if (c == STRING_SYMBOL || c == CHAR_SYMBOL)
+		else if (c == CPP_STRING_SYMBOL || c == CPP_CHAR_SYMBOL)
 			vStringPut (s, ' ');
 		else
 			vStringPut (s, c);
@@ -425,7 +425,7 @@ static bool expandCppMacro (cppMacroInfo *macroInfo)
 		while (1)
 		{
 			c = cppGetc ();
-			if (c == STRING_SYMBOL || c == CHAR_SYMBOL || !isspace (c))
+			if (c == CPP_STRING_SYMBOL || c == CPP_CHAR_SYMBOL || !isspace (c))
 				break;
 		}
 
@@ -519,7 +519,7 @@ static const unsigned char *readLineViaCpp (const char *commentChars)
  cont:
 	while ((c = cppGetc()) != EOF)
 	{
-		if (c == STRING_SYMBOL || c == CHAR_SYMBOL)
+		if (c == CPP_STRING_SYMBOL || c == CPP_CHAR_SYMBOL)
 		{
 			/* c == CHAR_SYMBOL is subtle condition.
 			 * If the last char of IDENTIFIER is [0-9a-f],

parsers/c-based.c

@@ -2688,7 +2688,7 @@ static void parseGeneralToken (statementInfo *const st, const int c)
 	{
 		parseAtMarkStyleAnnotation (st);
 	}
-	else if (c == STRING_SYMBOL)
+	else if (c == CPP_STRING_SYMBOL)
 	{
 		setToken(st, TOKEN_NONE);
 	}

parsers/cpreprocessor.c

@@ -39,6 +39,25 @@
 /*
 *   DATA DECLARATIONS
 */
+enum eCppCharacters {
+	/* white space characters */
+	SPACE         = ' ',
+	NEWLINE       = '\n',
+	CRETURN       = '\r',
+	FORMFEED      = '\f',
+	TAB           = '\t',
+	VTAB          = '\v',
+
+	/* some hard to read characters */
+	DOUBLE_QUOTE  = '"',
+	SINGLE_QUOTE  = '\'',
+	BACKSLASH     = '\\',
+
+	/* symbolic representations, above 0xFF not to conflict with any byte */
+	STRING_SYMBOL = CPP_STRING_SYMBOL,
+	CHAR_SYMBOL   = CPP_CHAR_SYMBOL
+};
+
 typedef enum { COMMENT_NONE, COMMENT_C, COMMENT_CPLUS, COMMENT_D } Comment;
 
 enum eCppLimits {

parsers/cpreprocessor.h

@@ -19,32 +19,12 @@
 #include "types.h"
 #include "vstring.h"
 
-/*
-*   DATA DECLARATIONS
-*/
-
-enum eCharacters {
-	/* white space characters */
-	SPACE         = ' ',
-	NEWLINE       = '\n',
-	CRETURN       = '\r',
-	FORMFEED      = '\f',
-	TAB           = '\t',
-	VTAB          = '\v',
-
-	/* some hard to read characters */
-	DOUBLE_QUOTE  = '"',
-	SINGLE_QUOTE  = '\'',
-	BACKSLASH     = '\\',
-
-	/* symbolic representations, above 0xFF not to conflict with any byte */
-	STRING_SYMBOL = ('S' + 0xff),
-	CHAR_SYMBOL   = ('C' + 0xff)
-};
-
 /*
 *   MACROS
 */
+/* symbolic representations, above 0xFF not to conflict with any byte */
+#define CPP_STRING_SYMBOL ('S' + 0xff)
+#define CPP_CHAR_SYMBOL ('C' + 0xff)
 
 /*
  * cppIs... macros are for the value returned from cppGetc().  Don't

parsers/cxx/cxx_parser_tokenizer.c

@@ -1530,7 +1530,7 @@ bool cxxParserParseNextToken(void)
 		return true;
 	}
 #else
-	if(g_cxx.iChar == STRING_SYMBOL)
+	if(g_cxx.iChar == CPP_STRING_SYMBOL)
 	{
 		t->eType = CXXTokenTypeStringConstant;
 		cStringPut(t->pszWord,g_cxx.iChar);
@@ -1576,7 +1576,7 @@ bool cxxParserParseNextToken(void)
 		return true;
 	}
 #else
-	if(g_cxx.iChar == CHAR_SYMBOL)
+	if(g_cxx.iChar == CPP_CHAR_SYMBOL)
 	{
 		t->eType = CXXTokenTypeCharacterConstant;
 		cStringPut(t->pszWord,g_cxx.iChar);

parsers/ldscript.c

@@ -380,7 +380,7 @@ static void readToken (tokenInfo *const token, void *data CTAGS_ATTR_UNUSED)
 		if (prefix_count > 0)
 			LDSCRIPT (token)->whitespacePrefixed = true;
 	} while (c == ' ' || c== '\t' || c == '\f' || c == '\r' || c == '\n'
-			 || c == STRING_SYMBOL || c == CHAR_SYMBOL);
+			 || c == CPP_STRING_SYMBOL || c == CPP_CHAR_SYMBOL);
 
 	token->lineNumber   = getInputLineNumber ();
 	token->filePosition = getInputFilePosition ();

parsers/protobuf.c

@@ -206,7 +206,7 @@ static void nextTokenFull (bool expectingStringLiteral)
 		token.keyword = lookupCaseKeyword (vStringValue (token.value), Lang_protobuf);
 		cppUngetc (c);
 	}
-	else if (expectingStringLiteral && c == STRING_SYMBOL)
+	else if (expectingStringLiteral && c == CPP_STRING_SYMBOL)
 	{
 		token.type = TOKEN_STR;
 		vStringCopy (token.value,

parsers/vera.c

@@ -1914,7 +1914,7 @@ static void parseGeneralToken (statementInfo *const st, const int c)
 		if (c2 != '=')
 			cppUngetc (c2);
 	}
-	else if (c == STRING_SYMBOL) {
+	else if (c == CPP_STRING_SYMBOL) {
 		setToken(st, TOKEN_NONE);
 	}
 }