diff options
Diffstat (limited to 'std')
| -rw-r--r-- | std/Char.bruijn | 5 | ||||
| -rw-r--r-- | std/List.bruijn | 2 | ||||
| -rw-r--r-- | std/Number.bruijn | 11 | ||||
| -rw-r--r-- | std/Number/Binary.bruijn | 15 | ||||
| -rw-r--r-- | std/String.bruijn | 7 |
5 files changed, 37 insertions, 3 deletions
diff --git a/std/Char.bruijn b/std/Char.bruijn new file mode 100644 index 0000000..8351142 --- /dev/null +++ b/std/Char.bruijn @@ -0,0 +1,5 @@ +# MIT License, Copyright (c) 2023 Marvin Borner + +:import std/Number/Binary . + +number! [ternary! (0 - '0')] ⧗ Char → Number diff --git a/std/List.bruijn b/std/List.bruijn index 986b6bc..4758660 100644 --- a/std/List.bruijn +++ b/std/List.bruijn @@ -4,7 +4,7 @@ :import std/Combinator . :import std/Pair P :import std/Logic . -:import std/Number . +:import std/Number/Ternary . # empty list element empty false ⧗ (List a) diff --git a/std/Number.bruijn b/std/Number.bruijn index e17d7d6..daefbb7 100644 --- a/std/Number.bruijn +++ b/std/Number.bruijn @@ -2,4 +2,15 @@ # this is just a reference to the ternary implementation # read the readme for the reasoning of using balanced ternary by default +:import std/List . + :input std/Number/Ternary . + +# the following functions are only here because of recursive imports of list/ternary + +# converts a list of digits into a balanced ternary number +from-digits foldl [[(+10) ⋅ 1 + 0]] (+0) + +:test (from-digits ((+4) : ((+2) : ((+0) : empty)))) ((+420)) +:test (from-digits empty) ((+0)) + diff --git a/std/Number/Binary.bruijn b/std/Number/Binary.bruijn index ec62e60..2d36c5f 100644 --- a/std/Number/Binary.bruijn +++ b/std/Number/Binary.bruijn @@ -4,6 +4,7 @@ :import std/Combinator . :import std/List . :import std/Logic . +:import std/Number/Ternary T # bit indicating a one, compatible with std/Logic b¹ true ⧗ Bit @@ -180,6 +181,16 @@ dec [~(0 z a¹ a⁰)] ⧗ Binary → Binary :test (--(+1b)) ([[[0 2]]]) :test (--(+3b)) ((+2b)) +# converts a binary number to a balanced ternary number +# TODO: find a better solution +ternary! z [[[rec]]] (+0t) ⧗ Binary → Ternary + rec =?0 case-end case-inc + case-inc 2 (T.inc 1) --0 + case-end 1 + +:test (ternary! (+0b)) ((+0t)) +:test (ternary! (+42b)) ((+42t)) + # flips the bits of a binary number (1's complement) complement [[[[3 2 0 1]]]] ⧗ Binary → Binary @@ -242,8 +253,8 @@ sub* [[abs 1 →^0]] ⧗ Binary → Binary → Binary # subs two binary numbers # uses addition but with two's complement # TODO: isn't very performant ⇒ replace with sub* -# TODO: gives wrong results if b>=a in a-b -sub [[-((pad 1 0) + -(pad 0 1))]] ⧗ Binary → Binary → Binary +# TODO: gives wrong results if b>a in a-b +sub [[(0 =? 1) (+0b) -((pad 1 0) + -(pad 0 1))]] ⧗ Binary → Binary → Binary …-… sub diff --git a/std/String.bruijn b/std/String.bruijn index db526fe..9267f20 100644 --- a/std/String.bruijn +++ b/std/String.bruijn @@ -1,5 +1,7 @@ # MIT License, Copyright (c) 2022 Marvin Borner +:import std/Char C +:import std/Number . :import std/Number/Binary B :input std/List @@ -26,6 +28,11 @@ ni? \in? :test ("ab" ∋ 'b') (true) :test ("ab" ∋ 'c') (false) +# converts a string of digits into a number +number! from-digits ∘ (map C.number!) + +:test ((number! "123") =? (+123)) (true) + # splits string by newline character lines z [[rec]] rec ∅?(~broken) (^broken : empty) (^broken : (1 ~(~broken))) |