Update juvix-stdlib to remove non-ASCII indentifiers (#2857)

This PR updates the juvix-stdlib to the current main commit which includes: * anoma/juvix-stdlib#59 * anoma/juvix-stdlib#101 All the Juvix test suite files and examples in this repo have been updated to be compatible with the new stdlib.
anoma · Jun 26, 2024 · b8cd841 · b8cd841
1 parent 6d24d71
commit b8cd841
Show file tree

Hide file tree

Showing 149 changed files with 520 additions and 520 deletions.
diff --git a/examples/demo/Demo.juvix b/examples/demo/Demo.juvix
@@ -43,11 +43,11 @@ sort {A} {{Ord A}} : List A → List A
 printNatListLn : List Nat → IO
   | nil := printStringLn "nil"
   | (x :: xs) :=
-    printNat x >> printString " :: " >> printNatListLn xs;
+    printNat x >>> printString " :: " >>> printNatListLn xs;
 
 main : IO :=
   printStringLn "Hello!"
-    >> printNatListLn (preorder (mirror tree))
-    >> printNatListLn (sort (preorder (mirror tree)))
-    >> printNatLn (log2 3)
-    >> printNatLn (log2 130);
+    >>> printNatListLn (preorder (mirror tree))
+    >>> printNatListLn (sort (preorder (mirror tree)))
+    >>> printNatLn (log2 3)
+    >>> printNatLn (log2 130);
diff --git a/examples/milestone/Bank/Bank.juvix b/examples/milestone/Bank/Bank.juvix
@@ -34,7 +34,7 @@ open Token;
 
 --- This module defines the type for balances and its associated operations.
 module Balances;
-  Balances : Type := List (Field × Nat);
+  Balances : Type := List (Pair Field Nat);
 
   --- Increments the amount associated with a certain ;Field;.
   increment : Field -> Nat -> Balances -> Balances

diff --git a/examples/milestone/Collatz/Collatz.juvix b/examples/milestone/Collatz/Collatz.juvix
@@ -12,8 +12,8 @@ collatz : Nat → Nat
 
 terminating
 run (f : Nat → Nat) : Nat → IO
-  | (suc zero) := printNatLn 1 >> printStringLn "Finished!"
-  | n := printNatLn n >> run f (f n);
+  | (suc zero) := printNatLn 1 >>> printStringLn "Finished!"
+  | n := printNatLn n >>> run f (f n);
 
 welcome : String :=
   "Collatz calculator\n------------------\n\nType a number then ENTER";
@@ -22,7 +22,7 @@ resultHeading : String := "Collatz sequence:";
 
 main : IO :=
   printStringLn welcome
-    >> readLn
+    >>> readLn
       λ {s :=
         printStringLn resultHeading
-          >> run collatz (stringToNat s)};
+          >>> run collatz (stringToNat s)};
diff --git a/examples/milestone/Fibonacci/Fibonacci.juvix b/examples/milestone/Fibonacci/Fibonacci.juvix
@@ -8,4 +8,5 @@ fib : Nat → Nat → Nat → Nat
 
 fibonacci (n : Nat) : Nat := fib n 0 1;
 
-main : IO := readLn (printNatLn ∘ fibonacci ∘ stringToNat);
+main : IO :=
+  readLn (stringToNat >> fibonacci >> printNatLn);
diff --git a/examples/milestone/TicTacToe/CLI/TicTacToe.juvix b/examples/milestone/TicTacToe/CLI/TicTacToe.juvix
@@ -17,7 +17,7 @@ prompt (x : GameState) : String :=
     ++str ": ";
 
 nextMove (s : GameState) : String → GameState :=
-  flip playMove s ∘ validMove ∘ stringToNat;
+  stringToNat >> validMove >> flip playMove s;
 
 --- Main loop
 terminating
@@ -30,12 +30,13 @@ run : GameState → IO
         ++str msg)
   | (state b p (continue msg)) :=
     printString (msg ++str prompt (state b p noError))
