ilyakooo0/airlock
1
0
Fork 0
mirror of https://github.com/ilyakooo0/airlock.git synced 2024-08-16 14:00:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Switched to bigint

Browse Source
This commit is contained in:
iko 2023-06-15 13:51:02 +03:00
parent 5934adc2de
commit 4988fc5c0e
Signed by untrusted user: iko
GPG Key ID: 82C257048D1026F2
7 changed files with 83 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elm.json
View File

@ -11,6 +11,7 @@
"dependencies": {
"TSFoster/elm-bytes-extra": "1.3.0 <= v < 1.4.0",
"chelovek0v/bbase64": "1.0.1 <= v < 2.0.0",
"cmditch/elm-bigint": "2.0.1 <= v < 3.0.0",
"elm/browser": "1.0.2 <= v < 2.0.0",
"elm/bytes": "1.0.8 <= v < 2.0.0",
"elm/core": "1.0.0 <= v < 1.0.5",
@ -20,7 +21,7 @@
"elm/url": "1.0.0 <= v < 2.0.0",
"elm-community/list-extra": "8.7.0 <= v < 9.0.0",
"elm-community/maybe-extra": "5.3.0 <= v < 6.0.0",
"folkertdev/elm-int64": "1.0.0 <= v < 2.0.0"
"jxxcarlson/hex": "4.0.0 <= v < 5.0.0"
},
"test-dependencies": {
"elm-explorations/test": "2.1.1 <= v < 3.0.0"

35
src/BigInt/Bytes.elm Normal file
View File

@ -0,0 +1,35 @@
module BigInt.Bytes exposing (decode, encode)
import BigInt exposing (BigInt, toHexString)
import Bytes exposing (Bytes)
import Bytes.Extra
import Hex.Convert as Hex
encode : BigInt -> Bytes
encode x =
let
hexString =
toHexString x
paddedHexString =
if modBy 2 (String.length hexString) == 0 then
hexString
else
"0" ++ hexString
in
Hex.toBytes paddedHexString
|> Maybe.map (Bytes.Extra.toByteValues >> List.reverse >> Bytes.Extra.fromByteValues)
|> Maybe.withDefault Bytes.Extra.empty
decode : Bytes -> BigInt
decode bs =
bs
|> Bytes.Extra.toByteValues
|> List.reverse
|> Bytes.Extra.fromByteValues
|> Hex.toString
|> BigInt.fromHexString
|> Maybe.withDefault (BigInt.fromInt 0)

12
src/Ur/Constructor.elm
View File

@ -1,21 +1,23 @@
module Ur.Constructor exposing
( Constructor
, bigint
, bytes
, cell
, cord
, float32
, float64
, int
, int64
, listOf
, sig
, signedInt
, tape
)
import BigInt exposing (BigInt)
import BigInt.Bytes
import Bitwise
import Bytes exposing (Bytes, Endianness(..))
import Bytes.Encode as BE
import Int64 exposing (Int64)
import Ur exposing (..)
@ -44,9 +46,9 @@ int i =
)
int64 : Int64 -> Noun
int64 i =
Atom (BE.encode (Int64.encoder LE i))
bigint : BigInt -> Noun
bigint x =
Atom (BigInt.Bytes.encode x)
signedInt : Int -> Noun

29
src/Ur/Deconstructor.elm
View File

