Skip to content

Commit

Permalink
Add support for union types and disable compiler tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@SasinduDilshara
SasinduDilshara committed Aug 21, 2024
1 parent b251984 commit d3ba651
Show file tree
Hide file tree
Showing 7 changed files with 157 additions and 163 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# See: https://help.github.com/articles/about-codeowners/

# These owners will be the default owners for everything in the repo.
* @hasithaa @prakanth97
* @hasithaa @prakanth97 @SasinduDilshara
168 changes: 48 additions & 120 deletions ...-plugin-test/src/test/java/io/ballerina/lib/data/xmldata/compiler/CompilerPluginTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,78 +55,6 @@ public void testDuplicateFieldNegative2() {
"invalid field: duplicate field found");
}

@Test
public void testUnsupportedUnionTypeNegative1() {
DiagnosticResult diagnosticResult =
CompilerPluginTestUtils.loadPackage("sample_package_3").getCompilation().diagnosticResult();
List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
.filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
.collect(Collectors.toList());
Assert.assertEquals(errorDiagnosticsList.size(), 2);
Assert.assertEquals(errorDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
"unsupported union type: union type does not support multiple non-primitive record types");
Assert.assertEquals(errorDiagnosticsList.get(1).diagnosticInfo().messageFormat(),
"unsupported union type: union type does not support multiple non-primitive record types");
}

@Test
public void testUnsupportedUnionTypeNegative2() {
DiagnosticResult diagnosticResult =
CompilerPluginTestUtils.loadPackage("sample_package_4").getCompilation().diagnosticResult();
List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
.filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
.collect(Collectors.toList());
Assert.assertEquals(errorDiagnosticsList.size(), 2);
Assert.assertEquals(errorDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
"unsupported union type: union type does not support multiple non-primitive record types");
Assert.assertEquals(errorDiagnosticsList.get(1).diagnosticInfo().messageFormat(),
"unsupported union type: union type does not support multiple non-primitive record types");
}

@Test
public void testUnsupportedTypeNegative1() {
DiagnosticResult diagnosticResult =
CompilerPluginTestUtils.loadPackage("sample_package_5").getCompilation().diagnosticResult();
List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
.filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
.collect(Collectors.toList());
Assert.assertEquals(errorDiagnosticsList.size(), 4);
Assert.assertEquals(errorDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
"unsupported union type: union type does not support multiple non-primitive record types");
Assert.assertEquals(errorDiagnosticsList.get(1).diagnosticInfo().messageFormat(),
"unsupported type: the record field does not support the expected type");
Assert.assertEquals(errorDiagnosticsList.get(2).diagnosticInfo().messageFormat(),
"unsupported type: the record field does not support the expected type");
Assert.assertEquals(errorDiagnosticsList.get(3).diagnosticInfo().messageFormat(),
"unsupported union type: union type does not support multiple non-primitive record types");
}

@Test
public void testUnsupportedTypeNegative2() {
DiagnosticResult diagnosticResult =
CompilerPluginTestUtils.loadPackage("sample_package_7").getCompilation().diagnosticResult();
List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
.filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
.collect(Collectors.toList());
Assert.assertEquals(errorDiagnosticsList.size(), 8);
Assert.assertEquals(errorDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
"unsupported union type: union type does not support multiple non-primitive record types");
Assert.assertEquals(errorDiagnosticsList.get(1).diagnosticInfo().messageFormat(),
"unsupported type: the record field does not support the expected type");
Assert.assertEquals(errorDiagnosticsList.get(2).diagnosticInfo().messageFormat(),
"unsupported type: the record field does not support the expected type");
Assert.assertEquals(errorDiagnosticsList.get(3).diagnosticInfo().messageFormat(),
"unsupported union type: union type does not support multiple non-primitive record types");
Assert.assertEquals(errorDiagnosticsList.get(4).diagnosticInfo().messageFormat(),
"unsupported union type: union type does not support multiple non-primitive record types");
Assert.assertEquals(errorDiagnosticsList.get(5).diagnosticInfo().messageFormat(),
"unsupported type: the record field does not support the expected type");
Assert.assertEquals(errorDiagnosticsList.get(6).diagnosticInfo().messageFormat(),
"unsupported type: the record field does not support the expected type");
Assert.assertEquals(errorDiagnosticsList.get(7).diagnosticInfo().messageFormat(),
"unsupported union type: union type does not support multiple non-primitive record types");
}

