Skip to content

Commit 6667c46

Browse files
committed
CPreProcessor,refactor: rename cStringPut to cppVStringPut
Signed-off-by: Masatake YAMATO <[email protected]>
1 parent e1c4ac1 commit 6667c46

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

parsers/c-based.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ static void skipToMatch (const char *const pair)
14851485
while (matchLevel > 0 && (c = skipToNonWhite ()) != EOF)
14861486
{
14871487
if (CollectingSignature)
1488-
cStringPut (Signature, c);
1488+
cppVStringPut (Signature, c);
14891489

14901490
if (c == begin)
14911491
{
@@ -1571,11 +1571,11 @@ static void readIdentifier (tokenInfo *const token, const int firstChar)
15711571

15721572
do
15731573
{
1574-
cStringPut (name, c);
1574+
cppVStringPut (name, c);
15751575
if (CollectingSignature)
15761576
{
15771577
if (!first)
1578-
cStringPut (Signature, c);
1578+
cppVStringPut (Signature, c);
15791579
first = false;
15801580
}
15811581
c = cppGetc ();
@@ -1704,7 +1704,7 @@ static void readOperator (statementInfo *const st)
17041704
vStringPut (name, ' ');
17051705
whiteSpace = false;
17061706
}
1707-
cStringPut (name, c);
1707+
cppVStringPut (name, c);
17081708
}
17091709
c = cppGetc ();
17101710
} while (! isOneOf (c, "(;") && c != EOF);
@@ -2296,7 +2296,7 @@ static int parseParens (statementInfo *const st, parenInfo *const info)
22962296
{
22972297
int c = skipToNonWhite ();
22982298

2299-
cStringPut (Signature, c);
2299+
cppVStringPut (Signature, c);
23002300
switch (c)
23012301
{
23022302
case '^':

parsers/cpreprocessor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,7 @@ static void conditionMayPut (vString *condition, int c)
15521552
vStringPut(condition, c);
15531553
}
15541554

1555-
extern void cStringPut (vString* string, const int c)
1555+
extern void cppVStringPut (vString* string, const int c)
15561556
{
15571557
if (c <= 0xff)
15581558
vStringPut (string, c);

parsers/cpreprocessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ extern const vString * cppGetLastCharOrStringContents (void);
108108
/*
109109
* Replacement for vStringPut that can handle c > 0xff
110110
*/
111-
extern void cStringPut (vString * string, const int c);
111+
extern void cppVStringPut (vString * string, const int c);
112112

113113
/* Notify the external parser state for the purpose of conditional
114114
* branch choice. The CXX parser stores the block level here. */

parsers/cxx/cxx_parser_tokenizer.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ bool cxxParserParseNextToken(void)
15331533
if(g_cxx.iChar == CPP_STRING_SYMBOL)
15341534
{
15351535
t->eType = CXXTokenTypeStringConstant;
1536-
cStringPut(t->pszWord,g_cxx.iChar);
1536+
cppVStringPut(t->pszWord,g_cxx.iChar);
15371537
g_cxx.iChar = cppGetc();
15381538
t->bFollowedBySpace = cppIsspace(g_cxx.iChar);
15391539
return true;
@@ -1579,7 +1579,7 @@ bool cxxParserParseNextToken(void)
15791579
if(g_cxx.iChar == CPP_CHAR_SYMBOL)
15801580
{
15811581
t->eType = CXXTokenTypeCharacterConstant;
1582-
cStringPut(t->pszWord,g_cxx.iChar);
1582+
cppVStringPut(t->pszWord,g_cxx.iChar);
15831583
g_cxx.iChar = cppGetc();
15841584
t->bFollowedBySpace = cppIsspace(g_cxx.iChar);
15851585
return true;
@@ -1721,7 +1721,7 @@ bool cxxParserParseNextToken(void)
17211721
}
17221722

17231723
t->eType = CXXTokenTypeUnknown;
1724-
cStringPut(t->pszWord,g_cxx.iChar);
1724+
cppVStringPut(t->pszWord,g_cxx.iChar);
17251725
g_cxx.iChar = cppGetc();
17261726
t->bFollowedBySpace = cppIsspace(g_cxx.iChar);
17271727

0 commit comments

Comments
 (0)