-      >> readLn (run ∘ nextMove (state b p noError))
-  | x := printString (prompt x) >> readLn (run ∘ nextMove x);
+      >>> readLn (run << nextMove (state b p noError))
+  | x :=
+    printString (prompt x) >>> readLn (run << nextMove x);
 
 --- The welcome message
 welcome : String :=
   "MiniTicTacToe\n-------------\n\nType a number then ENTER to make a move";
 
 --- The entry point of the program
-main : IO := printStringLn welcome >> run beginState;
+main : IO := printStringLn welcome >>> run beginState;
diff --git a/juvix-stdlib b/juvix-stdlib
diff --git a/test/Compilation/Positive.hs b/test/Compilation/Positive.hs
@@ -327,7 +327,7 @@ tests =
         $(mkRelFile "test050.juvix")
         $(mkRelFile "out/test050.out"),
       posTest
-        "Test051: Local recursive function using IO >>"
+        "Test051: Local recursive function using IO >>>"
         $(mkRelDir ".")
         $(mkRelFile "test051.juvix")
         $(mkRelFile "out/test051.out"),

diff --git a/tests/Anoma/Compilation/positive/test003.juvix b/tests/Anoma/Compilation/positive/test003.juvix
@@ -14,7 +14,7 @@ import Stdlib.Debug.Trace open;
 
 main : Nat :=
   trace (mod 3 2)
-    >>> trace (div 18 4)
-    >>> trace (mod 18 4)
-    >>> trace (div 16 4)
-    >>> mod 16 4;
+    >-> trace (div 18 4)
+    >-> trace (mod 18 4)
+    >-> trace (div 16 4)
+    >-> mod 16 4;
diff --git a/tests/Anoma/Compilation/positive/test006.juvix b/tests/Anoma/Compilation/positive/test006.juvix
@@ -10,5 +10,5 @@ loop : Nat := loop;
 main : Bool :=
   trace
       (if (3 > 0) 1 loop + if (2 < 1) loop (if (7 >= 8) loop 1))
-    >>> trace (2 > 0 || loop == 0)
-    >>> 2 < 0 && loop == 0;
+    >-> trace (2 > 0 || loop == 0)
+    >-> 2 < 0 && loop == 0;
diff --git a/tests/Anoma/Compilation/positive/test007.juvix b/tests/Anoma/Compilation/positive/test007.juvix
@@ -20,11 +20,11 @@ lst : List Nat := 0 :: 1 :: nil;
 
 main : List Nat :=
   trace (null lst)
-    >>> trace (null (nil {Nat}))
-    >>> trace (head 1 lst)
-    >>> trace (tail lst)
-    >>> trace (head 0 (tail lst))
-    >>> trace (map ((+) 1) lst)
-    >>> map' ((+) 1) lst
+    >-> trace (null (nil {Nat}))
+    >-> trace (head 1 lst)
+    >-> trace (tail lst)
+    >-> trace (head 0 (tail lst))
+    >-> trace (map ((+) 1) lst)
+    >-> map' ((+) 1) lst
     -- TODO: Restore when anoma backend supports strings
-    -- >>> runPartial λ {{{_}} := map'' ((+) 1) lst};
+    -- >-> runPartial λ {{{_}} := map'' ((+) 1) lst};
diff --git a/tests/Anoma/Compilation/positive/test009.juvix b/tests/Anoma/Compilation/positive/test009.juvix
@@ -18,6 +18,6 @@ fact : Nat → Nat := fact' 1;
 
 main (n : Nat) : Nat :=
   trace (sum n)
-    >>> trace (fact 5)
-    >>> trace (fact 10)
-    >>> fact 12;
+    >-> trace (fact 5)
+    >-> trace (fact 10)
+    >-> fact 12;
diff --git a/tests/Anoma/Compilation/positive/test011.juvix b/tests/Anoma/Compilation/positive/test011.juvix
@@ -12,5 +12,5 @@ fib : Nat → Nat := fib' 0 1;
 
 main : Nat :=
   trace (fib 10)
