- implemented grammar for XML literals

- removed most LL(1) conflicts from parser

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

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

@@ -368,16 +368,32 @@ Block =
 	(. PopContext(); .)
 .
 
-Expression =
+Expression = SimpleExpressionWithSuffix. /* TODO: operators */
-	(. nextTokenIsPotentialStartOfXmlMode = true; .)
-	(
-	Literal |
-	( "(" Expression ")" ) |
-	( Identifier [ "(" "Of" TypeName { "," TypeName } ")" ] ) |
-	( "AddressOf" Expression) |
 
-	( XmlOpenTag (. PushContext(Context.Xml, t); .) ANY XmlCloseTag (. PopContext(); .) )
+SimpleExpressionWithSuffix = SimpleExpression { ExpressionSuffix } .
-	)
+
+SimpleExpression =
+    (. nextTokenIsPotentialStartOfXmlMode = true; .)
+    (    Literal
+    |    ( "(" Expression ")" )
+    |    Identifier
+    |    XmlLiteral
+    )
+.
+
+ExpressionSuffix =
+    "(" (. nextTokenIsPotentialStartOfXmlMode = true; .) ( "Of" TypeName { "," TypeName } ")" | ArgumentList ")" )
+|    "." IdentifierOrKeyword
+.
+
+XmlLiteral =
+    (. PushContext(Context.Xml, t); .)
+    { XmlComment } XmlElement { XmlComment }
+    (. PopContext(); .)
+.
+
+XmlElement =
+	XmlOpenTag { ANY } ( XmlCloseTagEmptyElement | XmlCloseTag { ANY | XmlElement } XmlOpenEndTag { ANY } XmlCloseTag )
 .
 
 PrimitiveTypeName = 
@@ -448,10 +464,12 @@ RaiseEventStatement =
 .
 
 InvocationStatement =
+	(. Console.WriteLine("InvocationStatement"); .)
 	[ "Call" ] Expression [ ( "=" | "^=" | "*=" | "/=" | "\\=" | "+=" | "-=" | "&=" | ">=" ) Expression ]
 .
 
 ArgumentList =
+	(. Console.WriteLine("ArgumentList"); .)
 	Expression { "," Expression [ ":=" Expression ] }
 .
 
@@ -532,5 +550,4 @@ ParameterModifier =
     "ParamArray"
 .
 
-END ExpressionFinder.
+END ExpressionFinder .
-

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

@@ -60,6 +60,7 @@ partial class ExpressionFinder {
 	
 	public void Advance()
 	{
+		Console.WriteLine("Advance");
 		InformToken(null);
 	}
 	

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

@@ -30,13 +30,13 @@ exit Global
 			);
 		}
 		
-		[Test, Ignore]
+		[Test]
 		public void VariableWithXmlLiteral()
 		{
 			RunTest(
 				@"Class Test
 	Public Sub New()
-		Dim x = <a>
+		Dim x = <a />
 	End Sub
 End Class
 ",
@@ -58,23 +58,21 @@ exit Global
 			);
 		}
 		
-		[Test, Ignore]
+		[Test]
 		public void MemberWithXmlLiteral()
 		{
 			RunTest(
 				@"Class Test
-	Private xml As XElement = <b>
+	Private xml As XElement = <b />
 	
 	Public Sub New()
-		Dim x = <a>
+		Dim x = <a />
 	End Sub
 End Class
 ",
 				@"enter Global
 	enter Type
 		enter Member
-			enter IdentifierExpected
-			exit IdentifierExpected
 			enter IdentifierExpected
 			exit IdentifierExpected
 			enter Xml

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

@@ -25,8 +25,9 @@ End Class
 		
 		public static void Main(string[] args)
 		{
-			ExpressionFinder p = new ExpressionFinder();
 			ILexer lexer = ParserFactory.CreateLexer(SupportedLanguage.VBNet, new StringReader(data));
+			ExpressionFinder p = new ExpressionFinder();
+			
 			Token t;
 			do {
 				t = lexer.NextToken();