Get rid of BOrderedTypeVisitor

ballerina-platform · Oct 21, 2024 · 34a6cec · 34a6cec
1 parent 01fc6e4
commit 34a6cec
Show file tree

Hide file tree

Showing 10 changed files with 365 additions and 464 deletions.
diff --git a/...ng/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/QueryTypeChecker.java b/...ng/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/QueryTypeChecker.java
@@ -915,7 +915,7 @@ public void visit(BLangOrderByClause orderByClause, TypeChecker.AnalyzerData dat
         orderByClause.env = data.commonAnalyzerData.queryEnvs.peek();
         for (OrderKeyNode orderKeyNode : orderByClause.getOrderKeyList()) {
             BType exprType = checkExpr((BLangExpression) orderKeyNode.getOrderKey(), orderByClause.env, data);
-            if (exprType.tag != TypeTags.SEMANTIC_ERROR && !types.isOrderedType(exprType, false)) {
+            if (exprType.tag != TypeTags.SEMANTIC_ERROR && !types.isOrderedType(exprType)) {
                 dlog.error(((BLangOrderKey) orderKeyNode).expression.pos, DiagnosticErrorCode.ORDER_BY_NOT_SUPPORTED);
             }
         }

diff --git a/...lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolResolver.java b/...lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/SymbolResolver.java
@@ -2060,8 +2060,7 @@ public BSymbol getBinaryComparisonOpForTypeSets(OperatorKind opKind, BType lhsTy
             case LESS_EQUAL:
             case GREATER_THAN:
             case GREATER_EQUAL:
-                validOrderedTypesExist = types.isOrderedType(lhsType, false) &&
-                        types.isOrderedType(rhsType, false) && types.isSameOrderedType(lhsType, rhsType);
+                validOrderedTypesExist = types.comparable(lhsType, rhsType);
                 break;
             default:
                 return symTable.notFoundSymbol;

diff --git a/...na-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java b/...na-lang/src/main/java/org/wso2/ballerinalang/compiler/semantics/analyzer/TypeChecker.java
@@ -7618,7 +7618,7 @@ private void checkArrayLibSortFuncArgs(BLangInvocation iExpr) {
 
         BLangExpression arrExpr = argExprs.get(0);
         BType arrType = arrExpr.getBType();
-        boolean isOrderedType = types.isOrderedType(arrType, false);
+        boolean isOrderedType = types.isOrderedType(arrType);
         if (keyFunction == null) {
             if (!isOrderedType) {
                 dlog.error(arrExpr.pos, DiagnosticErrorCode.INVALID_SORT_ARRAY_MEMBER_TYPE, arrType);
@@ -7658,7 +7658,7 @@ private void checkArrayLibSortFuncArgs(BLangInvocation iExpr) {
             returnType = keyLambdaFunction.function.getBType().getReturnType();
         }
 
-        if (!types.isOrderedType(returnType, false)) {
+        if (!types.isOrderedType(returnType)) {
             dlog.error(pos, DiagnosticErrorCode.INVALID_SORT_FUNC_RETURN_TYPE, returnType);
         }
     }