-    >>> trace (fib 100)
-    >>> fib 1000;
+    >-> trace (fib 100)
+    >-> fib 1000;
diff --git a/tests/Anoma/Compilation/positive/test012.juvix b/tests/Anoma/Compilation/positive/test012.juvix
@@ -32,7 +32,7 @@ combineDigits (xs : List Nat) : Nat := for (acc := 0) (x in xs) acc * 10 + x;
 
 main : Nat :=
   trace (combineDigits (preorder (gen 3)))
-    >>> trace (combineDigits (preorder (gen 4)))
-    >>> trace (combineDigits (preorder (gen 5)))
-    >>> trace (combineDigits (preorder (gen 6)))
-    >>> combineDigits (preorder (gen 7));
+    >-> trace (combineDigits (preorder (gen 4)))
+    >-> trace (combineDigits (preorder (gen 5)))
+    >-> trace (combineDigits (preorder (gen 6)))
+    >-> combineDigits (preorder (gen 7));
diff --git a/tests/Anoma/Compilation/positive/test013.juvix b/tests/Anoma/Compilation/positive/test013.juvix
@@ -16,6 +16,6 @@ f : Nat → Nat → Nat
 
 main : Nat :=
   trace (f 5 6)
-    >>> trace (f 6 5)
-    >>> trace (f 10 5)
-    >>> f 11 5;
+    >-> trace (f 6 5)
+    >-> trace (f 10 5)
+    >-> f 11 5;
diff --git a/tests/Anoma/Compilation/positive/test014.juvix b/tests/Anoma/Compilation/positive/test014.juvix
@@ -24,13 +24,13 @@ vy : Nat := 7;
 
 main : Nat :=
   trace (func (div y x))
-    >>> -- 17 div 5 + 4 = 7
+    >-> -- 17 div 5 + 4 = 7
       trace
       (y + x * z)
-    >>> -- 17
+    >-> -- 17
       trace
       (vx + vy * (z + 1))
-    >>> -- 37
+    >-> -- 37
       f
       (h g 2 3)
       4;

diff --git a/tests/Anoma/Compilation/positive/test015.juvix b/tests/Anoma/Compilation/positive/test015.juvix
@@ -23,19 +23,19 @@ h : Nat → Nat
 
 main : Nat :=
   trace (f 100 500)
-    >>> -- 600
+    >-> -- 600
       trace
       (f 5 0)
-    >>> -- 25
+    >-> -- 25
       trace
       (f 5 5)
-    >>> -- 30
+    >-> -- 30
       trace
       (h 10)
-    >>> -- 45
+    >-> -- 45
       trace
       (g 10 h)
-    >>> -- 55
+    >-> -- 55
       g
       3
       (f 10);
diff --git a/tests/Anoma/Compilation/positive/test020.juvix b/tests/Anoma/Compilation/positive/test020.juvix
@@ -16,11 +16,11 @@ subp : Nat → Nat → Nat
 
 main : Nat :=
   trace (f91 101)
-    >>> trace (f91 95)
-    >>> trace (f91 16)
-    >>> trace (f91 5)
-    >>> trace (subp 101 1)
-    >>> trace (subp 11 5)
-    >>> trace (subp 10 4)
-    >>> trace (subp 1000 600)
-    >>> subp 10000 6000;
+    >-> trace (f91 95)
+    >-> trace (f91 16)
+    >-> trace (f91 5)
+    >-> trace (subp 101 1)
+    >-> trace (subp 11 5)
+    >-> trace (subp 10 4)
+    >-> trace (subp 1000 600)
+    >-> subp 10000 6000;
diff --git a/tests/Anoma/Compilation/positive/test021.juvix b/tests/Anoma/Compilation/positive/test021.juvix
@@ -18,4 +18,4 @@ power' : Nat → Nat → Nat → Nat
 power : Nat → Nat → Nat := power' 1;
 
 main : Nat :=
