← Back to branch summary

~ubuntu-branches/ubuntu/natty/geany/natty

« back to all changes in this revision

Viewing changes to tagmanager/c.c

  • Committer: Bazaar Package Importer
  • Author(s): Chow Loong Jin
  • Date: 2010-08-07 03:23:12 UTC
  • mfrom: (1.4.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: james.westby@ubuntu.com-20100807032312-ot70ac9d50cn79we
Tags: upstream-0.19
Import upstream version 0.19

Show diffs side-by-side

added added

removed removed

Lines of Context:
tagmanager/c.c
2555
2555
        else
2556
2556
        {
2557
2557
                cppUngetc (c);
2558
 
                if (((isLanguage (Lang_cpp) || isLanguage (Lang_csharp) || isLanguage (Lang_vala))  &&
 
2558
                if ((((isLanguage (Lang_cpp) &&
 
2559
                                (st->declaration == DECL_CLASS || st->declaration == DECL_STRUCT)) ||
 
2560
                    isLanguage (Lang_csharp) || isLanguage (Lang_vala))  &&
2559
2561
                        inheritingDeclaration (st->declaration)) ||
2560
2562
                        isLanguage (Lang_d))
2561
2563
                {
2562
2564
                        readParents (st, ':');
2563
2565
                }
2564
 
                else if (parentDecl (st) == DECL_STRUCT)
 
2566
                else if (parentDecl (st) == DECL_STRUCT || parentDecl (st) == DECL_CLASS)
2565
2567
                {
2566
2568
                        c = skipToOneOf (",;");
2567
2569
                        if (c == ',')