Branch: refs/heads/master Author: Matthew Brush matt@geany.org Committer: Matthew Brush matt@geany.org Date: Sat, 04 Aug 2012 02:07:58 Commit: 63249c71e82a2fa9bd56b3e151f901a85fdea394 https://github.com/geany/geany/commit/63249c71e82a2fa9bd56b3e151f901a85fdea3...
Log Message: ----------- Dedent switch block from last commit, pure noise
Modified Paths: -------------- tagmanager/ctags/c.c
Modified: tagmanager/ctags/c.c 206 files changed, 103 insertions(+), 103 deletions(-) =================================================================== @@ -2363,132 +2363,132 @@ static int parseParens (statementInfo *const st, parenInfo *const info) { int c = skipToNonWhite ();
- switch (c) + switch (c) + { + case '&': + case '*': { - case '&': - case '*': - { - /* DEBUG_PRINT("parseParens, po++\n"); */ - info->isKnrParamList = FALSE; - if (identifierCount == 0) - info->isParamList = FALSE; - initToken (token); - break; - } - case ':': + /* DEBUG_PRINT("parseParens, po++\n"); */ + info->isKnrParamList = FALSE; + if (identifierCount == 0) + info->isParamList = FALSE; + initToken (token); + break; + } + case ':': + { + info->isKnrParamList = FALSE; + break; + } + case '.': + { + info->isNameCandidate = FALSE; + info->isKnrParamList = FALSE; + break; + } + case ',': + { + info->isNameCandidate = FALSE; + if (info->isKnrParamList) { - info->isKnrParamList = FALSE; - break; + ++info->parameterCount; + identifierCount = 0; } - case '.': + break; + } + case '=': + { + info->isKnrParamList = FALSE; + info->isNameCandidate = FALSE; + if (firstChar) { - info->isNameCandidate = FALSE; - info->isKnrParamList = FALSE; - break; + info->isParamList = FALSE; + skipMacro (st); + depth = 0; } - case ',': - { - info->isNameCandidate = FALSE; - if (info->isKnrParamList) - { - ++info->parameterCount; - identifierCount = 0; - } - break; - } - case '=': + break; + } + case '[': + { + info->isKnrParamList = FALSE; + skipToMatch ("[]"); + break; + } + case '<': + { + info->isKnrParamList = FALSE; + skipToMatch ("<>"); + break; + } + case ')': + { + if (firstChar) + info->parameterCount = 0; + --depth; + break; + } + case '(': + { + info->isKnrParamList = FALSE; + if (firstChar) { - info->isKnrParamList = FALSE; info->isNameCandidate = FALSE; - if (firstChar) - { - info->isParamList = FALSE; - skipMacro (st); - depth = 0; - } - break; - } - case '[': - { - info->isKnrParamList = FALSE; - skipToMatch ("[]"); - break; - } - case '<': - { - info->isKnrParamList = FALSE; - skipToMatch ("<>"); - break; - } - case ')': - { - if (firstChar) - info->parameterCount = 0; - --depth; - break; + cppUngetc (c); + skipMacro (st); + depth = 0; } - case '(': + else if (isType (token, TOKEN_PAREN_NAME)) { - info->isKnrParamList = FALSE; - if (firstChar) - { - info->isNameCandidate = FALSE; - cppUngetc (c); - skipMacro (st); - depth = 0; - } - else if (isType (token, TOKEN_PAREN_NAME)) + c = skipToNonWhite (); + if (c == '*') /* check for function pointer */ { + skipToMatch ("()"); c = skipToNonWhite (); - if (c == '*') /* check for function pointer */ - { + if (c == '(') skipToMatch ("()"); - c = skipToNonWhite (); - if (c == '(') - skipToMatch ("()"); - } - else - { - cppUngetc (c); - cppUngetc ('('); - info->nestedArgs = TRUE; - } } else - ++depth; - break; + { + cppUngetc (c); + cppUngetc ('('); + info->nestedArgs = TRUE; + } } + else + ++depth; + break; + }
- default: + default: + { + if (isident1 (c)) { - if (isident1 (c)) - { - if (++identifierCount > 1) - info->isKnrParamList = FALSE; - readIdentifier (token, c); - if (isType (token, TOKEN_NAME) && info->isNameCandidate) - token->type = TOKEN_PAREN_NAME; - else if (isType (token, TOKEN_KEYWORD)) - { - info->isKnrParamList = FALSE; - info->isNameCandidate = FALSE; - } - } - else if (isLanguage(Lang_d) && c == '!') - { /* D template instantiation */ - info->isNameCandidate = FALSE; + if (++identifierCount > 1) info->isKnrParamList = FALSE; - } - else + readIdentifier (token, c); + if (isType (token, TOKEN_NAME) && info->isNameCandidate) + token->type = TOKEN_PAREN_NAME; + else if (isType (token, TOKEN_KEYWORD)) { - info->isParamList = FALSE; - info->isKnrParamList = FALSE; + info->isKnrParamList = FALSE; info->isNameCandidate = FALSE; - info->invalidContents = TRUE; } - break; } + else if (isLanguage(Lang_d) && c == '!') + { /* D template instantiation */ + info->isNameCandidate = FALSE; + info->isKnrParamList = FALSE; + } + else + { + info->isParamList = FALSE; + info->isKnrParamList = FALSE; + info->isNameCandidate = FALSE; + info->invalidContents = TRUE; + } + break; } + } firstChar = FALSE; } while (! info->nestedArgs && depth > 0 && (info->isKnrParamList || info->isNameCandidate));
@@ Diff output truncated at 100000 characters. @@
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).