-  trace (power 2 3) >>> trace (power 3 7) >>> power 5 11;
+  trace (power 2 3) >-> trace (power 3 7) >-> power 5 11;
diff --git a/tests/Anoma/Compilation/positive/test022.juvix b/tests/Anoma/Compilation/positive/test022.juvix
@@ -17,12 +17,12 @@ sum' : Nat → Nat
 printListNatLn : List Nat → IO
   | nil := printStringLn "nil"
   | (h :: t) :=
-    printNat h >> printString " :: " >> printListNatLn t;
+    printNat h >>> printString " :: " >>> printListNatLn t;
 
 main (n : Nat) : Nat :=
   trace (gen 10)
-    >>> trace (reverse (gen 10))
-    >>> trace (filter ((<) 5) (gen 10))
-    >>> trace (reverse (map (flip sub 1) (gen 10)))
-    >>> trace (sum n)
-    >>> sum' n;
+    >-> trace (reverse (gen 10))
+    >-> trace (filter ((<) 5) (gen 10))
+    >-> trace (reverse (map (flip sub 1) (gen 10)))
+    >-> trace (sum n)
+    >-> sum' n;
diff --git a/tests/Anoma/Compilation/positive/test023.juvix b/tests/Anoma/Compilation/positive/test023.juvix
@@ -17,4 +17,4 @@ terminating
 h : Nat → Nat
   | x := if (x < 1) 1 (x * f (sub x 1));
 
-main : Nat := trace (f 5) >>> trace (f 10) >>> f 20;
+main : Nat := trace (f 5) >-> trace (f 10) >-> f 20;
diff --git a/tests/Anoma/Compilation/positive/test025.juvix b/tests/Anoma/Compilation/positive/test025.juvix
@@ -11,7 +11,7 @@ gcd : Nat → Nat → Nat
 
 main : Nat :=
   trace (gcd (3 * 7 * 2) (7 * 2 * 11))
