Additions to std/

5 files changed, 56 insertions, 8 deletions

diff --git a/bruijn.cabal b/bruijn.cabal
index 183f8fd..aacd4b5 100644
--- a/bruijn.cabal
+++ b/bruijn.cabal
@@ -20,6 +20,7 @@ data-files:
     config
     std/Char.bruijn
     std/Combinator.bruijn
+    std/Float.bruijn
     std/List.bruijn
     std/Logic.bruijn
     std/Math.bruijn
@@ -28,6 +29,7 @@ data-files:
     std/Pair.bruijn
     std/Result.bruijn
     std/String.bruijn
+    std/Tree.bruijn
     std/Number/Binary.bruijn
     std/Number/Ternary.bruijn
     std/Number/Unary.bruijn
diff --git a/std/Float.bruijn b/std/Float.bruijn
index d3fce4e..3d88d6e 100644
--- a/std/Float.bruijn
+++ b/std/Float.bruijn
@@ -4,13 +4,12 @@
 
 :import std/Combinator .
 :import std/Number .
-:import std/List .
 :import std/Pair P
 
 # generates a float from a normal balanced ternary number
-float! \(P.:) (+0)
+float! \(P.…:…) (+0)
 
 # adds two floating numbers
 # TODO: Carry support
 # - needed: mod, div (?) -> ternary carry != decimal carry
-add P.zip-with (+)
+add P.zip-with …+…
diff --git a/std/List.bruijn b/std/List.bruijn
index 4758660..b748f41 100644
--- a/std/List.bruijn
+++ b/std/List.bruijn
@@ -1,5 +1,6 @@
 # MIT License, Copyright (c) 2022 Marvin Borner
 # Lists in Church/Boehm-Berarducci encoding using pairs
+# TODO: Replace fold/map/etc. with faster LC native logic
 
 :import std/Combinator .
 :import std/Pair P
@@ -119,9 +120,9 @@ list [0 [[[2 (0 : 1)]]] reverse empty] ⧗ (List a) → Unary → b → (List b)
 # creates list with single element
 singleton [0 : empty] ⧗ a → (List a)
 
-{…} singleton
+{}‣ singleton
 
-:test ({ (+1) }) ((+1) : empty)
+:test ({}(+1)) ((+1) : empty)
 
 # appends two lists
 append z [[[rec]]] ⧗ (List a) → (List a) → (List a)
@@ -134,7 +135,7 @@ append z [[[rec]]] ⧗ (List a) → (List a) → (List a)
 :test (((+1) : ((+2) : ((+3) : empty))) ++ ((+4) : empty)) ((+1) : ((+2) : ((+3) : ((+4) : empty))))
 
 # appends an element to a list
-snoc [[1 ++ ({ 0 })]] ⧗ (List a) → a → (List a)
+snoc [[1 ++ {}0]] ⧗ (List a) → a → (List a)
 
 …;… snoc
 
diff --git a/std/Math.bruijn b/std/Math.bruijn
index d63fb2f..ee33fa2 100644
--- a/std/Math.bruijn
+++ b/std/Math.bruijn
@@ -94,8 +94,8 @@ fib [fibs !! ++0] ⧗ Number
 :test (fib (+5)) ((+8))
 
 # pascal triangle
-# TODO: this generally works, BUT lists in lists get reduced and mess up indexing
-pascal iterate [zip-with …+… ({ (+0) } ++ 0) (0 ; (+0))] ({ (+1) })
+# TODO: something is wrong in here
+pascal iterate [zip-with …+… ({}(+0) ++ 0) (0 ; (+0))] ({}(+1))
 
 # π
 # q 3, r 2, t 1, i 0
diff --git a/std/Tree.bruijn b/std/Tree.bruijn
new file mode 100644
index 0000000..19bdd62
--- /dev/null
+++ b/std/Tree.bruijn
@@ -0,0 +1,46 @@
+# MIT License, Copyright (c) 2023 Marvin Borner
+# Rose trees based on std/List
+
+:import std/Combinator .
+:import std/List L
+:import std/Logic .
+:import std/Math .
+:import std/Pair .
+
+# a tree node has a label as its head and subtrees as its tail
+
+# constructs a tree with a label and no branches
+leaf [0 : L.empty] ⧗ a → (Tree a)
+
+{:}‣ leaf
+
+# constructs a node with a subnodes
+node [[1 : 0]] ⧗ a → (List (Tree a)) → (Tree a)
+
+{…:…} node
+
+# returns the root label of a tree
+label ^‣ ⧗ (Tree a) → a
+
+^‣ label
+
+# returns the branches of a tree
+branches ~‣ ⧗ (Tree a) → (List (Tree a))
+
+~‣ branches
+
+# returns true if a tree is empty
+empty? [L.empty? ~0] ⧗ (Tree a) → Boolean
+
+∅?‣ empty?
+
+:test (∅?({ 'a' : {:}'b' })) (false)
+:test (∅?({:}'a')) (true)
+
+# applies a function to leaf and the leafs of all branches
+map z [[[rec]]] ⧗ (a → b) → (Tree a) → (Tree b)
+	rec { (1 ^0) : (L.map (2 1) ~0) }
+
+…<$>… map
+
+:test (map ^‣ ({ "woo" : ({:}"oof" : (({ "aah" : (({:}"huh" : L.empty)) }) : L.empty)) })) ({ 'w' : ({:}'o' : (({ 'a' : ({:}'h' : L.empty) }) : L.empty)) })