sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some indentation style errors

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5566 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Colomban Wendling 2011-03-05 22:55:34 +00:00
parent 56d9dc4565
commit b82c07b4be
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
tagmanager/c.c
View File

@ -661,7 +661,7 @@ static void deleteToken (tokenInfo *const token)
static const char *accessString (const accessType laccess) static const char *accessString (const accessType laccess)
{ {
static const char *const names [] ={ static const char *const names [] = {
"?", "private", "protected", "public", "default" "?", "private", "protected", "public", "default"
}; };
Assert (sizeof (names) / sizeof (names [0]) == ACCESS_COUNT); Assert (sizeof (names) / sizeof (names [0]) == ACCESS_COUNT);
@ -671,7 +671,7 @@ static const char *accessString (const accessType laccess)
static const char *implementationString (const impType imp) static const char *implementationString (const impType imp)
{ {
static const char *const names [] ={ static const char *const names [] = {
"?", "abstract", "virtual", "pure virtual" "?", "abstract", "virtual", "pure virtual"
}; };
Assert (sizeof (names) / sizeof (names [0]) == IMP_COUNT); Assert (sizeof (names) / sizeof (names [0]) == IMP_COUNT);
@ -710,14 +710,14 @@ static const char *scopeString (const tagScope scope)
static const char *declString (const declType declaration) static const char *declString (const declType declaration)
{ {
static const char *const names [] = { static const char *const names [] = {
"?", "base", "class", "enum", "event", "signal", "function", "?", "base", "class", "enum", "event", "signal", "function",
"function template", "ignore", "interface", "module", "namespace", "function template", "ignore", "interface", "module", "namespace",
"no mangle", "package", "struct", "union", "no mangle", "package", "struct", "union",
}; };
Assert (sizeof (names) / sizeof (names [0]) == DECL_COUNT); Assert (sizeof (names) / sizeof (names [0]) == DECL_COUNT);
Assert ((int) declaration < DECL_COUNT); Assert ((int) declaration < DECL_COUNT);
return names[(int) declaration]; return names[(int) declaration];
} }
static const char *keywordString (const keywordId keyword) static const char *keywordString (const keywordId keyword)
@ -954,8 +954,7 @@ static void reinitStatement (statementInfo *const st, const boolean partial)
initToken (st->blockName); initToken (st->blockName);
vStringClear (st->parentClasses); vStringClear (st->parentClasses);
/* Init member info. /* Init member info. */
*/
if (! partial) if (! partial)
st->member.access = st->member.accessDefault; st->member.access = st->member.accessDefault;
@ -982,7 +981,7 @@ static void initStatement (statementInfo *const st, statementInfo *const parent)
st->parent = parent; st->parent = parent;
initMemberInfo (st); initMemberInfo (st);
reinitStatement (st, FALSE); reinitStatement (st, FALSE);
if(parent) if (parent)
{ {
const tokenInfo *const src = activeToken (parent); const tokenInfo *const src = activeToken (parent);
tokenInfo *const dst = activeToken (st); tokenInfo *const dst = activeToken (st);
@ -1183,11 +1182,11 @@ static const char* accessField (const statementInfo *const st)
static void addOtherFields (tagEntryInfo* const tag, const tagType type, static void addOtherFields (tagEntryInfo* const tag, const tagType type,
const statementInfo *const st, vString *const scope) const statementInfo *const st, vString *const scope)
{ {
/* For selected tag types, append an extension flag designating the /* For selected tag types, append an extension flag designating the
* parent object in which the tag is defined. * parent object in which the tag is defined.
*/ */
switch (type) switch (type)
{ {
default: break; default: break;
case TAG_CLASS: case TAG_CLASS:
@ -1216,7 +1215,6 @@ static void addOtherFields (tagEntryInfo* const tag, const tagType type,
if ((type == TAG_CLASS || type == TAG_INTERFACE || if ((type == TAG_CLASS || type == TAG_INTERFACE ||
type == TAG_STRUCT) && vStringLength (st->parentClasses) > 0) type == TAG_STRUCT) && vStringLength (st->parentClasses) > 0)
{ {
tag->extensionFields.inheritance = tag->extensionFields.inheritance =
vStringValue (st->parentClasses); vStringValue (st->parentClasses);
} }
@ -1548,7 +1546,8 @@ static void qualifyVariableTag (const statementInfo *const st,
else if (st->scope == SCOPE_GLOBAL || st->scope == SCOPE_STATIC) else if (st->scope == SCOPE_GLOBAL || st->scope == SCOPE_STATIC)
makeTag (nameToken, st, TRUE, TAG_MEMBER); makeTag (nameToken, st, TRUE, TAG_MEMBER);
} }
else if (isLanguage (Lang_java) || isLanguage (Lang_csharp) || isLanguage (Lang_vala)); else if (isLanguage (Lang_java) || isLanguage (Lang_csharp) || isLanguage (Lang_vala))
;
else else
{ {
if (st->scope == SCOPE_EXTERN || ! st->haveQualifyingName) if (st->scope == SCOPE_EXTERN || ! st->haveQualifyingName)
@ -2469,10 +2468,8 @@ static int parseParens (statementInfo *const st, parenInfo *const info)
skipToMatch ("()"); skipToMatch ("()");
--depth; --depth;
} }
if (st->argEndPosition == 0) if (st->argEndPosition == 0)
{ st->argEndPosition = mio_tell (File.mio);
st->argEndPosition = mio_tell(File.mio);
}
if (! info->isNameCandidate) if (! info->isNameCandidate)
initToken (token); initToken (token);
@ -2520,7 +2517,8 @@ static void analyzeParens (statementInfo *const st)
token->type = TOKEN_NAME; token->type = TOKEN_NAME;
processName (st); processName (st);
st->gotParenName = TRUE; st->gotParenName = TRUE;
if (isLanguage(Lang_d) && c == '(' && isType (prev, TOKEN_NAME)) { if (isLanguage(Lang_d) && c == '(' && isType (prev, TOKEN_NAME))
{
st->declaration = DECL_FUNCTION_TEMPLATE; st->declaration = DECL_FUNCTION_TEMPLATE;
copyToken (st->blockName, prev); copyToken (st->blockName, prev);
} }
@ -2855,12 +2853,12 @@ static void nest (statementInfo *const st, const unsigned int nestLevel)
static void tagCheck (statementInfo *const st) static void tagCheck (statementInfo *const st)
{ {
const tokenInfo *const token = activeToken (st); const tokenInfo *const token = activeToken (st);
const tokenInfo *const prev = prevToken (st, 1); const tokenInfo *const prev = prevToken (st, 1);
const tokenInfo *const prev2 = prevToken (st, 2); const tokenInfo *const prev2 = prevToken (st, 2);
switch (token->type) switch (token->type)
{ {
case TOKEN_NAME: case TOKEN_NAME:
{ {
if (insideEnumBody (st)) if (insideEnumBody (st))