-    >>> trace (gcd (3 * 7 * 2 * 11 * 5) (7 * 2 * 5))
-    >>> trace (gcd 3 7)
-    >>> trace (gcd 7 3)
-    >>> gcd (11 * 7 * 3) (2 * 5 * 13);
+    >-> trace (gcd (3 * 7 * 2 * 11 * 5) (7 * 2 * 5))
+    >-> trace (gcd 3 7)
+    >-> trace (gcd 7 3)
+    >-> gcd (11 * 7 * 3) (2 * 5 * 13);
diff --git a/tests/Anoma/Compilation/positive/test026.juvix b/tests/Anoma/Compilation/positive/test026.juvix
@@ -30,7 +30,7 @@ drop_front : {A : Type} → Queue A → Queue A
          | nil := queue (reverse (qsnd q')) nil
          | _ := q';
 
-pop_front {A} : Queue A -> Maybe (A × Queue A)
+pop_front {A} : Queue A -> Maybe (Pair A (Queue A))
   | (queue xs ys) :=
     case xs of
       | h :: t := just (h, queue t ys)

diff --git a/tests/Anoma/Compilation/positive/test027.juvix b/tests/Anoma/Compilation/positive/test027.juvix
@@ -10,17 +10,17 @@ czero : Num
   | {_} f x := x;
 
 csuc : Num → Num
-  | n {_} f := f ∘ n {_} f;
+  | n {_} f := f << n {_} f;
 
 num : Nat → Num
   | zero := czero
   | (suc n) := csuc (num n);
 
 add : Num → Num → Num
-  | n m {_} f := n {_} f ∘ m {_} f;
+  | n m {_} f := n {_} f << m {_} f;
 
 mul : Num → Num → Num
-  | n m {_} := n {_} ∘ m {_};
+  | n m {_} := n {_} << m {_};
 
 isZero : Num → Bool
   | n := n {_} (const false) true;
@@ -30,5 +30,5 @@ toNat : Num → Nat
 
 main : Nat :=
   trace (toNat (num 7))
-    >>> trace (toNat (add (num 7) (num 3)))
-    >>> toNat (mul (num 7) (num 3));
+    >-> trace (toNat (add (num 7) (num 3)))
+    >-> toNat (mul (num 7) (num 3));
diff --git a/tests/Anoma/Compilation/positive/test028.juvix b/tests/Anoma/Compilation/positive/test028.juvix
@@ -45,4 +45,4 @@ primes : Unit → Stream := eratostenes (numbers 2);
 
 main (n1 n2 : Nat) : Nat :=
   trace (snth n1 primes)
-    >>> snth n2 primes;
+    >-> snth n2 primes;
diff --git a/tests/Anoma/Compilation/positive/test029.juvix b/tests/Anoma/Compilation/positive/test029.juvix
@@ -11,7 +11,7 @@ ack : Nat → Nat → Nat
 
 main : Nat :=
   trace (ack 0 7)
-    >>> trace (ack 1 7)
-    >>> trace (ack 1 13)
-    >>> trace (ack 2 7)
-    >>> ack 2 13;
+    >-> trace (ack 1 7)
+    >-> trace (ack 1 13)
+    >-> trace (ack 2 7)
+    >-> ack 2 13;
diff --git a/tests/Anoma/Compilation/positive/test030.juvix b/tests/Anoma/Compilation/positive/test030.juvix
@@ -8,7 +8,7 @@ iterate : {A : Type} → (A → A) → Nat → A → A
   -- clauses with differing number of patterns not yet supported
   -- iterate f zero x := x;
   | f zero := id
-  | f (suc n) := f ∘ iterate f n;
+  | f (suc n) := f << iterate f n;
 
 plus : Nat → Nat → Nat := iterate suc;
 
@@ -23,6 +23,6 @@ ackermann : Nat → Nat → Nat
 
 main : Nat :=
   trace (plus 3 7)
-    >>> trace (mult 3 7)
-    >>> trace (exp 3 7)
-    >>> ackermann 1 13;
+    >-> trace (mult 3 7)
+    >-> trace (exp 3 7)
+    >-> ackermann 1 13;
diff --git a/tests/Anoma/Compilation/positive/test032.juvix b/tests/Anoma/Compilation/positive/test032.juvix
@@ -4,7 +4,7 @@ module test032;
 import Stdlib.Prelude open;
 import Stdlib.Debug.Trace open;
 
-split : {A : Type} → Nat → List A → List A × List A
+split : {A : Type} → Nat → List A → Pair (List A) (List A)
   | zero xs := nil, xs
   | (suc n) nil := nil, nil
   | (suc n) (x :: xs) :=
@@ -46,5 +46,5 @@ gen2 : List (List Nat) → Nat → Nat → List (List Nat)
 
 main : List Nat :=
   trace (take 10 (uniq (sort (flatten (gen2 nil 6 10)))))
-    >>> trace (take 10 (uniq (sort (flatten (gen2 nil 7 10)))))
-    >>> take 10 (uniq (sort (flatten (gen2 nil 6 20))));
+    >-> trace (take 10 (uniq (sort (flatten (gen2 nil 7 10)))))
+    >-> take 10 (uniq (sort (flatten (gen2 nil 6 20))));
+8 −7		Stdlib/Data/List/Base.juvix
+5 −5		Stdlib/Data/Pair.juvix
+10 −11		Stdlib/Data/Pair/Base.juvix
+1 −1		Stdlib/Data/String/Base.juvix
+20 −8		Stdlib/Function.juvix
+1 −1		Stdlib/Prelude.juvix
+2 −2		Stdlib/System/IO/Base.juvix
+1 −1		Stdlib/System/IO/Bool.juvix
+2 −1		Stdlib/System/IO/Int.juvix
+2 −1		Stdlib/System/IO/Nat.juvix
+1 −1		Stdlib/System/IO/String.juvix
+1 −1		test/Package.juvix
+1 −1		test/Test.juvix
+2 −2		test/Test/Arb.juvix
+4 −4		test/juvix.lock.yaml