incubator-vxquery-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prest...@apache.org
Subject svn commit: r1383255 - /incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
Date Tue, 11 Sep 2012 06:41:28 GMT
Author: prestonc
Date: Tue Sep 11 06:41:27 2012
New Revision: 1383255

URL: http://svn.apache.org/viewvc?rev=1383255&view=rev
Log:
Fixed a the untyped atomic tags for the switch statement.

Modified:
    incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java

Modified: incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java?rev=1383255&r1=1383254&r2=1383255&view=diff
==============================================================================
--- incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
(original)
+++ incubator/vxquery/trunk/vxquery/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/comparison/AbstractValueComparisonScalarEvaluatorFactory.java
Tue Sep 11 06:41:27 2012
@@ -85,16 +85,6 @@ public abstract class AbstractValueCompa
         boolean booleanResult = false;
         int tid1 = FunctionHelper.getBaseTypeForComparisons(tvp1.getTag());
         int tid2 = FunctionHelper.getBaseTypeForComparisons(tvp2.getTag());
-        if (tid1 == ValueTag.XS_UNTYPED_ATOMIC_TAG) {
-            // TODO Convert to double
-            tid1 = ValueTag.XS_DOUBLE_TAG;
-            throw new UnsupportedOperationException();
-        }
-        if (tid2 == ValueTag.XS_UNTYPED_ATOMIC_TAG) {
-            // TODO Convert to double
-            tid2 = ValueTag.XS_DOUBLE_TAG;
-            throw new UnsupportedOperationException();
-        }
         try {
             switch (tvp1.getTag()) {
                 case ValueTag.XS_INTEGER_TAG:
@@ -241,9 +231,11 @@ public abstract class AbstractValueCompa
                     break;
 
                 case ValueTag.XS_STRING_TAG:
+                case ValueTag.XS_UNTYPED_ATOMIC_TAG:
                     tvp1.getValue(tp1.utf8sp);
                     switch (tid2) {
                         case ValueTag.XS_STRING_TAG:
+                        case ValueTag.XS_UNTYPED_ATOMIC_TAG:
                             tvp2.getValue(tp2.utf8sp);
                             booleanResult = aOp.operateStringString(tp1.utf8sp, tp2.utf8sp);
                             break;



Mime
View raw message