2004-08-31 Atsushi Enomoto <[email protected]>

	* XQueryArithmeticOperator.cs : added.
	* XPath2Expression.cs, XQueryParser.jay :
	  renamed some ArithmeticOperator enumeration members.
	  Implemented ArithmeticOperationExpr.Evaluate().

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

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

@@ -1,3 +1,10 @@
+2004-08-31  Atsushi Enomoto <[email protected]>
+
+	* XQueryArithmeticOperator.cs : added.
+	* XPath2Expression.cs, XQueryParser.jay :
+	  renamed some ArithmeticOperator enumeration members.
+	  Implemented ArithmeticOperationExpr.Evaluate().
+
 2004-08-30  Atsushi Enomoto <[email protected]>
 
 	* XPathSequence.cs : fixed NodeIterator to get correct current node

mcs/class/System.XML/System.Xml.Query/XPath2Expression.cs

@@ -1268,8 +1268,8 @@ namespace Mono.Xml.XPath2
 	// arithmetic operation expr
 
 	public enum ArithmeticOperator {
-		Plus,
-		Minus,
+		Add,
+		Sub,
 		Mul,
 		Div,
 		IDiv,
@@ -1281,6 +1281,13 @@ namespace Mono.Xml.XPath2
 		public ArithmeticOperationExpr (ExprSingle left, ExprSingle right, ArithmeticOperator oper)
 			: base (left, right)
 		{
+			this.oper = oper;
+		}
+
+		ArithmeticOperator oper;
+
+		public ArithmeticOperator Operation {
+			get { return oper; }
 		}
 
 #region CompileAndEvaluate
@@ -1298,10 +1305,42 @@ namespace Mono.Xml.XPath2
 
 		public override XPathSequence Evaluate (XPathSequence iter)
 		{
-			XPathAtomicValue lvalue = Left.EvaluateAsAtomic (iter);
-			XPathAtomicValue rvalue = Right.EvaluateAsAtomic (iter);
-
-			throw new NotImplementedException ();
+			XPathSequence lseq = Left.Evaluate (iter);
+			if (!lseq.MoveNext ())
+				return new XPathEmptySequence (iter.Context);
+			XPathSequence rseq = Right.Evaluate (iter);
+			if (!rseq.MoveNext ())
+				return new XPathEmptySequence (iter.Context);
+			XPathAtomicValue lvalue = Atomize (lseq.Current);
+			XPathAtomicValue rvalue = Atomize (rseq.Current);
+			if (lseq.MoveNext ())
+				throw new XmlQueryException ("XP0006: Left operand resulted in an sequence that contains more than one item.");
+			if (rseq.MoveNext ())
+				throw new XmlQueryException ("XP0006: Left operand resulted in an sequence that contains more than one item.");
+
+			// FIXME: handle "untypedAtomic to xs:double" casting
+
+			return new SingleItemIterator (Compute (lvalue, rvalue), iter.Context);
+		}
+
+		private XPathAtomicValue Compute (XPathAtomicValue lvalue, XPathAtomicValue rvalue)
+		{
+			switch (Operation) {
+			case ArithmeticOperator.Add:
+				return XQueryArithmeticOperator.Add (lvalue, rvalue);
+			case ArithmeticOperator.Sub:
+				return XQueryArithmeticOperator.Subtract (lvalue, rvalue);
+			case ArithmeticOperator.Mul:
+				return XQueryArithmeticOperator.Multiply (lvalue, rvalue);
+			case ArithmeticOperator.Div:
+				return XQueryArithmeticOperator.Divide (lvalue, rvalue);
+			case ArithmeticOperator.IDiv:
+				return XQueryArithmeticOperator.IntDivide (lvalue, rvalue);
+			case ArithmeticOperator.IMod:
+				return XQueryArithmeticOperator.Remainder (lvalue, rvalue);
+			default:
+				throw new SystemException ("XQuery internal error: should not happen.");
+			}
 		}
 #endregion
 	}

mcs/class/System.XML/System.Xml.Query/XQueryArithmeticOperator.cs

