2004-08-31 Atsushi Enomoto <atsushi@ximian.com>

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

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

diff --git a/mcs/class/System.XML/System.Xml.Query/ChangeLog b/mcs/class/System.XML/System.Xml.Query/ChangeLog
index e781ea9556a528fcf65b461432f20e2e00961138..efc35727469a8090ca4311e579ab8d6231a07c65 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Query/ChangeLog
+++ b/mcs/class/System.XML/System.Xml.Query/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-31  Atsushi Enomoto <atsushi@ximian.com>
+
+       * XQueryArithmeticOperator.cs : added.
+       * XPath2Expression.cs, XQueryParser.jay :
+         renamed some ArithmeticOperator enumeration members.
+         Implemented ArithmeticOperationExpr.Evaluate().
+
 2004-08-30  Atsushi Enomoto <atsushi@ximian.com>
 
        * XPathSequence.cs : fixed NodeIterator to get correct current node

diff --git a/mcs/class/System.XML/System.Xml.Query/XPath2Expression.cs b/mcs/class/System.XML/System.Xml.Query/XPath2Expression.cs
index 26c4789c8373f078737f8dedf7f3357f816c376b..9f19a0312a88b9d33846fe4d0ad739d415364f44 100755 (executable)
--- a/mcs/class/System.XML/System.Xml.Query/XPath2Expression.cs
+++ b/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
        }

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

diff --git a/mcs/class/System.XML/System.Xml.Query/XQueryParser.jay b/mcs/class/System.XML/System.Xml.Query/XQueryParser.jay
index e59e5efb686c2cf9960e3b867fdaf6b17142940c..6e29d65981bf834472e72201e6c4677ee5c322cb 100755 (executable)
--- a/mcs/class/System.XML/System.Xml.Query/XQueryParser.jay
+++ b/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);
        }
        ;