2004-03-16 Atsushi Enomoto <[email protected]>

	* Parser.jay : rewrote step part to be reusable for upcoming XSLT
	  pattern parser.


svn path=/trunk/mcs/; revision=41921

mcs/class/System.XML/System.Xml.XPath/ChangeLog

@@ -1,3 +1,8 @@
+2004-03-16  Atsushi Enomoto  <[email protected]>
+
+	* Parser.jay : rewrote step part to be reusable for upcoming XSLT
+	  pattern parser.
+
 2004-03-16  Atsushi Enomoto  <[email protected]>
 
 	* Iterator.cs : reduced extra clone.

mcs/class/System.XML/System.Xml.XPath/Parser.jay

@@ -5,6 +5,7 @@
 //
 
 using System;
+using System.Collections;
 using System.Xml;
 using System.Xml.XPath;
 
@@ -20,6 +21,7 @@ namespace Mono.Xml.XPath
 		{
 			Context = context;
 			ErrorOutput = System.IO.TextWriter.Null;
+//			debug = new yydebug.yyDebugSimple ();
 		}
 		
 		internal Expression Compile (string xpath)
@@ -28,12 +30,39 @@ namespace Mono.Xml.XPath
 				Tokenizer tokenizer = new Tokenizer (xpath);
 				return (Expression) yyparse (tokenizer);
 			} catch (XPathException e) {
-				throw e;
+				throw;
 			} catch (Exception e) {
 				throw new XPathException ("Error during parse of " + xpath, e);
 			}
 		}
 		static int yacc_verbose_flag;
+
+		private NodeSet CreateNodeTest (Axes axis, object nodeTest, ArrayList plist)
+		{
+			NodeSet test = CreateNodeTest (axis, nodeTest);
+			if (plist != null) {
+				for (int i = 0; i < plist.Count; i++)
+					test = new ExprFilter (test,
+						(Expression) plist [i]);
+			}
+			return test;
+		}
+
+		private NodeTest CreateNodeTest (Axes axis, object test)
+		{
+			if (test is XPathNodeType)
+				return new NodeTypeTest (axis,
+					(XPathNodeType) test, null);
+			else if (test is string || test == null)
+				return new NodeTypeTest (axis,
+					XPathNodeType.ProcessingInstruction,
+					(string) test);
+			XmlQualifiedName q = (XmlQualifiedName) test;
+			if (q == XmlQualifiedName.Empty)
+				return new NodeTypeTest (axis);
+			else
+				return new NodeNameTest (axis, q, Context);
+		}
 %}
 
 %token ERROR
@@ -116,6 +145,7 @@ namespace Mono.Xml.XPath
 %%
 
 
+
 Expr
 	: OrExpr
 	;
@@ -258,41 +288,68 @@ RelativeLocationPath
 	;
 
 Step
-	: PredicatedStep
-	| DOT
+	: AxisSpecifier NodeTest Predicates
 	{
-		$$ = new NodeTypeTest (Axes.Self, XPathNodeType.All);
+		$$ = CreateNodeTest ((Axes) $1, $2, (ArrayList) $3);
 	}
-	| DOT2
+	| AbbreviatedStep
+	;
+
+NodeTest // QName, XPathNodeType or string
+	: NameTest
+	| NodeType PAREN_OPEN PAREN_CLOSE
 	{
-		$$ = new NodeTypeTest (Axes.Parent, XPathNodeType.All);
+		$$ = (XPathNodeType) $1;
+	}
+	| PROCESSING_INSTRUCTION PAREN_OPEN OptionalLiteral PAREN_CLOSE
+	{
+		$$ = (string) $3;
 	}
 	;
 
-PredicatedStep
-	: AxisTest
-	| PredicatedStep Predicate
+NameTest
+	: ASTERISK
 	{
-		$$ = new ExprFilter ((NodeSet) $1, (Expression) $2);
+		$$ = XmlQualifiedName.Empty;
 	}
+	| QName // token QName also contains "blah:*"
 	;
 
-AxisTest
-	: AxisSpecifier QName
+AbbreviatedStep
+	: DOT
 	{
-		$$ = new NodeNameTest ((Axes) $1, (XmlQualifiedName) $2, Context);
+		$$ = new NodeTypeTest (Axes.Self, XPathNodeType.All);
 	}
-	| AxisSpecifier ASTERISK
+	| DOT2
+	{
+		$$ = new NodeTypeTest (Axes.Parent, XPathNodeType.All);
+	}
+	;
+
+Predicates
+	: /* empty */
 	{
-		$$ = new NodeTypeTest ((Axes) $1);
+		$$ = null;
 	}
-	| AxisSpecifier NodeType PAREN_OPEN OptionalLiteral PAREN_CLOSE
+	| Predicates Predicate
 	{
-		$$ = new NodeTypeTest ((Axes) $1, (XPathNodeType) $2, (String) $4);
+		ArrayList al = (ArrayList) $1;
+		if (al == null)
+			al = new ArrayList ();
+		al.Add ($2);
+		$$ = al;
 	}
 	;
 
 AxisSpecifier
+	: AxisName COLON2
+	{
+		$$ = $1;
+	}
+	| AbbreviatedAxisSpecifier
+	;
+
+AbbreviatedAxisSpecifier
 	: /* empty */
 	{
 		$$ = Axes.Child;
@@ -301,10 +358,6 @@ AxisSpecifier
 	{
 		$$ = Axes.Attribute;
 	}
-	| AxisName COLON2
-	{
-		$$ = $1;
-	}
 	;
 
 NodeType