Components must be supplied in their lexical representation: * month 1–12, day 1–31, hours 0–23, minutes 0–59, seconds in [0–60). - * For BC years, pass a negative year (not 0). Undefined components must + * For BC years, pass a negative year or 0 (for year 0). Undefined components must * be {@code null}.
* *This method is intended as a low-level construction helper for @@ -164,7 +164,7 @@ public static ADate buildUnchecked(final BasicType targetType, final Long hours, final Long minutes, final BigDecimal seconds, final DTDur zone, final InputInfo info) throws QueryException { final Dtm base = new Dtm(targetType); - base.year = year == null ? Long.MAX_VALUE : year < 0 ? year + 1 : year; + base.year = year == null ? Long.MAX_VALUE : year; base.month = month == null ? -1 : (byte) (month - 1); base.day = day == null ? -1 : (byte) (day - 1); base.hour = hours == null ? -1 : hours.byteValue(); diff --git a/basex-core/src/main/java/org/basex/query/value/item/Flt.java b/basex-core/src/main/java/org/basex/query/value/item/Flt.java index 7630c1da74..5a940f344f 100644 --- a/basex-core/src/main/java/org/basex/query/value/item/Flt.java +++ b/basex-core/src/main/java/org/basex/query/value/item/Flt.java @@ -141,7 +141,7 @@ public boolean equals(final Object obj) { public static float parse(final byte[] value, final InputInfo info) throws QueryException { final byte[] v = Token.trim(value); if(Token.eq(v, Token.NAN)) return Float.NaN; - if(Token.eq(v, Token.POSITIVE_INF)) return Float.POSITIVE_INFINITY; + if(Token.eq(v, Token.POSITIVE_INF, Token.POSITIVE_INF_PLUS)) return Float.POSITIVE_INFINITY; if(Token.eq(v, Token.NEGATIVE_INF)) return Float.NEGATIVE_INFINITY; if(!Token.eq(v, Token.POSITIVE_INFINITY, Token.NEGATIVE_INFINITY)) { try { diff --git a/basex-core/src/main/java/org/basex/query/value/item/GDt.java b/basex-core/src/main/java/org/basex/query/value/item/GDt.java index a61a1309e1..929a9babf5 100644 --- a/basex-core/src/main/java/org/basex/query/value/item/GDt.java +++ b/basex-core/src/main/java/org/basex/query/value/item/GDt.java @@ -65,8 +65,6 @@ public GDt(final byte[] date, final Type type, final InputInfo info) throws Quer if(i < 2) { year = toLong(mt.group(1), false, info); - // +1 is added to BC values to simplify computations - if(year < 0) year++; if(year < MIN_YEAR || year >= MAX_YEAR) throw DATERANGE_X_X.get(info, type, date); } if(i > 0 && i < 4) { @@ -105,7 +103,7 @@ public byte[] string(final InputInfo ii) { if(year == Long.MAX_VALUE) { tb.add('-'); } else { - if(year <= 0) tb.add('-'); + if(year < 0) tb.add('-'); prefix(tb, Math.abs(yea()), 4); } if(month >= 0 || day >= 0) tb.add('-'); diff --git a/basex-core/src/main/java/org/basex/util/Token.java b/basex-core/src/main/java/org/basex/util/Token.java index c3954d024b..47b2621b70 100644 --- a/basex-core/src/main/java/org/basex/util/Token.java +++ b/basex-core/src/main/java/org/basex/util/Token.java @@ -46,6 +46,8 @@ public final class Token { public static final byte[] NAN = token("NaN"); /** Token 'INF'. */ public static final byte[] POSITIVE_INF = token("INF"); + /** Token '+INF'. */ + public static final byte[] POSITIVE_INF_PLUS = token("+INF"); /** Token '-INF'. */ public static final byte[] NEGATIVE_INF = token("-INF"); /** Token 'Infinity'. */ diff --git a/basex-core/src/test/java/org/basex/query/func/FnModuleTest.java b/basex-core/src/test/java/org/basex/query/func/FnModuleTest.java index c657209399..70acae56b6 100644 --- a/basex-core/src/test/java/org/basex/query/func/FnModuleTest.java +++ b/basex-core/src/test/java/org/basex/query/func/FnModuleTest.java @@ -415,6 +415,8 @@ public final class FnModuleTest extends SandboxTest { + " \"timezone\": xs:dayTimeDuration('PT1H') }"), "---03+01:00"); query(func.args(" dateTime-record(day:=4)"), "---04"); + // year 0 + query(func.args(" {\"year\": 0, \"month\": 1, \"day\": 1}"), "0000-01-01"); // empty map error(func.args(" {}"), INVDATETIMEFIELDS_X); @@ -427,8 +429,6 @@ public final class FnModuleTest extends SandboxTest { // out of range component (minutes) error(func.args(" {\"hours\": 14, \"minutes\": 60, \"seconds\": 0," + " \"timezone\": xs:dayTimeDuration('PT1H') }"), INVDATETIMEVALUE_X_X); - // invalid year (0) - error(func.args(" {\"year\": 0}"), INVDATETIMEVALUE_X_X); // invalid date (March 0) error(func.args(" {\"year\": 2026, \"month\": 3, \"day\": 0," + " \"timezone\": xs:dayTimeDuration('PT1H') }"), INVDATETIMEVALUE_X_X); diff --git a/basex-core/src/test/java/org/basex/query/simple/SimpleTest.java b/basex-core/src/test/java/org/basex/query/simple/SimpleTest.java index 2718b52e26..ab5a690036 100644 --- a/basex-core/src/test/java/org/basex/query/simple/SimpleTest.java +++ b/basex-core/src/test/java/org/basex/query/simple/SimpleTest.java @@ -25,6 +25,7 @@ public final class SimpleTest extends QueryTest { { "Float 6", "xs:float('-infinity')" }, { "Float 7", booleans(true), "xs:float('-INF') < 0" }, { "Float 8", "xs:float('-inf')" }, + { "Float 9", booleans(true), "xs:float('+INF') > 0" }, { "Double 1", "xs:double('Infinity')" }, { "Double 2", "xs:double('infinity')" }, @@ -34,6 +35,7 @@ public final class SimpleTest extends QueryTest { { "Double 6", "xs:double('-infinity')" }, { "Double 7", booleans(true), "xs:double('-INF') < 0" }, { "Double 8", "xs:double('-inf')" }, + { "Double 9", booleans(true), "xs:double('+INF') > 0" }, { "UnsignedLong 1", booleans(false), "xs:unsignedLong('3') eq 3.1"}, { "UnsignedLong 2", booleans(false), "3.1 eq xs:unsignedLong('3')"},