Merge pull request #297 from travisbrown/topic/21.0.0

Prepare for 21.0.0

modules/cats/src/main/scala/org/dhallj/cats/LiftVisitor.scala

@@ -1,6 +1,7 @@
 package org.dhallj.cats
 
 import cats.Applicative
+import java.math.BigDecimal
 import java.math.BigInteger
 import java.net.URI
 import java.nio.file.Path
@@ -23,6 +24,9 @@ class LiftVisitor[F[_] <: AnyRef](
   def onNatural(self: Expr, value: BigInteger): F[Expr] = F.pure(self)
   def onInteger(self: Expr, value: BigInteger): F[Expr] = F.pure(self)
   def onDouble(self: Expr, value: Double): F[Expr] = F.pure(self)
+  def onDate(self: Expr, year: Int, month: Int, day: Int): F[Expr] = F.pure(self)
+  def onTime(self: Expr, hour: Int, minute: Int, second: Int, fractional: BigDecimal): F[Expr] = F.pure(self)
+  def onTimeZone(self: Expr, seconds: Int): F[Expr] = F.pure(self)
   def onBuiltIn(self: Expr, name: String): F[Expr] = F.pure(self)
   def onIdentifier(self: Expr, value: String, index: Long): F[Expr] = F.pure(self)
 

modules/core/src/main/java/org/dhallj/cbor/Writer.java

@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.io.OutputStream;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.charset.Charset;
 import java.security.MessageDigest;
@@ -102,8 +103,11 @@ public final void writeBoolean(boolean value) {
   }
 
   public final void writeLong(long value) {
-    this.writeTypeAndLength(
-        (value >= 0) ? MajorType.UNSIGNED_INTEGER.value : MajorType.NEGATIVE_INTEGER.value, value);
+    if (value >= 0) {
+      this.writeTypeAndLength(MajorType.UNSIGNED_INTEGER.value, value);
+    } else {
+      this.writeTypeAndLength(MajorType.NEGATIVE_INTEGER.value, -(value + 1));
+    }
   }
 
   public final void writeBigInteger(BigInteger value) {
@@ -114,6 +118,13 @@ public final void writeBigInteger(BigInteger value) {
     }
   }
 
+  public final void writeBigDecimal(BigDecimal value) {
+    this.writeTypeAndLength(MajorType.SEMANTIC_TAG.value, 4);
+    this.writeTypeAndLength(MajorType.ARRAY.value, 2);
+    this.writeLong(-((long) value.scale()));
+    this.writeBigInteger(value.unscaledValue());
+  }
+
   public final void writeString(String value) {
     byte[] bytes = value.getBytes(UTF_8);
     this.writeTypeAndLength(MajorType.TEXT_STRING.value, bytes.length);

modules/core/src/main/java/org/dhallj/core/Constructors.java

@@ -1,5 +1,6 @@
 package org.dhallj.core;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URI;
 import java.nio.file.Path;
@@ -71,6 +72,68 @@ final <A> void advance(VisitState<A> state) {
     }
   }
 
+  static final class DateLiteral extends Expr {
+    final int year;
+    final int month;
+    final int day;
+
+    DateLiteral(int year, int month, int day) {
+      super(Tags.DATE);
+      this.year = year;
+      this.month = month;
+      this.day = day;
+    }
+
+    public final <A> A accept(ExternalVisitor<A> visitor) {
+      return visitor.onDate(this.year, this.month, this.day);
+    }
+
+    final <A> void advance(VisitState<A> state) {
+      state.valueStack.push(state.visitor.onDate(this, this.year, this.month, this.day));
+    }
+  }
+
+  static final class TimeLiteral extends Expr {
+    final int hour;
+    final int minute;
+    final int second;
+    final BigDecimal fractional;
+
+    TimeLiteral(int hour, int minute, int second, BigDecimal fractional) {
+      super(Tags.TIME);
+      this.hour = hour;
+      this.minute = minute;
+      this.second = second;
+      this.fractional = fractional;
+    }
+
+    public final <A> A accept(ExternalVisitor<A> visitor) {
+      return visitor.onTime(this.hour, this.minute, this.second, this.fractional);
+    }
+
+    final <A> void advance(VisitState<A> state) {
+      state.valueStack.push(
+          state.visitor.onTime(this, this.hour, this.minute, this.second, this.fractional));
+    }
+  }
+
+  static final class TimeZoneLiteral extends Expr {
+    final int minutes;
+
+    TimeZoneLiteral(int minutes) {
+      super(Tags.TIME_ZONE);
+      this.minutes = minutes;
+    }
+
+    public final <A> A accept(ExternalVisitor<A> visitor) {
+      return visitor.onTimeZone(this.minutes);
+    }
+
+    final <A> void advance(VisitState<A> state) {
+      state.valueStack.push(state.visitor.onTimeZone(this, this.minutes));
+    }
+  }
+
   static final class TextLiteral extends Expr {
     final String[] parts;
     final Expr[] interpolated;

modules/core/src/main/java/org/dhallj/core/DhallException.java

@@ -28,18 +28,34 @@ public ParsingFailure(String message) {
   }
 
   public static final class ResolutionFailure extends DhallException {
+    private boolean isAbsentImport;
+
     @Override
     public Throwable fillInStackTrace() {
       // This is a failure type; stack traces aren't useful.
       return this;
     }
 
-    public ResolutionFailure(String message, Throwable cause) {
+    public ResolutionFailure(String message, Throwable cause, boolean isAbsentImport) {
       super(message, cause);
+      this.isAbsentImport = isAbsentImport;
     }
 
-    public ResolutionFailure(String message) {
+    public ResolutionFailure(String message, boolean isAbsentImport) {
       super(message);
+      this.isAbsentImport = isAbsentImport;
+    }
+
+    public ResolutionFailure(String message, Throwable cause) {
+      this(message, cause, false);
+    }
+
+    public ResolutionFailure(String message) {
+      this(message, false);
+    }
+
+    public boolean isAbsentImport() {
+      return this.isAbsentImport;
     }
   }
 }

modules/core/src/main/java/org/dhallj/core/Expr.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URI;
 import java.nio.file.Path;
@@ -583,6 +584,11 @@ public static final class Constants {
     public static final Expr TEXT = new Constructors.BuiltIn("Text");
     public static final Expr NONE = new Constructors.BuiltIn("None");
     public static final Expr SOME = new Constructors.BuiltIn("Some");
+
+    public static final Expr DATE = new Constructors.BuiltIn("Date");
+    public static final Expr TIME = new Constructors.BuiltIn("Time");
+    public static final Expr TIME_ZONE = new Constructors.BuiltIn("TimeZone");
+
     public static final Expr NATURAL_FOLD = new Constructors.BuiltIn("Natural/fold");
     public static final Expr LIST_FOLD = new Constructors.BuiltIn("List/fold");
     public static final Expr ZERO = makeNaturalLiteral(BigInteger.ZERO);
@@ -605,6 +611,7 @@ public static final class Constants {
 
     static {
       builtIns.put("Bool", BOOL);
+      builtIns.put("Date", DATE);
       builtIns.put("Double", DOUBLE);
       builtIns.put("Double/show", new Constructors.BuiltIn("Double/show"));
       builtIns.put("False", FALSE);
@@ -638,6 +645,8 @@ public static final class Constants {
       builtIns.put("Text", TEXT);
       builtIns.put("Text/replace", new Constructors.BuiltIn("Text/replace"));
       builtIns.put("Text/show", new Constructors.BuiltIn("Text/show"));
+      builtIns.put("Time", TIME);
+      builtIns.put("TimeZone", TIME_ZONE);
       builtIns.put("True", TRUE);
       builtIns.put("Type", TYPE);
 
@@ -708,6 +717,19 @@ public static final Expr makeIntegerLiteral(BigInteger value) {
     return new Constructors.IntegerLiteral(value);
   }
 
+  public static final Expr makeDateLiteral(int year, int month, int day) {
+    return new Constructors.DateLiteral(year, month, day);
+  }
+
+  public static final Expr makeTimeLiteral(
+      int hour, int minute, int second, BigDecimal fractional) {
+    return new Constructors.TimeLiteral(hour, minute, second, fractional);
+  }
+
+  public static final Expr makeTimeZoneLiteral(int seconds) {
+    return new Constructors.TimeZoneLiteral(seconds);
+  }
+
   public static final Expr makeTextLiteral(String[] parts, Expr[] interpolated) {
     return new Constructors.TextLiteral(parts, interpolated);
   }

modules/core/src/main/java/org/dhallj/core/ExternalVisitor.java

@@ -1,5 +1,6 @@
 package org.dhallj.core;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URI;
 import java.nio.file.Path;
@@ -19,6 +20,12 @@ public interface ExternalVisitor<A> {
 
   A onDouble(double value);
 
+  A onDate(int year, int month, int day);
+
+  A onTime(int hour, int minute, int second, BigDecimal fractional);
+
+  A onTimeZone(int minutes);
+
   A onBuiltIn(String name);
 
   A onIdentifier(String name, long index);
@@ -114,6 +121,21 @@ public A onDouble(double value) {
       return this.getReturnValue();
     }
 
+    @Override
+    public A onDate(int year, int month, int day) {
+      return this.getReturnValue();
+    }
+
+    @Override
+    public A onTime(int hour, int minute, int second, BigDecimal fractional) {
+      return this.getReturnValue();
+    }
+
+    @Override
+    public A onTimeZone(int minutes) {
+      return this.getReturnValue();
+    }
+
     @Override
     public A onBuiltIn(String name) {
       return this.getReturnValue();

modules/core/src/main/java/org/dhallj/core/Tags.java

@@ -1,5 +1,6 @@
 package org.dhallj.core;
 
+// Note that these are internal identifiers only.
 final class Tags {
   static final int NOTE = 0;
 
@@ -9,6 +10,9 @@ final class Tags {
   static final int DOUBLE = 3;
   static final int BUILT_IN = 4;
   static final int IDENTIFIER = 5;
+  static final int DATE = 31;
+  static final int TIME = 32;
+  static final int TIME_ZONE = 33;
 
   // Binding constructors.
   static final int LAMBDA = 6;

modules/core/src/main/java/org/dhallj/core/ToStringVisitor.java

@@ -1,5 +1,6 @@
 package org.dhallj.core;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URI;
 import java.nio.charset.Charset;
@@ -77,6 +78,45 @@ public ToStringState onDouble(Expr self, double value) {
     return new ToStringState(Double.toString(value));
   }
 
+  private static String pad2(int input) {
+    String asString = Integer.toString(input);
+    if (asString.length() == 1) {
+      return "0" + asString;
+    } else {
+      return asString;
+    }
+  }
+
+  private static String pad4(int input) {
+    String asString = Integer.toString(input);
+    for (int i = 0; i < asString.length() - 4; i += 1) {
+      asString = "0" + asString;
+    }
+    return asString;
+  }
+
+  public ToStringState onDate(Expr self, int year, int month, int day) {
+    return new ToStringState(pad4(year) + "-" + pad2(month) + "-" + pad2(day));
+  }
+
+  public ToStringState onTime(Expr self, int hour, int minute, int second, BigDecimal fractional) {
+    String result = pad2(hour) + ":" + pad2(minute) + ":" + pad2(second);
+
+    if (!fractional.equals(BigDecimal.ZERO)) {
+      result = result + fractional.toString().substring(1);
+    }
+
+    return new ToStringState(result);
+  }
+
+  public ToStringState onTimeZone(Expr self, int minutes) {
+    if (Long.signum(minutes) < 0) {
+      return new ToStringState("-" + pad2(-minutes / 60) + pad2(-minutes % 60));
+    } else {
+      return new ToStringState("+" + pad2(minutes / 60) + pad2(minutes % 60));
+    }
+  }
+
   public ToStringState onBuiltIn(Expr self, String name) {
     return new ToStringState(name);
   }

modules/core/src/main/java/org/dhallj/core/Visitor.java

@@ -1,5 +1,6 @@
 package org.dhallj.core;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URI;
 import java.nio.file.Path;
@@ -23,6 +24,12 @@ public interface Visitor<A> {
 
   A onDouble(Expr self, double value);
 
+  A onDate(Expr self, int year, int month, int day);
+
+  A onTime(Expr self, int hour, int minute, int second, BigDecimal fractional);
+
+  A onTimeZone(Expr self, int minutes);
+
   A onBuiltIn(Expr self, String value);
 
   A onIdentifier(Expr self, String value, long index);
@@ -340,6 +347,21 @@ public A onDouble(Expr self, double value) {
       return this.getReturnValue();
     }
 
+    @Override
+    public A onDate(Expr self, int year, int month, int day) {
+      return this.getReturnValue();
+    }
+
+    @Override
+    public A onTime(Expr self, int hour, int minute, int second, BigDecimal fractional) {
+      return this.getReturnValue();
+    }
+
+    @Override
+    public A onTimeZone(Expr self, int minutes) {
+      return this.getReturnValue();
+    }
+
     @Override
     public A onBuiltIn(Expr self, String value) {
       return this.getReturnValue();
@@ -649,6 +671,18 @@ public Expr onDouble(Expr self, double value) {
       return self;
     }
 
+    public Expr onDate(Expr self, int year, int month, int day) {
+      return self;
+    }
+
+    public Expr onTime(Expr self, int hour, int minute, int second, BigDecimal fractional) {
+      return self;
+    }
+
+    public Expr onTimeZone(Expr self, int minutes) {
+      return self;
+    }
+
     public Expr onBuiltIn(Expr self, String name) {
       return self;
     }