@Test
public void testChildRecordWithNameAnnotNegative() {
DiagnosticResult diagnosticResult =
Expand Down Expand Up @@ -157,27 +85,27 @@ public void testDuplicateFieldInInlineRecordsNegative() {
"invalid field: duplicate field found");
}

@Test
public void testUnionTypeNegative() {
DiagnosticResult diagnosticResult =
CompilerPluginTestUtils.loadPackage("sample_package_9").getCompilation().diagnosticResult();
List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
.filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
.collect(Collectors.toList());
Assert.assertEquals(errorDiagnosticsList.size(), 6);
Assert.assertEquals(errorDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
"invalid type: expected a record type");
Assert.assertEquals(errorDiagnosticsList.get(1).diagnosticInfo().messageFormat(),
"invalid field: duplicate field found");
Assert.assertEquals(errorDiagnosticsList.get(2).diagnosticInfo().messageFormat(),
"invalid field: duplicate field found");
Assert.assertEquals(errorDiagnosticsList.get(3).diagnosticInfo().messageFormat(),
"invalid type: expected a record type");
Assert.assertEquals(errorDiagnosticsList.get(4).diagnosticInfo().messageFormat(),
"invalid field: duplicate field found");
Assert.assertEquals(errorDiagnosticsList.get(5).diagnosticInfo().messageFormat(),
"invalid field: duplicate field found");
}
// @Test
// public void testUnionTypeNegative() {
// DiagnosticResult diagnosticResult =
// CompilerPluginTestUtils.loadPackage("sample_package_9").getCompilation().diagnosticResult();
// List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
// .filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
// .collect(Collectors.toList());
// Assert.assertEquals(errorDiagnosticsList.size(), 6);
// Assert.assertEquals(errorDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
// "invalid type: expected a record type");
// Assert.assertEquals(errorDiagnosticsList.get(1).diagnosticInfo().messageFormat(),
// "invalid field: duplicate field found");
// Assert.assertEquals(errorDiagnosticsList.get(2).diagnosticInfo().messageFormat(),
// "invalid field: duplicate field found");
// Assert.assertEquals(errorDiagnosticsList.get(3).diagnosticInfo().messageFormat(),
// "invalid type: expected a record type");
// Assert.assertEquals(errorDiagnosticsList.get(4).diagnosticInfo().messageFormat(),
// "invalid field: duplicate field found");
// Assert.assertEquals(errorDiagnosticsList.get(5).diagnosticInfo().messageFormat(),
// "invalid field: duplicate field found");
// }

@Test
public void testCompilerPluginWithAProjectWithSubModule() {
Expand All @@ -198,31 +126,31 @@ public void testCompilerPluginWithAProjectWithSubModule() {
"invalid annotation attachment: child record does not allow name annotation");
}

@Test
public void testComplexUnionTypeCaseWhenUserDefinedModulePrefix() {
DiagnosticResult diagnosticResult =
CompilerPluginTestUtils.loadPackage("sample_package_11").getCompilation().diagnosticResult();
List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
.filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
.collect(Collectors.toList());
Assert.assertEquals(errorDiagnosticsList.size(), 1);
Assert.assertEquals(errorDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
"invalid type: expected a record type");
}

