Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix numeric literal formatting #40

Merged
merged 1 commit into from
Nov 2, 2024
Merged

Fix numeric literal formatting #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/main/java/de/atextor/turtle/formatter/TurtleFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ public class TurtleFormatter implements Function<Model, String>, BiConsumer<Mode

private static final Logger LOG = LoggerFactory.getLogger( TurtleFormatter.class );

private static final Pattern XSD_DECIMAL_UNQUOTED_REGEX = Pattern.compile("[+-]?\\d*\\.\\d+");

private static final Pattern XSD_DOUBLE_UNQUOTED_REGEX = Pattern.compile("(([+-]?\\d+\\.\\d+)|([+-]?\\.\\d+)|([+-]?\\d+))[eE][+-]?\\d+");

/**
* String escape sequences as described in <a href="https://www.w3.org/TR/turtle/#sec-escapes">Escape Sequences</a>.
* <p>
Expand Down Expand Up @@ -626,7 +630,8 @@ private State writeLiteral( final Literal literal, final State state ) {
if ( datatypeUri.equals( XSD.xdouble.getURI() ) ) {
if ( style.enableDoubleFormatting ) {
return state.write( style.doubleFormat.format( literal.getDouble() ) );
} else {
} else if (XSD_DOUBLE_UNQUOTED_REGEX.matcher(literal.getLexicalForm()).matches()) {
// only use unquoted form if it will be parsed as an xsd:double
return state.write( literal.getLexicalForm() );
}
}
Expand All @@ -637,7 +642,10 @@ private State writeLiteral( final Literal literal, final State state ) {
return state.write( quoteAndEscape( literal ) );
}
if ( datatypeUri.equals( XSD.decimal.getURI() ) ) {
return state.write( literal.getLexicalForm() );
if (XSD_DECIMAL_UNQUOTED_REGEX.matcher(literal.getLexicalForm()).matches()) {
// only use unquoted form if it will be parsed as an xsd:decimal
return state.write(literal.getLexicalForm());
}
}
if ( datatypeUri.equals( XSD.integer.getURI() ) ) {
return state.write( literal.getLexicalForm() );
Expand Down
73 changes: 73 additions & 0 deletions src/test/java/de/atextor/turtle/formatter/TurtleFormatterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,6 +1084,79 @@ public void testIntegerLiteralWithLeadingZeros(){
assertThat(result.trim()).isEqualTo(expected);
}

@Test
public void testDoubleLiteralWithoutFractions(){
String content = """
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix : <http://example.com/ns#> .
:thing :value "40"^^xsd:double.
""";
String expected = """
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix : <http://example.com/ns#> .

:thing :value "40"^^xsd:double .""";
final FormattingStyle style = FormattingStyle.DEFAULT;
final TurtleFormatter formatter = new TurtleFormatter(style);
final String result = formatter.applyToContent(content);
assertThat(result.trim()).isEqualTo(expected);
}

@Test
public void testDoubleLiteralWithFractions(){
String content = """
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix : <http://example.com/ns#> .
:thing :value "4.001E2"^^xsd:double.
""";
String expected = """
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix : <http://example.com/ns#> .

:thing :value 4.001E2 .""";
final FormattingStyle style = FormattingStyle.DEFAULT;
final TurtleFormatter formatter = new TurtleFormatter(style);
final String result = formatter.applyToContent(content);
assertThat(result.trim()).isEqualTo(expected);
}

@Test
public void testDecimalLiteralWithoutFractions(){
String content = """
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix : <http://example.com/ns#> .
:thing :value "40"^^xsd:decimal.
""";
String expected = """
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix : <http://example.com/ns#> .

:thing :value "40"^^xsd:decimal .""";
final FormattingStyle style = FormattingStyle.DEFAULT;
final TurtleFormatter formatter = new TurtleFormatter(style);
final String result = formatter.applyToContent(content);
assertThat(result.trim()).isEqualTo(expected);
}

@Test
public void testDecimalLiteralWithFractions(){
String content = """
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix : <http://example.com/ns#> .
:thing :value "40.0001"^^xsd:decimal.
""";
String expected = """
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix : <http://example.com/ns#> .

:thing :value 40.0001 .""";
final FormattingStyle style = FormattingStyle.DEFAULT;
final TurtleFormatter formatter = new TurtleFormatter(style);
final String result = formatter.applyToContent(content);
assertThat(result.trim()).isEqualTo(expected);
}


private Model modelFromString( final String content ) {
final Model model = ModelFactory.createDefaultModel();
final InputStream stream = new ByteArrayInputStream( content.getBytes( StandardCharsets.UTF_8 ) );
Expand Down
Loading