@ -1,14 +1,15 @@
module Ur.Deconstructor exposing
( Deconstructor
, alt
, bigint
, bytes
, cell
, const
, cord
, float32
, float64
, ignore
, int
, int64
, list
, llec
, map
@ -21,12 +22,13 @@ module Ur.Deconstructor exposing
, tar
)
import BigInt exposing (BigInt)
import BigInt.Bytes
import Bitwise
import Bytes exposing (Bytes, Endianness(..))
import Bytes.Decode as BD
import Bytes.Encode as BE
import Bytes.Extra
import Int64 exposing (Int64)
import Ur exposing (..)
@ -111,25 +113,13 @@ int =
)
int64 : Deconstructor (Int64 -> a) a
int64 =
bigint : Deconstructor (BigInt -> a) a
bigint =
Deconstructor
(\x f ->
case x of
Atom bs ->
let
width =
Bytes.width bs
in
if width > 8 then
Nothing
else
BD.decode (Int64.decoder LE)
(BE.encode
(BE.sequence (BE.bytes bs :: List.repeat (8 - width) (BE.unsignedInt8 0)))
)
|> Maybe.map f
BigInt.Bytes.decode bs |> f |> Just
Cell _ ->
Nothing
@ -252,6 +242,11 @@ tar =
Deconstructor (\noun f -> Just (f noun))
ignore : Deconstructor a a
ignore =
Deconstructor (\_ f -> Just f)
llec : Deconstructor a b -> Deconstructor b c -> Deconstructor a c
llec (Deconstructor r) (Deconstructor l) =
Deconstructor

14
src/Ur/Phonemic.elm
View File

@ -1,6 +1,7 @@
module Ur.Phonemic exposing (Ship, fromString)
import BigInt exposing (toHexString)
import BigInt.Bytes
import Bytes.Extra
import Hex.Convert as Hex
import Ur exposing (Atom, Noun(..))
@ -23,18 +24,7 @@ fromString : Ship -> Atom
fromString s =
case fromPatp s of
Ok atom ->
let
hexString =
toBigInt atom |> toHexString
paddedHexString =
if modBy 2 (String.length hexString) == 0 then
hexString
else
"0" ++ hexString
in
Hex.toBytes paddedHexString |> Maybe.withDefault Bytes.Extra.empty
toBigInt atom |> BigInt.Bytes.encode
Err _ ->
Bytes.Extra.empty

8
src/Ur/Run.elm
View File

@ -192,7 +192,13 @@ update inp msg model =
EventSourceMsg value ->
case JD.decodeValue (JD.field "message" JD.string) value of
Ok string ->
case D.runBytes (D.cell D.int (D.cell D.cord D.tar) |> D.map (\a b c -> ( a, b, c ) |> Debug.log "event")) (Ur.Uw.decode string) of
case
D.runBytes
(D.cell D.int (D.cell D.cord D.tar)
|> D.map (\a b c -> ( a, b, c ))
)
(Ur.Uw.decode string)
of
Just ( messageId, messageType, rest ) ->
let
( eventId, ackReqs ) =

26
tests/Test/Urbit.elm
View File

@ -1,12 +1,13 @@
module Test.Urbit exposing (tests)
import BigInt exposing (BigInt)
import BigInt.Bytes
import BitParser
import BitWriter
import Bytes exposing (Bytes)
import Bytes.Extra as Bytes
import Expect exposing (Expectation)
import Fuzz exposing (Fuzzer)
import Int64 exposing (Int64)
import List.Extra as List
import Test exposing (..)
import Test.Utils exposing (..)
@ -83,9 +84,9 @@ tests =
Expect.equal
(Just "1686761906334")
(D.runBytes
D.int64
D.bigint
(Bytes.fromByteValues [ 0x80, 0xC9, 0x13, 0x04, 0x5B, 0x17, 0x31 ])
|> Maybe.map Int64.toUnsignedString
|> Maybe.map BigInt.toString
)
)
, test "[4 ~[1 2 3]]"
@ -161,7 +162,7 @@ tests =
(Bytes.fromByteValues [ 0xC1, 0x20, 0xE4, 0x01 ])
)
)
, test "65.600"
, test "Int 65.600"
(\() ->
Expect.equal
(Just 65600)
@ -170,6 +171,15 @@ tests =
(Bytes.fromByteValues [ 0xC0, 0x00, 0x02, 0x08 ])
)
)
, test "BigInt 65.600"
(\() ->
Expect.equal
(Just (BigInt.fromInt 65600))
(D.runBytes
D.bigint
(Bytes.fromByteValues [ 0xC0, 0x00, 0x02, 0x08 ])
)
)
]
, describe "Constructor <-> Deconstructor"
[ Test.fuzz
@ -215,7 +225,7 @@ tests =
(C.tape x)
)
)
, Test.fuzz int64 "int64" (\x -> Expect.equal (Just x) (D.run D.int64 (C.int64 x)))
, Test.fuzz bigint "bigint" (\x -> Expect.equal (Just x) (D.run D.bigint (C.bigint x)))
]
, Test.describe "Ur.Uw"
[ Test.fuzz atom
@ -268,6 +278,6 @@ noun () =
]
int64 : Fuzzer Int64
int64 =
Fuzz.int |> Fuzz.andThen (\a -> Fuzz.int |> Fuzz.map (Int64.fromInt32s a))
bigint : Fuzzer BigInt
bigint =
bytes |> Fuzz.map BigInt.Bytes.decode