@Test
public void testComplexUnionTypeCaseWhenUserDefinedModulePrefix2() {
DiagnosticResult diagnosticResult =
CompilerPluginTestUtils.loadPackage("sample_package_12").getCompilation().diagnosticResult();
List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
.filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
.collect(Collectors.toList());
Assert.assertEquals(errorDiagnosticsList.size(), 3);
Assert.assertEquals(errorDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
"invalid type: expected a record type");
Assert.assertEquals(errorDiagnosticsList.get(1).diagnosticInfo().messageFormat(),
"invalid type: expected a record type");
Assert.assertEquals(errorDiagnosticsList.get(2).diagnosticInfo().messageFormat(),
"invalid type: expected a record type");
}
// @Test
// public void testComplexUnionTypeCaseWhenUserDefinedModulePrefix() {
// DiagnosticResult diagnosticResult =
// CompilerPluginTestUtils.loadPackage("sample_package_11").getCompilation().diagnosticResult();
// List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
// .filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
// .collect(Collectors.toList());
// Assert.assertEquals(errorDiagnosticsList.size(), 1);
// Assert.assertEquals(errorDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
// "invalid type: expected a record type");
// }

// @Test
// public void testComplexUnionTypeCaseWhenUserDefinedModulePrefix2() {
// DiagnosticResult diagnosticResult =
// CompilerPluginTestUtils.loadPackage("sample_package_12").getCompilation().diagnosticResult();
// List<Diagnostic> errorDiagnosticsList = diagnosticResult.diagnostics().stream()
// .filter(r -> r.diagnosticInfo().severity().equals(DiagnosticSeverity.ERROR))
// .collect(Collectors.toList());
// Assert.assertEquals(errorDiagnosticsList.size(), 3);
// Assert.assertEquals(errorDiagnosticsList.get(0).diagnosticInfo().messageFormat(),
// "invalid type: expected a record type");
// Assert.assertEquals(errorDiagnosticsList.get(1).diagnosticInfo().messageFormat(),
// "invalid type: expected a record type");
// Assert.assertEquals(errorDiagnosticsList.get(2).diagnosticInfo().messageFormat(),
// "invalid type: expected a record type");
// }
}
54 changes: 28 additions & 26 deletions ...gin/src/main/java/io/ballerina/lib/data/xmldata/compiler/XmldataRecordFieldValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,17 @@ private void validateExpectedType(TypeSymbol typeSymbol, Optional<Location> loca
case TYPE_REFERENCE -> validateExpectedType(((TypeReferenceTypeSymbol) typeSymbol).typeDescriptor(),
location, ctx);
case UNION -> {
int nonErrorTypeCount = 0;
int recordCount = 0;
for (TypeSymbol memberTSymbol : ((UnionTypeSymbol) typeSymbol).memberTypeDescriptors()) {
if (getReferredTypeSymbol(memberTSymbol).typeKind() == TypeDescKind.ERROR) {
continue;
}
nonErrorTypeCount++;
validateExpectedType(memberTSymbol, location, ctx);
if (getReferredTypeSymbol(memberTSymbol).typeKind() == TypeDescKind.RECORD) {
validateExpectedType(memberTSymbol, location, ctx);
recordCount++;
}
}
if (nonErrorTypeCount > 1) {
if (recordCount == 0) {
reportDiagnosticInfo(ctx, location, XmldataDiagnosticCodes.EXPECTED_RECORD_TYPE);
}
}
Expand Down Expand Up @@ -215,7 +217,7 @@ private boolean isNotValidExpectedType(TypeSymbol typeSymbol) {
continue;
}

if (isNotValidExpectedType(memberTSymbol)) {
if (!(getReferredTypeSymbol(memberTSymbol).typeKind() == TypeDescKind.RECORD)) {
return true;
}
}
Expand Down Expand Up @@ -323,34 +325,34 @@ private void processRecordFieldsType(RecordTypeSymbol recordTypeSymbol, SyntaxNo
private void validateRecordFieldType(TypeSymbol typeSymbol, Optional<Location> location,
SyntaxNodeAnalysisContext ctx) {
switch (typeSymbol.typeKind()) {
case UNION -> validateUnionType((UnionTypeSymbol) typeSymbol, location, ctx);
// case UNION -> validateUnionType((UnionTypeSymbol) typeSymbol, location, ctx);
case NIL, TUPLE -> reportDiagnosticInfo(ctx, location, XmldataDiagnosticCodes.UNSUPPORTED_TYPE);
case ARRAY -> validateRecordFieldType(((ArrayTypeSymbol) typeSymbol).memberTypeDescriptor(), location, ctx);
case TYPE_REFERENCE ->
validateRecordFieldType(((TypeReferenceTypeSymbol) typeSymbol).typeDescriptor(), location, ctx);
}
}

private void validateUnionType(UnionTypeSymbol unionTypeSymbol, Optional<Location> location,
SyntaxNodeAnalysisContext ctx) {
int nonPrimitiveMemberCount = 0;
boolean isNilPresent = false;
List<TypeSymbol> memberTypeSymbols = unionTypeSymbol.memberTypeDescriptors();
for (TypeSymbol memberTypeSymbol : memberTypeSymbols) {
if (isPrimitiveType(memberTypeSymbol)) {
continue;
}

if (memberTypeSymbol.typeKind() == TypeDescKind.NIL) {
isNilPresent = true;
}
nonPrimitiveMemberCount++;
}

if (nonPrimitiveMemberCount > 1 || (memberTypeSymbols.size() > 1 && isNilPresent)) {
reportDiagnosticInfo(ctx, location, XmldataDiagnosticCodes.UNSUPPORTED_UNION_TYPE);
}
}
// private void validateUnionType(UnionTypeSymbol unionTypeSymbol, Optional<Location> location,
// SyntaxNodeAnalysisContext ctx) {
// int nonPrimitiveMemberCount = 0;
// boolean isNilPresent = false;
// List<TypeSymbol> memberTypeSymbols = unionTypeSymbol.memberTypeDescriptors();
// for (TypeSymbol memberTypeSymbol : memberTypeSymbols) {
// if (isPrimitiveType(memberTypeSymbol)) {
// continue;
// }
//
// if (memberTypeSymbol.typeKind() == TypeDescKind.NIL) {
// isNilPresent = true;
// }
// nonPrimitiveMemberCount++;
// }
//
// if (nonPrimitiveMemberCount > 1 || (memberTypeSymbols.size() > 1 && isNilPresent)) {
// reportDiagnosticInfo(ctx, location, XmldataDiagnosticCodes.UNSUPPORTED_UNION_TYPE);
// }
// }

private boolean isPrimitiveType(TypeSymbol typeSymbol) {
TypeDescKind kind = typeSymbol.typeKind();
Expand Down
4 changes: 3 additions & 1 deletion native/src/main/java/io/ballerina/lib/data/xmldata/utils/DiagnosticErrorCode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ public enum DiagnosticErrorCode {
UNSUPPORTED_TYPE("XML_ERROR_014", "unsupported.type"),
STREAM_BROKEN("XML_ERROR_015", "stream.broken"),
XML_PARSE_ERROR("XML_ERROR_016", "xml.parse.error"),
UNDEFINED_FIELD("XML_ERROR_0017", "undefined.field");
UNDEFINED_FIELD("XML_ERROR_0017", "undefined.field"),
CANNOT_CONVERT_SOURCE_INTO_EXP_TYPE("XML_ERROR_0018", "cannot.convert.source.into.expected.type"),
FIELD_CANNOT_CAST_INTO_TYPE("XML_ERROR_0019", "field.cannot.convert.into.type");

String diagnosticId;
String messageKey;
Expand Down
2 changes: 1 addition & 1 deletion native/src/main/java/io/ballerina/lib/data/xmldata/xml/XmlParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public static Object parse(Reader reader, BMap<BString, Object> options, Type ty
} catch (BError e) {
return e;
} catch (Throwable e) {
return DiagnosticLog.error(DiagnosticErrorCode.XML_PARSE_ERROR, e.getMessage());
throw DiagnosticLog.error(DiagnosticErrorCode.XML_PARSE_ERROR, e.getMessage());
}
}

Expand Down
Loading

0 comments on commit d3ba651

Please sign in to comment.