⎕DR fixes

and increment app version
dzaima · Mar 2, 2020 · 4aa5af3 · 4aa5af3
1 parent ef70620
commit 4aa5af3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/AndroidIDE/AndroidManifest.xml b/AndroidIDE/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="2" android:versionName="0.1.4" package="dzaima.aplide">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="3" android:versionName="0.1.5" package="dzaima.aplide">
     <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="28"/>
     <application android:icon="@mipmap/ic_launcher" android:label="">
         <activity android:name=".MainActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen">

diff --git a/src/APL/Scope.java b/src/APL/Scope.java
@@ -723,26 +723,26 @@ public Obj call(Value a, Value w) {
           if (f==1) return OverBuiltin.on(this, new Fun() {
             public String repr() { return ""; }
             public Obj call(Value w) {
-              return new Num(Double.longBitsToDouble(((BigValue) UTackBuiltin.on(BigValue.TWO, w, DR.this)).i.longValueExact()));
+              return new Num(Double.longBitsToDouble(((BigValue) UTackBuiltin.on(BigValue.TWO, w, DR.this)).longValue()));
             }
           }, 1, w);
           if (f==5) return OverBuiltin.on(this, new Fun() {
             public String repr() { return ""; }
             public Obj call(Value w) {
-              return new Num(Double.longBitsToDouble(((BigValue) w).i.longValueExact()));
+              return new Num(Double.longBitsToDouble(((BigValue) w).longValue()));
             }
           }, 0, w);
         } else {
           if (t==1) return OverBuiltin.on(this, new Fun() {
             public String repr() { return ""; }
             public Obj call(Value w) {
-              return new BitArr(new long[]{Long.reverse(Double.doubleToLongBits(w.asDouble()))}, new int[]{64});
+              return new BitArr(new long[]{Long.reverse(Double.doubleToRawLongBits(w.asDouble()))}, new int[]{64});
             }
           }, 0, w);
           if (t==5) return OverBuiltin.on(this, new Fun() {
             public String repr() { return ""; }
             public Obj call(Value w) {
-              return new BigValue(Double.doubleToLongBits(w.asDouble()));
+              return new BigValue(Double.doubleToRawLongBits(w.asDouble()));
             }
           }, 0, w);
         }

diff --git a/src/APL/types/BigValue.java b/src/APL/types/BigValue.java
@@ -83,4 +83,8 @@ public static int safeInt(BigInteger b) {
     }
     return b.intValue();
   }
+  public long longValue() {
+    if (i.bitLength() > 64) throw new DomainError("using a bigint with more than 64 bits as long", this);
+    return i.longValue();
+  }
 }
diff --git a/src/APL/types/functions/builtins/dops/OverBuiltin.java b/src/APL/types/functions/builtins/dops/OverBuiltin.java
@@ -13,18 +13,18 @@ public class OverBuiltin extends Dop {
   public Obj call(Obj aa, Obj ww, Value w, DerivedDop derv) {
     isFn(aa, '⍶');
     int d = ((Value) ww).asInt();
-    return on(this, (Fun) aa, d, w);
+    return on(derv, (Fun) aa, d, w);
   }
-  public static Value on(Tokenable caller, Fun f, int d, Value w) {
+  public static Value on(Fun caller, Fun f, int d, Value w) {
     int ld = DepthBuiltin.lazy(w);
     if (ld==d || ld <= -d) {
       int fd = DepthBuiltin.full(w);
-      if (d>0 && d!=fd) throw new DomainError(caller.getToken().toRepr()+" can't match a depth " + fd + " array", caller, w);
+      if (d>0 && d!=fd) throw new DomainError(caller+" can't match a depth " + fd + " array", caller, w);
       if (d <= fd) {
         return (Value) f.call(w);
       }
     }
-    if (d>0 && ld < d) throw new DomainError(caller.getToken().toRepr()+" can't match a depth "+DepthBuiltin.full(w)+" array", caller, w);
+    if (d>0 && ld < d) throw new DomainError(caller+" can't match a depth "+DepthBuiltin.full(w)+" array", caller, w);
     Value[] res = new Value[w.ia];
     for (int i = 0; i < res.length; i++) {
       res[i] = on(caller, f, d, w.get(i));