~ubuntu-branches/ubuntu/lucid/monodevelop/lucid

« back to all changes in this revision

Viewing changes to src/addins/CBinding/Parser/CDocumentParser.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2010-01-10 14:25:59 UTC
  • mfrom: (1.2.5 upstream) (1.3.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100110142559-sorji5exvk9tyknr
Tags: 2.2+dfsg-2
* debian/rules/remove_support_for_non_debian_functionality.patch:
  + Also fix monodevelop-core-addins.pc to remove links to the
    addins we remove in Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
67
67
                        IType tmp;
68
68
                        IMember member;
69
69
                        string[] contentLines = content.Split (new string[]{Environment.NewLine}, StringSplitOptions.None);
70
 
                        
71
 
                        // Add containers to type list
72
 
                        foreach (LanguageItem li in pi.Containers ()) {
73
 
                                if (null == li.Parent && FilePath.Equals (li.File, fileName)) {
74
 
                                        tmp = LanguageItemToIMember (pi, li, contentLines) as IType;
75
 
                                        if (null != tmp){ cu.Add (tmp); }
76
 
                                }
77
 
                        }
78
 
                        
79
 
                        // Add global category for unscoped symbols
80
70
                        DomType globals = new DomType (cu, ClassType.Unknown, GettextCatalog.GetString ("(Global Scope)"), new DomLocation (1, 1), string.Empty, new DomRegion (1, int.MaxValue), new List<IMember> ());
81
 
                        foreach (LanguageItem li in pi.InstanceMembers ()) {
82
 
                                if (null == li.Parent && FilePath.Equals (li.File, fileName)) {
83
 
                                        member = LanguageItemToIMember (pi, li, contentLines);
84
 
                                        if (null != member) { 
85
 
                                                globals.Add (member); 
 
71
                        
 
72
                        lock (pi) {
 
73
                                // Add containers to type list
 
74
                                foreach (LanguageItem li in pi.Containers ()) {
 
75
                                        if (null == li.Parent && FilePath.Equals (li.File, fileName)) {
 
76
                                                tmp = LanguageItemToIMember (pi, li, contentLines) as IType;
 
77
                                                if (null != tmp){ cu.Add (tmp); }
 
78
                                        }
 
79
                                }
 
80
                                
 
81
                                // Add global category for unscoped symbols
 
82
                                foreach (LanguageItem li in pi.InstanceMembers ()) {
 
83
                                        if (null == li.Parent && FilePath.Equals (li.File, fileName)) {
 
84
                                                member = LanguageItemToIMember (pi, li, contentLines);
 
85
                                                if (null != member) { 
 
86
                                                        globals.Add (member); 
 
87
                                                }
86
88
                                        }
87
89
                                }
88
90
                        }
 
91
                        
89
92
                        cu.Add (globals);
90
93
                        
91
94
                        return doc;