@@ -0,0 +1,367 @@
+//
+// XQueryArithmeticOperator.cs
+//
+// Author:
+//	Atsushi Enomoto <[email protected]>
+//
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Query;
+using System.Xml.XPath;
+using System.Xml.Xsl;
+
+namespace Mono.Xml.XPath2
+{
+	// FIXME: Handle complete type promotion and subtype substitution.
+	// See XQuery 1.0 Appendix B.*.
+	public class XQueryArithmeticOperator
+	{
+		/// <summary>
+		/// x + y
+		/// </summary>
+		public static XPathAtomicValue Add (XPathAtomicValue lvalue, XPathAtomicValue rvalue)
+		{
+			// numeric, date, time, dateTime, yearMonthDuration, dayTimeDuration
+			switch (lvalue.XmlType.TypeCode) {
+
+			// numerics
+			case XmlTypeCode.Integer:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+					return new XPathAtomicValue (lvalue.ValueAsInt64 + rvalue.ValueAsInt64, rvalue.XmlType);
+				case XmlTypeCode.Decimal:
+					return new XPathAtomicValue (lvalue.ValueAsDecimal + rvalue.ValueAsDecimal, rvalue.XmlType);
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble + rvalue.ValueAsDouble, rvalue.XmlType);
+				}
+				break;
+
+			case XmlTypeCode.Decimal:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+				case XmlTypeCode.Decimal:
+					return new XPathAtomicValue (lvalue.ValueAsDecimal + rvalue.ValueAsDecimal, rvalue.XmlType);
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble + rvalue.ValueAsDouble, rvalue.XmlType);
+				}
+				break;
+
+			case XmlTypeCode.Float:
+			case XmlTypeCode.Double:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+				case XmlTypeCode.Decimal:
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble + rvalue.ValueAsDouble, rvalue.XmlType);
+				}
+				break;
+
+			// datetimes
+			case XmlTypeCode.Time:
+				if (rvalue.XmlType.TypeCode == XmlTypeCode.DayTimeDuration)
+					goto case XmlTypeCode.DateTime;
+				break;
+			case XmlTypeCode.DateTime:
+			case XmlTypeCode.Date:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.YearMonthDuration:
+				case XmlTypeCode.DayTimeDuration:
+					return new XPathAtomicValue (lvalue.ValueAsDateTime + new TimeSpan (rvalue.ValueAsDateTime.Ticks), lvalue.XmlType);
+				}
+				break;
+			// durations
+			case XmlTypeCode.YearMonthDuration:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Date:
+				case XmlTypeCode.DateTime:
+					return new XPathAtomicValue (lvalue.ValueAsDateTime + new TimeSpan (rvalue.ValueAsDateTime.Ticks), rvalue.XmlType);
+				case XmlTypeCode.YearMonthDuration:
+					return new XPathAtomicValue (new DateTime (lvalue.ValueAsDateTime.Ticks + rvalue.ValueAsDateTime.Ticks), XmlSchemaSimpleType.XdtYearMonthDuration);
+				}
+				break;
+			case XmlTypeCode.DayTimeDuration:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Date:
+				case XmlTypeCode.Time:
+				case XmlTypeCode.DateTime:
+					return new XPathAtomicValue (lvalue.ValueAsDateTime + new TimeSpan (rvalue.ValueAsDateTime.Ticks), rvalue.XmlType);
+				case XmlTypeCode.DayTimeDuration:
+					return new XPathAtomicValue (new DateTime (lvalue.ValueAsDateTime.Ticks + rvalue.ValueAsDateTime.Ticks), XmlSchemaSimpleType.XdtDayTimeDuration);
+				}
+				break;
+			}
+
+			throw new XmlQueryException (String.Format ("Not allowed arithmetic operation: {0} + {1}", lvalue.XmlType.QualifiedName, rvalue.XmlType.QualifiedName));
+		}
+
+		/// <summary>
+		/// x - y
+		/// </summary>
+		public static XPathAtomicValue Subtract (XPathAtomicValue lvalue, XPathAtomicValue rvalue)
+		{
+			// numeric, date, time, dateTime, yearMonthDuration, dayTimeDuration
+			switch (lvalue.XmlType.TypeCode) {
+
+			// numerics
+			case XmlTypeCode.Integer:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+					return new XPathAtomicValue (lvalue.ValueAsInt64 - rvalue.ValueAsInt64, rvalue.XmlType);
+				case XmlTypeCode.Decimal:
+					return new XPathAtomicValue (lvalue.ValueAsDecimal - rvalue.ValueAsDecimal, rvalue.XmlType);
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble - rvalue.ValueAsDouble, rvalue.XmlType);
+				}
+				break;
+
+			case XmlTypeCode.Decimal:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+				case XmlTypeCode.Decimal:
+					return new XPathAtomicValue (lvalue.ValueAsDecimal - rvalue.ValueAsDecimal, rvalue.XmlType);
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble - rvalue.ValueAsDouble, rvalue.XmlType);
+				}
+				break;
+
+			case XmlTypeCode.Float:
+			case XmlTypeCode.Double:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+				case XmlTypeCode.Decimal:
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble - rvalue.ValueAsDouble, rvalue.XmlType);
+				}
+				break;
+
+			// datetimes
+			case XmlTypeCode.Time:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Time:
+					return new XPathAtomicValue (lvalue.ValueAsDateTime - rvalue.ValueAsDateTime, XmlSchemaSimpleType.XdtDayTimeDuration);
+				case XmlTypeCode.DayTimeDuration:
+					return new XPathAtomicValue (lvalue.ValueAsDateTime - new TimeSpan (rvalue.ValueAsDateTime.Ticks), lvalue.XmlType);
+				}
+				break;
+
+			case XmlTypeCode.DateTime:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.DateTime:
+					// FIXME: check fn:subtract-daytimes-yielding-dayTimeDuration()
+					return new XPathAtomicValue (lvalue.ValueAsDateTime - rvalue.ValueAsDateTime, XmlSchemaSimpleType.XdtDayTimeDuration);
+				case XmlTypeCode.YearMonthDuration:
+				case XmlTypeCode.DayTimeDuration:
+					return new XPathAtomicValue (lvalue.ValueAsDateTime - new TimeSpan (rvalue.ValueAsDateTime.Ticks), lvalue.XmlType);
+				}
+				break;
+
+			case XmlTypeCode.Date:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Date:
+					// FIXME: check fn:subtract-daytimes-yielding-dayTimeDuration()
+					return new XPathAtomicValue (lvalue.ValueAsDateTime - rvalue.ValueAsDateTime, XmlSchemaSimpleType.XdtDayTimeDuration);
+				case XmlTypeCode.YearMonthDuration:
+				case XmlTypeCode.DayTimeDuration:
+					return new XPathAtomicValue (lvalue.ValueAsDateTime - new TimeSpan (rvalue.ValueAsDateTime.Ticks), lvalue.XmlType);
+				}
+				break;
+
+			// durations
+			case XmlTypeCode.YearMonthDuration:
+				if (rvalue.XmlType.TypeCode == XmlTypeCode.YearMonthDuration)
+					return new XPathAtomicValue (new TimeSpan (lvalue.ValueAsDateTime.Ticks - rvalue.ValueAsDateTime.Ticks), XmlSchemaSimpleType.XdtYearMonthDuration);
+				break;
+			case XmlTypeCode.DayTimeDuration:
+				if (rvalue.XmlType.TypeCode == XmlTypeCode.DayTimeDuration)
+					return new XPathAtomicValue (new TimeSpan (lvalue.ValueAsDateTime.Ticks - rvalue.ValueAsDateTime.Ticks), XmlSchemaSimpleType.XdtDayTimeDuration);
+				break;
+			}
+
+			throw new XmlQueryException (String.Format ("Not allowed arithmetic operation: {0} - {1}", lvalue.XmlType.QualifiedName, rvalue.XmlType.QualifiedName));
+		}
+
+		/// <summary>
+		/// x * y
+		/// </summary>
+		public static XPathAtomicValue Multiply (XPathAtomicValue lvalue, XPathAtomicValue rvalue)
+		{
+			// numeric, date, time, dateTime, yearMonthDuration, dayTimeDuration
+			switch (lvalue.XmlType.TypeCode) {
+
+			// numerics
+			case XmlTypeCode.Integer:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+					return new XPathAtomicValue (lvalue.ValueAsInt64 * rvalue.ValueAsInt64, rvalue.XmlType);
+				case XmlTypeCode.Decimal:
+					return new XPathAtomicValue (lvalue.ValueAsDecimal * rvalue.ValueAsDecimal, rvalue.XmlType);
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble * rvalue.ValueAsDouble, rvalue.XmlType);
+
+				case XmlTypeCode.DayTimeDuration:
+				case XmlTypeCode.YearMonthDuration:
+					goto case XmlTypeCode.Decimal;
+				}
+				break;
+
+			case XmlTypeCode.Decimal:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+				case XmlTypeCode.Decimal:
+					return new XPathAtomicValue (lvalue.ValueAsDecimal * rvalue.ValueAsDecimal, rvalue.XmlType);
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble * rvalue.ValueAsDouble, rvalue.XmlType);
+
+				case XmlTypeCode.YearMonthDuration:
+				case XmlTypeCode.DayTimeDuration:
+					return new XPathAtomicValue (new TimeSpan ((long) (lvalue.ValueAsDateTime.Ticks * rvalue.ValueAsDecimal)), rvalue.XmlType);
+				}
+				break;
+
+			case XmlTypeCode.Float:
+			case XmlTypeCode.Double:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+				case XmlTypeCode.Decimal:
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble * rvalue.ValueAsDouble, rvalue.XmlType);
+
+				case XmlTypeCode.DayTimeDuration:
+				case XmlTypeCode.YearMonthDuration:
+					goto case XmlTypeCode.Decimal;
+				}
+				break;
+
+			// durations
+			case XmlTypeCode.DayTimeDuration:
+			case XmlTypeCode.YearMonthDuration:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+				case XmlTypeCode.Decimal:
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return Multiply (rvalue, lvalue);
+				}
+				break;
+			}
+
+			throw new XmlQueryException (String.Format ("Not allowed arithmetic operation: {0} * {1}", lvalue.XmlType.QualifiedName, rvalue.XmlType.QualifiedName));
+		}
+
+		/// <summary>
+		/// x / y
+		/// </summary>
+		public static XPathAtomicValue Divide (XPathAtomicValue lvalue, XPathAtomicValue rvalue)
+		{
+			// numeric, date, time, dateTime, yearMonthDuration, dayTimeDuration
+			switch (lvalue.XmlType.TypeCode) {
+
+			// numerics
+			case XmlTypeCode.Integer:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+					return new XPathAtomicValue (lvalue.ValueAsInt64 / rvalue.ValueAsInt64, rvalue.XmlType);
+				case XmlTypeCode.Decimal:
+					return new XPathAtomicValue (lvalue.ValueAsDecimal / rvalue.ValueAsDecimal, rvalue.XmlType);
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble / rvalue.ValueAsDouble, rvalue.XmlType);
+				}
+				break;
+
+			case XmlTypeCode.Decimal:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+				case XmlTypeCode.Decimal:
+					return new XPathAtomicValue (lvalue.ValueAsDecimal / rvalue.ValueAsDecimal, rvalue.XmlType);
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble / rvalue.ValueAsDouble, rvalue.XmlType);
+				}
+				break;
+
+			case XmlTypeCode.Float:
+			case XmlTypeCode.Double:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+				case XmlTypeCode.Decimal:
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (lvalue.ValueAsDouble / rvalue.ValueAsDouble, rvalue.XmlType);
+
+				case XmlTypeCode.DayTimeDuration:
+				case XmlTypeCode.YearMonthDuration:
+					goto case XmlTypeCode.Decimal;
+				}
+				break;
+
+			// durations
+			case XmlTypeCode.DayTimeDuration:
+			case XmlTypeCode.YearMonthDuration:
+				switch (rvalue.XmlType.TypeCode) {
+				case XmlTypeCode.Integer:
+				case XmlTypeCode.Decimal:
+				case XmlTypeCode.Float:
+				case XmlTypeCode.Double:
+					return new XPathAtomicValue (new DateTime ((long) (lvalue.ValueAsDateTime.Ticks / rvalue.ValueAsDouble)), rvalue.XmlType);
+				}
+				break;
+			}
+
+			throw new XmlQueryException (String.Format ("Not allowed arithmetic operation: {0} div {1}", lvalue.XmlType.QualifiedName, rvalue.XmlType.QualifiedName));
+		}
+
+		/// <summary>
+		/// x idiv y
+		/// </summary>
+		public static XPathAtomicValue IntDivide (XPathAtomicValue lvalue, XPathAtomicValue rvalue)
+		{
+			return new XPathAtomicValue (lvalue.ValueAsInt64 / rvalue.ValueAsInt64, XmlSchemaSimpleType.XsInteger);
+		}
+
+		/// <summary>
+		/// x imod y
+		/// </summary>
+		public static XPathAtomicValue Remainder (XPathAtomicValue lvalue, XPathAtomicValue rvalue)
+		{
+			return new XPathAtomicValue (lvalue.ValueAsInt64 % rvalue.ValueAsInt64, XmlSchemaSimpleType.XsInteger);
+		}
+	}
+}
+#endif

mcs/class/System.XML/System.Xml.Query/XQueryParser.jay

@@ -1493,13 +1493,13 @@ AdditiveExpr
 		tokenizer.State = ParseState.Default;
 	  } AdditiveExpr
 	{
-		$$ = new ArithmeticOperationExpr ((ExprSingle) $1, (ExprSingle) $4, ArithmeticOperator.Plus);
+		$$ = new ArithmeticOperationExpr ((ExprSingle) $1, (ExprSingle) $4, ArithmeticOperator.Add);
 	}
 	| MultiplicativeExpr MINUS {
 		tokenizer.State = ParseState.Default;
 	  } AdditiveExpr
 	{
-		$$ = new ArithmeticOperationExpr ((ExprSingle) $1, (ExprSingle) $4, ArithmeticOperator.Minus);
+		$$ = new ArithmeticOperationExpr ((ExprSingle) $1, (ExprSingle) $4, ArithmeticOperator.Sub);
 	}
 	;