- corrected context detection of IdentifierExpected

- fixed parse error in ForLoopVariable (As TypeName was not recognised)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/vbnet@5994 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.atg

@@ -295,7 +295,7 @@ NamespaceDeclaration =
 TypeDeclaration =
 	{ AttributeBlock }
 	{ TypeModifier }
-	( "Module" |  "Class" ) { ANY } StatementTerminator
+	( "Module" |  "Class" ) (. PushContext(Context.IdentifierExpected, t); .) ANY (. PopContext(); .) { ANY } StatementTerminator
 	(. PushContext(Context.Type, t); .)
 	{ MemberDeclaration }
 	"End" ( "Module" | "Class" ) StatementTerminator
@@ -325,12 +325,12 @@ SubOrFunctionDeclaration =
 .
 
 ExternalMemberDeclaration =
-	"Declare" [ "Ansi" | "Unicode" | "Auto" ] ( "Sub" | "Function" ) Identifier
+	"Declare" [ "Ansi" | "Unicode" | "Auto" ] ( "Sub" | "Function" ) (. PushContext(Context.IdentifierExpected, t); .) Identifier (. PopContext(); .)
 	"Lib" LiteralString [ "Alias" LiteralString ] [ "(" [ ParameterList ] ")" ] StatementTerminator
 .
 
 EventMemberDeclaration =
-	"Event" Identifier ( "As" TypeName | [ "(" [ ParameterList ] ")" ] )
+	"Event" (. PushContext(Context.IdentifierExpected, t); .) Identifier (. PopContext(); .) ( "As" TypeName | [ "(" [ ParameterList ] ")" ] )
 	[ "Implements" TypeName /*"." IdentifierOrKeyword*/ { "," TypeName /*"." IdentifierOrKeyword*/ } ]
 	/* the TypeName production already allows the "." IdentifierOrKeyword syntax, so to avoid an ambiguous grammer we just leave that out */
 	StatementTerminator
@@ -347,13 +347,13 @@ CustomEventMemberDeclaration =
 .
 
 OperatorDeclaration =
-	"Operator" ANY "(" ParameterList ")" [ "As" { AttributeBlock } TypeName ]
+	"Operator" (. PushContext(Context.IdentifierExpected, t); .) ANY (. PopContext(); .) "(" ParameterList ")" [ "As" { AttributeBlock } TypeName ]
 	StatementTerminatorAndBlock
 	"End" "Operator" StatementTerminator
 .
 
 MemberVariableOrConstantDeclaration =
-	[ "Const" ] IdentifierForFieldDeclaration [ "As" TypeName ] [ "=" Expression ] StatementTerminator
+	[ "Const" ] (. PushContext(Context.IdentifierExpected, t); .) IdentifierForFieldDeclaration (. PopContext(); .)  [ "As" TypeName ] [ "=" Expression ] StatementTerminator
 .
 
 ParameterList =
@@ -361,7 +361,7 @@ ParameterList =
 .
 
 Parameter =
-	{ AttributeBlock } { ParameterModifier } Identifier [ "As" TypeName ] [ "=" Expression ] 
+	{ AttributeBlock } { ParameterModifier } (. PushContext(Context.IdentifierExpected, t); .) Identifier (. PopContext(); .) [ "As" TypeName ] [ "=" Expression ] 
 .
 
 StatementTerminatorAndBlock =
