From a2858c577cc2fb72bfe57ff8368a8288ef87df5a Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Mon, 6 Sep 2010 11:46:46 +0200 Subject: [PATCH] fixed missing NotInheritable modifier --- .../Src/Lexer/VBNet/ExpressionFinder.atg | 2 + .../Project/Src/Lexer/VBNet/Parser.cs | 47 +++++++++---------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg index 4b37497cdf..e1f2fd9c05 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/ExpressionFinder.atg @@ -1325,6 +1325,7 @@ AccessModifier = TypeModifier = AccessModifier | + "NotInheritable" | "Shadows" | "Partial" . @@ -1335,6 +1336,7 @@ MemberModifier = "Shared" | "Overridable" | "NotOverridable" | + "NotInheritable" | "Overrides" | "Overloads" | "Partial" | diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs index d86d46d712..e1e67713f1 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Parser.cs @@ -1,6 +1,3 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - using System; using System.Collections; using System.Collections.Generic; @@ -8156,18 +8153,18 @@ partial class ExpressionFinder { public BitArray GetExpectedSet() { return GetExpectedSet(currentState); } static readonly BitArray[] set = { - new BitArray(new int[] {1, 256, 1048576, 537395328, 134234624, 444604417, 131200, 0}), - new BitArray(new int[] {1, 256, 1048576, 537395328, 134234624, 444596225, 131200, 0}), - new BitArray(new int[] {1, 256, 1048576, 537395328, 134234112, 444596225, 131200, 0}), - new BitArray(new int[] {0, 256, 1048576, 537395328, 134234112, 444596225, 131200, 0}), - new BitArray(new int[] {0, 256, 1048576, 537395328, 134234112, 444596224, 131200, 0}), - new BitArray(new int[] {0, 0, 1048576, 537395328, 134234112, 444596224, 131200, 0}), + new BitArray(new int[] {1, 256, 1048576, 537395328, 134234624, 444604481, 131200, 0}), + new BitArray(new int[] {1, 256, 1048576, 537395328, 134234624, 444596289, 131200, 0}), + new BitArray(new int[] {1, 256, 1048576, 537395328, 134234112, 444596289, 131200, 0}), + new BitArray(new int[] {0, 256, 1048576, 537395328, 134234112, 444596289, 131200, 0}), + new BitArray(new int[] {0, 256, 1048576, 537395328, 134234112, 444596288, 131200, 0}), + new BitArray(new int[] {0, 0, 1048576, 537395328, 134234112, 444596288, 131200, 0}), new BitArray(new int[] {4, 1140850688, 8388687, 1108347140, 821280, 17105920, -2144335872, 65}), - new BitArray(new int[] {0, 256, 1048576, -1601568064, 671109120, 1589117058, 393600, 3328}), - new BitArray(new int[] {0, 256, 1048576, -1601568064, 671105024, 1589117058, 393600, 3328}), - new BitArray(new int[] {5, 1140850944, 26214479, -493220892, 671926304, 1606227075, -2143942272, 3393}), - new BitArray(new int[] {0, 256, 1048576, -1601699136, 671105024, 1589117058, 393600, 3328}), - new BitArray(new int[] {0, 0, 1048576, -1601699136, 671105024, 1589117058, 393600, 3328}), + new BitArray(new int[] {0, 256, 1048576, -1601568064, 671109120, 1589117122, 393600, 3328}), + new BitArray(new int[] {0, 256, 1048576, -1601568064, 671105024, 1589117122, 393600, 3328}), + new BitArray(new int[] {5, 1140850944, 26214479, -493220892, 671926304, 1606227139, -2143942272, 3393}), + new BitArray(new int[] {0, 256, 1048576, -1601699136, 671105024, 1589117122, 393600, 3328}), + new BitArray(new int[] {0, 0, 1048576, -1601699136, 671105024, 1589117122, 393600, 3328}), new BitArray(new int[] {0, 0, 1048576, -2138570624, 134234112, 67108864, 393216, 0}), new BitArray(new int[] {0, 0, 0, -2139095040, 0, 67108864, 262144, 0}), new BitArray(new int[] {-2, -1, -1, -1, -1, -1, -1, -1}), @@ -8236,7 +8233,7 @@ partial class ExpressionFinder { new BitArray(new int[] {4, 1140850944, 8388975, 1108347140, 821280, 21316608, -2144335872, 65}), new BitArray(new int[] {4, 1140850688, 8388975, 1108347140, 821280, 21316608, -2144335872, 65}), new BitArray(new int[] {5242880, -2147483584, 0, 0, 0, 0, 0, 0}), - new BitArray(new int[] {7, 1157628162, 26477055, -493212676, 680323109, 2147308935, -533262382, 3395}), + new BitArray(new int[] {7, 1157628162, 26477055, -493212676, 680323109, 2147308999, -533262382, 3395}), new BitArray(new int[] {918528, 0, 0, 0, 0, 0, 0, 0}), new BitArray(new int[] {-909310, -1258291209, 65, 1074825472, 72844320, 231424, 22030368, 4160}), new BitArray(new int[] {-843774, -1258291209, 65, 1074825472, 72844320, 231424, 22030368, 4160}), @@ -8252,17 +8249,17 @@ partial class ExpressionFinder { new BitArray(new int[] {4, 1140850946, 8650975, 1108355356, 9218084, 17106176, -533656048, 67}), new BitArray(new int[] {4, 1140850944, 8388687, 1108478212, 821280, 17105920, -2144335872, 65}), new BitArray(new int[] {4, 1140850944, 8388687, 1108347140, 821280, 17105920, -2144335872, 65}), - new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671930656, 1606227074, -2143942272, 3393}), - new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671926560, 1606227074, -2143942272, 3393}), - new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671926304, 1606227074, -2143942272, 3393}), - new BitArray(new int[] {4, 1140850944, 26214479, -493351964, 671926304, 1606227074, -2143942272, 3393}), - new BitArray(new int[] {4, 1140850688, 26214479, -493351964, 671926304, 1606227074, -2143942272, 3393}), + new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671930656, 1606227138, -2143942272, 3393}), + new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671926560, 1606227138, -2143942272, 3393}), + new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671926304, 1606227138, -2143942272, 3393}), + new BitArray(new int[] {4, 1140850944, 26214479, -493351964, 671926304, 1606227138, -2143942272, 3393}), + new BitArray(new int[] {4, 1140850688, 26214479, -493351964, 671926304, 1606227138, -2143942272, 3393}), new BitArray(new int[] {4, 1140850688, 26214479, -1030223452, 135055392, 84218880, -2143942656, 65}), new BitArray(new int[] {4, 1140850688, 25165903, -1030747868, 821280, 84218880, -2144073728, 65}), new BitArray(new int[] {3145730, -2147483616, 0, 0, 256, 0, 0, 0}), new BitArray(new int[] {3145730, -2147483648, 0, 0, 256, 0, 0, 0}), new BitArray(new int[] {3145730, 0, 0, 0, 256, 0, 0, 0}), - new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671926305, 1606227074, -2143942208, 3393}), + new BitArray(new int[] {4, 1140850944, 26214479, -493220892, 671926305, 1606227138, -2143942208, 3393}), new BitArray(new int[] {0, 256, 0, 537001984, 1, 436207616, 64, 0}), new BitArray(new int[] {0, 256, 0, 536870912, 1, 436207616, 64, 0}), new BitArray(new int[] {0, 0, 0, 536870912, 1, 436207616, 64, 0}), @@ -8279,13 +8276,13 @@ partial class ExpressionFinder { new BitArray(new int[] {4, 1140850688, 8388687, 1108347136, 821280, 17105920, -2144335872, 65}), new BitArray(new int[] {7340034, -2147483614, 0, 0, 0, 0, 0, 0}), new BitArray(new int[] {7340034, -2147483616, 0, 0, 0, 0, 0, 0}), - new BitArray(new int[] {0, 256, 1048576, 537526400, 134234112, 444596225, 131200, 0}), + new BitArray(new int[] {0, 256, 1048576, 537526400, 134234112, 444596289, 131200, 0}), new BitArray(new int[] {1028, 1140850688, 8650975, 1108355356, 9218084, 17106176, -533656048, 67}), new BitArray(new int[] {70254594, 32, 0, 0, 0, 0, 0, 0}), new BitArray(new int[] {0, 0, 8388608, 33554432, 2048, 0, 32768, 0}), new BitArray(new int[] {2097154, 0, 0, 0, 0, 3072, 0, 0}), - new BitArray(new int[] {0, 0, 0, 536870912, 0, 444596224, 128, 0}), - new BitArray(new int[] {0, 0, 0, 536871488, 536870912, 1522008194, 384, 3328}), + new BitArray(new int[] {0, 0, 0, 536870912, 0, 444596288, 128, 0}), + new BitArray(new int[] {0, 0, 0, 536871488, 536870912, 1522008258, 384, 3328}), new BitArray(new int[] {0, 0, 262288, 8216, 8396800, 256, 1610679824, 2}), new BitArray(new int[] {-1013972992, 822083461, 0, 0, 71499776, 163840, 16777216, 4096}), new BitArray(new int[] {-1073741824, 33554432, 0, 0, 0, 16, 0, 0}), @@ -8315,4 +8312,4 @@ partial class ExpressionFinder { } // end Parser -} +} \ No newline at end of file