diff options
| author | Mike Krüger <mkrueger@novell.com> | 2009-10-05 15:16:35 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2009-10-05 15:16:35 +0400 |
| commit | 60250a4ff2e0903f403fdd7ab6418af506d278eb (patch) | |
| tree | 3da68fdde7f1274bbc712ecc69a10ef460dce321 /main/contrib | |
| parent | 92bc53f6e0d04503c7eb4b8d87c7f6eecdc33d88 (diff) | |
* Src/Ast/Enums.cs:
* Src/Parser/ModifierList.cs: Added support for protected AND internal
modifier.
svn path=/trunk/monodevelop/; revision=143391
Diffstat (limited to 'main/contrib')
| -rw-r--r-- | main/contrib/NRefactory/Project/ChangeLog | 6 | ||||
| -rw-r--r-- | main/contrib/NRefactory/Project/Src/Ast/Enums.cs | 3 | ||||
| -rw-r--r-- | main/contrib/NRefactory/Project/Src/Parser/ModifierList.cs | 8 |
3 files changed, 16 insertions, 1 deletions
diff --git a/main/contrib/NRefactory/Project/ChangeLog b/main/contrib/NRefactory/Project/ChangeLog index 612275fce3..ce38411a06 100644 --- a/main/contrib/NRefactory/Project/ChangeLog +++ b/main/contrib/NRefactory/Project/ChangeLog @@ -1,3 +1,9 @@ +2009-10-05 Mike Krüger <mkrueger@novell.com> + + * Src/Ast/Enums.cs: + * Src/Parser/ModifierList.cs: Added support for protected AND + internal modifier. + 2009-09-21 Mike Krüger <mkrueger@novell.com> * Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs: Fixed 'Bug diff --git a/main/contrib/NRefactory/Project/Src/Ast/Enums.cs b/main/contrib/NRefactory/Project/Src/Ast/Enums.cs index 4d5c7229ad..4945d8ae82 100644 --- a/main/contrib/NRefactory/Project/Src/Ast/Enums.cs +++ b/main/contrib/NRefactory/Project/Src/Ast/Enums.cs @@ -40,11 +40,14 @@ namespace ICSharpCode.NRefactory.Ast Extern = 0x2000, Volatile = 0x4000, Unsafe = 0x8000, + + Overloads = 0x10000, // VB specific WithEvents = 0x20000, // VB specific Default = 0x40000, // VB specific Fixed = 0x80000, // C# specific (fixed size arrays in unsafe structs) + ProtectedAndInternal = 0x100000, // C# specific /// <summary>Generated code, not part of parsed code</summary> Synthetic = 0x200000, /// <summary>Only for VB properties.</summary> diff --git a/main/contrib/NRefactory/Project/Src/Parser/ModifierList.cs b/main/contrib/NRefactory/Project/Src/Parser/ModifierList.cs index 78e76b6b00..ff6b36ff35 100644 --- a/main/contrib/NRefactory/Project/Src/Parser/ModifierList.cs +++ b/main/contrib/NRefactory/Project/Src/Parser/ModifierList.cs @@ -18,6 +18,9 @@ namespace ICSharpCode.NRefactory.Parser get { return cur; } + set { + cur = value; + } } public Location GetDeclarationLocation(Location keywordLocation) @@ -49,7 +52,10 @@ namespace ICSharpCode.NRefactory.Parser if(location.IsEmpty) { location = tokenLocation; } - + if (m == Modifiers.Internal && (cur & Modifiers.Protected) != 0) { + cur = Modifiers.ProtectedAndInternal; + return; + } if ((cur & m) == 0) { cur |= m; } else { |