@@ -594,7 +594,7 @@ ExpressionRangeVariable =
 						  "Explicit", "Equals", "Distinct", "Descending", "Compare", "By",
 						  "Binary", "Auto", "Assembly", "Ascending", "Ansi", "Aggregate", ident)
 		(
-			Identifier 
+			(. PushContext(Context.IdentifierExpected, t); .) Identifier (. PopContext(); .) 
 			(
 				"As" TypeName "="
 				| "="
@@ -613,7 +613,7 @@ ExpressionRangeVariable =
 .
 
 CollectionRangeVariable =
-	Identifier [ "As" TypeName ] "In" Expression
+	(. PushContext(Context.IdentifierExpected, t); .) Identifier (. PopContext(); .) [ "As" TypeName ] "In" Expression
 .
 
 /* semantic action will be inserted on all paths that possibly lead to XmlLiteral */
@@ -692,7 +692,7 @@ Statement =
 .
 
 VariableDeclarationStatement =
-	( "Dim" | "Static" | "Const" ) Identifier [ "?" ] [ ( "(" { "," } ")" ) ] { "," Identifier [ "?" ] [ ( "(" { "," } ")" ) ] } [ "As" [ "New" ] TypeName ] [ "=" Expression ]
+	( "Dim" | "Static" | "Const" ) (. PushContext(Context.IdentifierExpected, t); .) Identifier (. PopContext(); .) [ "?" ] [ ( "(" { "," } ")" ) ] { "," (. PushContext(Context.IdentifierExpected, t); .) Identifier (. PopContext(); .) [ "?" ] [ ( "(" { "," } ")" ) ] } [ "As" [ "New" ] TypeName ] [ "=" Expression ]
 .
 
 WithOrLockStatement =
@@ -781,7 +781,7 @@ ForEachLoopStatement =
 .
 
 ForLoopVariable =
-	SimpleExpression [ "?" ] { ExpressionSuffix }
+	(. PushContext(Context.IdentifierExpected, t); .) SimpleExpression (. PopContext(); .) [ "?" ] { ExpressionSuffix } [ "As" TypeName ]
 .
 
 ErrorHandlingStatement =
@@ -798,7 +798,7 @@ TryStatement =
 	StatementTerminatorAndBlock
 	{
 		"Catch"
-		[ Identifier [ "As" TypeName ] ]
+		[ (. PushContext(Context.IdentifierExpected, t); .) Identifier (. PopContext(); .) [ "As" TypeName ] ]
 		[ "When" Expression ]
 		StatementTerminatorAndBlock
 	}
@@ -845,11 +845,8 @@ ArgumentList =
 
 /* This production handles pseudo keywords that are needed in the grammar */
 Identifier =
-	(
+	IdentifierForFieldDeclaration
-		IdentifierForFieldDeclaration
+	| "Custom"
-	|
-		"Custom"
-	)
 .
 
  IdentifierForFieldDeclaration =

src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/PushParser.frame

@@ -50,6 +50,8 @@ partial class ExpressionFinder {
 	
 	void Error(Token la) 
 	{
+		output.AppendLine("not expected: " + la);
+		Console.WriteLine("not expected: " + la);
 	}
 	
 	Token t;

src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/Test/ParserTests.cs

@@ -41,6 +41,8 @@ exit Global
 End Class
 ",
 				@"enter Global
+	enter IdentifierExpected
+	exit IdentifierExpected
 	enter Type
 		enter Member
 			enter IdentifierExpected
@@ -71,6 +73,8 @@ exit Global
 End Class
 ",
 				@"enter Global
+	enter IdentifierExpected
+	exit IdentifierExpected
 	enter Type
 		enter Member
 			enter IdentifierExpected
@@ -108,6 +112,8 @@ End Class
 								@"enter Global
 	enter Attribute
 	exit Attribute
+	enter IdentifierExpected
+	exit IdentifierExpected
 	enter Type
 		enter Member
 			enter IdentifierExpected
@@ -137,6 +143,8 @@ End Class
 								@"enter Global
 	enter Attribute
 	exit Attribute
+	enter IdentifierExpected
+	exit IdentifierExpected
 	enter Type
 		enter Member
 			enter IdentifierExpected
@@ -164,6 +172,8 @@ exit Global
 End Class
 ",
 								@"enter Global
+	enter IdentifierExpected
+	exit IdentifierExpected
 	enter Type
 		enter Member
 			enter Attribute
@@ -194,11 +204,63 @@ exit Global
 End Class
 ",
 								@"enter Global
+	enter IdentifierExpected
+	exit IdentifierExpected
 	enter Type
 		enter Member
 			enter IdentifierExpected
 			exit IdentifierExpected
 			enter Body
+				enter Body
+				exit Body
+			exit Body
+		exit Member
+	exit Type
+exit Global
+"
+			);
+		}
+		
+		[Test]
+		public void StatementsTest()
+		{
+			RunTest(
+				@"Class Test
+	Public Sub New()
+		For i As Integer = 0 To 10
+		
+		Next
+	
+		For Each x As Integer In list
+		
+		Next
+		
+		Try
+		
+		Catch e As Exception
+		
+		End Try
+	End Sub
+End Class
+",
+								@"enter Global
+	enter IdentifierExpected
+	exit IdentifierExpected
+	enter Type
+		enter Member
+			enter IdentifierExpected
+			exit IdentifierExpected
+			enter Body
+				enter IdentifierExpected
+				exit IdentifierExpected
+				enter Body
+				exit Body
+				enter IdentifierExpected
+				exit IdentifierExpected
+				enter Body
+				exit Body
+				enter Body
+				exit Body
 				enter IdentifierExpected
 				exit IdentifierExpected
 				enter Body