Расширенные числовые типы

Author: aNNiMON

src/com/annimon/ownlang/exceptions/OperationIsNotSupportedException.java

@@ -5,4 +5,8 @@ public final class OperationIsNotSupportedException extends RuntimeException {
  public OperationIsNotSupportedException(Object operation) {
  super("Operation " + operation + " is not supported");
  }
+ 
+ public OperationIsNotSupportedException(Object operation, String message) {
+ super("Operation " + operation + " is not supported " + message);
+ }
 }

src/com/annimon/ownlang/lib/ArrayValue.java

@@ -72,6 +72,11 @@ public void set(int index, Value value) {
  elements[index] = value;
  }
 
+ @Override
+ public int asInt() {
+ throw new TypeException("Cannot cast array to integer");
+ }
+ 
  @Override
  public double asNumber() {
  throw new TypeException("Cannot cast array to number");

src/com/annimon/ownlang/lib/FunctionValue.java

@@ -22,6 +22,11 @@ public int type() {
  return Types.FUNCTION;
  }
 
+ @Override
+ public int asInt() {
+ throw new TypeException("Cannot cast function to integer");
+ }
+ 
  @Override
  public double asNumber() {
  throw new TypeException("Cannot cast function to number");

src/com/annimon/ownlang/lib/MapValue.java

@@ -44,6 +44,11 @@ public Value get(Value key) {
  public void set(Value key, Value value) {
  map.put(key, value);
  }
+ 
+ @Override
+ public int asInt() {
+ throw new TypeException("Cannot cast map to integer");
+ }
 
  @Override
  public double asNumber() {

src/com/annimon/ownlang/lib/NumberValue.java

@@ -6,16 +6,17 @@
  */
 public final class NumberValue implements Value {
 
+ public static final NumberValue MINUS_ONE = new NumberValue(-1);
  public static final NumberValue ZERO = new NumberValue(0);
  public static final NumberValue ONE = new NumberValue(1);
 
  public static NumberValue fromBoolean(boolean b) {
  return b ? ONE : ZERO;
  }
 
- private final double value;
+ private final Number value;
 
- public NumberValue(double value) {
+ public NumberValue(Number value) {
  this.value = value;
  }
 
@@ -24,20 +25,53 @@ public int type() {
  return Types.NUMBER;
  }
 
+ public Number raw() {
+ return value;
+ }
+ 
+ public boolean asBoolean() {
+ return value.intValue() != 0;
+ }
+ 
+ public byte asByte() {
+ return value.byteValue();
+ }
+ 
+ public short asShort() {
+ return value.shortValue();
+ }
+
+ @Override
+ public int asInt() {
+ return value.intValue();
+ }
+
+ public long asLong() {
+ return value.longValue();
+ }
+
+ public float asFloat() {
+ return value.floatValue();
+ }
+
+ public double asDouble() {
+ return value.doubleValue();
+ }
+ 
  @Override
  public double asNumber() {
- return value;
+ return value.doubleValue();
  }
 
  @Override
  public String asString() {
- return Double.toString(value);
+ return value.toString();
  }
 
  @Override
  public int hashCode() {
  int hash = 3;
- hash = 71 * hash + (int) (Double.doubleToLongBits(this.value) ^ (Double.doubleToLongBits(this.value) >>> 32));
+ hash = 71 * hash + value.hashCode();
  return hash;
  }
 
@@ -47,14 +81,33 @@ public boolean equals(Object obj) {
  if (obj == null) return false;
  if (getClass() != obj.getClass())
  return false;
- final NumberValue other = (NumberValue) obj;
- return Double.doubleToLongBits(this.value) == Double.doubleToLongBits(other.value);
+ final Number other = ((NumberValue) obj).value;
+ if (value instanceof Double || other instanceof Double) {
+ return Double.compare(value.doubleValue(), other.doubleValue()) == 0;
+ }
+ if (value instanceof Float || other instanceof Float) {
+ return Float.compare(value.floatValue(), other.floatValue()) == 0;
+ }
+ if (value instanceof Long || other instanceof Long) {
+ return Long.compare(value.longValue(), other.longValue()) == 0;
+ }
+ return Integer.compare(value.intValue(), other.intValue()) == 0;
  }
 
  @Override
  public int compareTo(Value o) {
  if (o.type() == Types.NUMBER) {
- return Double.compare(value, ((NumberValue)o).value);
+ final Number other = ((NumberValue) o).value;
+ if (value instanceof Double || other instanceof Double) {
+ return Double.compare(value.doubleValue(), other.doubleValue());
+ }
+ if (value instanceof Float || other instanceof Float) {
+ return Float.compare(value.floatValue(), other.floatValue());
+ }
+ if (value instanceof Long || other instanceof Long) {
+ return Long.compare(value.longValue(), other.longValue());
+ }
+ return Integer.compare(value.intValue(), other.intValue());
  }
  return asString().compareTo(o.asString());
  }

src/com/annimon/ownlang/lib/StringValue.java

@@ -25,6 +25,15 @@ public int type() {
  return Types.STRING;
  }
 
+ @Override
+ public int asInt() {
+ try {
+ return Integer.parseInt(value);
+ } catch (NumberFormatException e) {
+ return 0;
+ }
+ }
+ 
  @Override
  public double asNumber() {
  try {

src/com/annimon/ownlang/lib/Types.java

@@ -9,4 +9,14 @@ public final class Types {
  ARRAY = 3,
  MAP = 4,
  FUNCTION = 5;
+ 
+ private static int FIRST = OBJECT, LAST = FUNCTION;
+ private static final String[] NAMES = {"object", "number", "string", "array", "map", "function"};
+ 
+ public static String typeToString(int type) {
+ if (FIRST <= type && type <= LAST) {
+ return NAMES[type];
+ }
+ return "unknown";
+ }
 }

src/com/annimon/ownlang/lib/Value.java

@@ -6,6 +6,8 @@
  */
 public interface Value extends Comparable<Value> {
 
+ int asInt();
+ 
  double asNumber();
 
  String asString();

src/com/annimon/ownlang/lib/modules/canvas.java

@@ -22,8 +22,6 @@
  */
 public final class canvas implements Module {
 
- private static final NumberValue MINUS_ONE = new NumberValue(-1);
- 
  private static JFrame frame;
  private static CanvasPanel panel;
  private static Graphics2D graphics;
@@ -55,7 +53,7 @@ public void init() {
  Variables.set("VK_FIRE", new NumberValue(KeyEvent.VK_ENTER));
  Variables.set("VK_ESCAPE", new NumberValue(KeyEvent.VK_ESCAPE));
 
- lastKey = MINUS_ONE;
+ lastKey = NumberValue.MINUS_ONE;
  mouseHover = new ArrayValue(new Value[] { NumberValue.ZERO, NumberValue.ZERO });
  }
 
@@ -91,11 +89,7 @@ private static void clip(int x, int y, int w, int h) {
  private static Function intConsumer4Convert(IntConsumer4 consumer) {
  return args -> {
  if (args.length != 4) throw new ArgumentsMismatchException("Four args expected");
- int x = (int) args[0].asNumber();
- int y = (int) args[1].asNumber();
- int w = (int) args[2].asNumber();
- int h = (int) args[3].asNumber();
- consumer.accept(x, y, w, h);
+ consumer.accept(args[0].asInt(), args[1].asInt(), args[2].asInt(), args[3].asInt());
  return NumberValue.ZERO;
  };
  }
@@ -116,7 +110,7 @@ public void keyPressed(KeyEvent e) {
  }
  @Override
  public void keyReleased(KeyEvent e) {
- lastKey = MINUS_ONE;
+ lastKey = NumberValue.MINUS_ONE;
  }
  });
  addMouseMotionListener(new MouseMotionAdapter() {
@@ -147,13 +141,13 @@ public Value execute(Value... args) {
  title = args[0].asString();
  break;
  case 2:
- width = (int) args[0].asNumber();
- height = (int) args[1].asNumber();
+ width = args[0].asInt();
+ height = args[1].asInt();
  break;
  case 3:
  title = args[0].asString();
- width = (int) args[1].asNumber();
- height = (int) args[2].asNumber();
+ width = args[1].asInt();
+ height = args[2].asInt();
  break;
  }
  panel = new CanvasPanel(width, height);
@@ -188,8 +182,8 @@ private static class DrawString implements Function {
  @Override
  public Value execute(Value... args) {
  if (args.length != 3) throw new ArgumentsMismatchException("Three args expected");
- int x = (int) args[1].asNumber();
- int y = (int) args[2].asNumber();
+ int x = args[1].asInt();
+ int y = args[2].asInt();
  graphics.drawString(args[0].asString(), x, y);
  return NumberValue.ZERO;
  }
@@ -219,12 +213,12 @@ private static class SetColor implements Function {
  @Override
  public Value execute(Value... args) {
  if (args.length == 1) {
- graphics.setColor(new Color((int) args[0].asNumber()));
+ graphics.setColor(new Color(args[0].asInt()));
  return NumberValue.ZERO;
  }
- int r = (int) args[0].asNumber();
- int g = (int) args[1].asNumber();
- int b = (int) args[2].asNumber();
+ int r = args[0].asInt();
+ int g = args[1].asInt();
+ int b = args[2].asInt();
  graphics.setColor(new Color(r, g, b));
  return NumberValue.ZERO;
  }

src/com/annimon/ownlang/lib/modules/files.java

@@ -69,7 +69,7 @@ public Value execute(Value... args) {
  }
  return process(file, "r");
  } catch (IOException ioe) {
- return new NumberValue(-1);
+ return NumberValue.MINUS_ONE;
  }
  }
 
@@ -101,7 +101,7 @@ private static abstract class FileFunction implements Function {
  @Override
  public Value execute(Value... args) {
  if (args.length < 1) throw new ArgumentsMismatchException("File descriptor expected");
- final int key = (int) args[0].asNumber();
+ final int key = args[0].asInt();
  try {
  return execute(files.get(key), args);
  } catch (IOException ioe) {
@@ -115,7 +115,7 @@ public Value execute(Value... args) {
  private static class readBoolean extends FileFunction {
  @Override
  protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
- return new NumberValue(fileInfo.dis.readBoolean() ? 1 : 0);
+ return NumberValue.fromBoolean(fileInfo.dis.readBoolean());
  }
  }
 
@@ -132,8 +132,8 @@ protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
  final ArrayValue array = (ArrayValue) args[1];
  int offset = 0, length = array.size();
  if (args.length > 3) {
- offset = (int) args[2].asNumber();
- length = (int) args[3].asNumber();
+ offset = args[2].asInt();
+ length = args[3].asInt();
  }
 
  final byte[] buffer = new byte[length];
@@ -170,7 +170,7 @@ protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
  private static class readChar extends FileFunction {
  @Override
  protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
- return new NumberValue(fileInfo.dis.readChar());
+ return new NumberValue((short)fileInfo.dis.readChar());
  }
  }
 
@@ -239,15 +239,15 @@ protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
  private static class writeBoolean extends FileFunction {
  @Override
  protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
- fileInfo.dos.writeBoolean(args[1].asNumber() != 0);
+ fileInfo.dos.writeBoolean(args[1].asInt() != 0);
  return NumberValue.ONE;
  }
  }
 
  private static class writeByte extends FileFunction {
  @Override
  protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
- fileInfo.dos.writeByte((byte) args[1].asNumber());
+ fileInfo.dos.writeByte((byte) args[1].asInt());
  return NumberValue.ONE;
  }
  }
@@ -256,7 +256,7 @@ private static class writeChar extends FileFunction {
  @Override
  protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
  final char ch = (args[1].type() == Types.NUMBER)
- ? ((char) args[1].asNumber())
+ ? ((char) args[1].asInt())
  : args[1].asString().charAt(0);
  fileInfo.dos.writeChar(ch);
  return NumberValue.ONE;
@@ -266,15 +266,15 @@ protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
  private static class writeShort extends FileFunction {
  @Override
  protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
- fileInfo.dos.writeShort((short) args[1].asNumber());
+ fileInfo.dos.writeShort((short) args[1].asInt());
  return NumberValue.ONE;
  }
  }
 
  private static class writeInt extends FileFunction {
  @Override
  protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
- fileInfo.dos.writeInt((int) args[1].asNumber());
+ fileInfo.dos.writeInt(args[1].asInt());
  return NumberValue.ONE;
  }
  }