You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2012/08/22 00:03:31 UTC
svn commit: r1375821 -
/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java
Author: prestonc
Date: Tue Aug 21 22:03:30 2012
New Revision: 1375821
URL: http://svn.apache.org/viewvc?rev=1375821&view=rev
Log:
Clean up for the cast switch statement.
Modified:
incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java
Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java?rev=1375821&r1=1375820&r2=1375821&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java (original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastScalarEvaluatorFactory.java Tue Aug 21 22:03:30 2012
@@ -66,7 +66,7 @@ public class CastScalarEvaluatorFactory
@Override
protected void evaluate(TaggedValuePointable tvp, IPointable result) throws SystemException {
- int tid = getBaseTypeForCasts(tvp.getTag());
+ int tid = tvp.getTag();
if (tid == ValueTag.XS_UNTYPED_ATOMIC_TAG) {
// TODO Convert to double
tid = ValueTag.XS_DOUBLE_TAG;
@@ -380,56 +380,6 @@ public class CastScalarEvaluatorFactory
}
}
- private int getBaseTypeForCasts(int tid) throws SystemException {
- while (true) {
- switch (tid) {
- // Primitive Datatypes
- case ValueTag.XS_ANY_URI_TAG:
- case ValueTag.XS_BASE64_BINARY_TAG:
- case ValueTag.XS_BOOLEAN_TAG:
- case ValueTag.XS_DATE_TAG:
- case ValueTag.XS_DATETIME_TAG:
- case ValueTag.XS_DAY_TIME_DURATION_TAG:
- case ValueTag.XS_DECIMAL_TAG:
- case ValueTag.XS_DOUBLE_TAG:
- case ValueTag.XS_DURATION_TAG:
- case ValueTag.XS_FLOAT_TAG:
- case ValueTag.XS_G_DAY_TAG:
- case ValueTag.XS_G_MONTH_DAY_TAG:
- case ValueTag.XS_G_MONTH_TAG:
- case ValueTag.XS_G_YEAR_MONTH_TAG:
- case ValueTag.XS_G_YEAR_TAG:
- case ValueTag.XS_HEX_BINARY_TAG:
- case ValueTag.XS_INTEGER_TAG:
- case ValueTag.XS_QNAME_TAG:
- case ValueTag.XS_STRING_TAG:
- case ValueTag.XS_TIME_TAG:
- case ValueTag.XS_UNTYPED_ATOMIC_TAG:
- case ValueTag.XS_YEAR_MONTH_DURATION_TAG:
- // Derived Datatypes
- case ValueTag.XS_BYTE_TAG:
- case ValueTag.XS_INT_TAG:
- case ValueTag.XS_LONG_TAG:
- case ValueTag.XS_NEGATIVE_INTEGER_TAG:
- case ValueTag.XS_NON_NEGATIVE_INTEGER_TAG:
- case ValueTag.XS_NON_POSITIVE_INTEGER_TAG:
- case ValueTag.XS_POSITIVE_INTEGER_TAG:
- case ValueTag.XS_SHORT_TAG:
- case ValueTag.XS_UNSIGNED_BYTE_TAG:
- case ValueTag.XS_UNSIGNED_INT_TAG:
- case ValueTag.XS_UNSIGNED_LONG_TAG:
- case ValueTag.XS_UNSIGNED_SHORT_TAG:
- return tid;
-
- case ValueTag.XS_ANY_ATOMIC_TAG:
- throw new SystemException(ErrorCode.XPTY0004);
-
- default:
- tid = BuiltinTypeRegistry.INSTANCE.getSchemaTypeById(tid).getBaseType().getTypeId();
- }
- }
- }
-
};
}