diff --git a/juvix-stdlib b/juvix-stdlib index 708d920c6e..183d4e9329 160000 --- a/juvix-stdlib +++ b/juvix-stdlib @@ -1 +1 @@ -Subproject commit 708d920c6ec9c12b684e17546854a61099920a08 +Subproject commit 183d4e9329a648b339ebecf2122b3e9621c99ee8 diff --git a/package.yaml b/package.yaml index 026f991c68..1d933f711e 100644 --- a/package.yaml +++ b/package.yaml @@ -33,9 +33,9 @@ extra-source-files: - assets/css/*.css - assets/js/*.js - assets/images/*.svg - - juvix-stdlib/juvix.yaml - juvix-stdlib/**/*.juvix - include/package/**/*.juvix + - include/package-base/**/*.juvix - runtime/include/**/*.h - runtime/**/*.a - runtime/src/vampir/*.pir diff --git a/test/BackendMarkdown/Positive.hs b/test/BackendMarkdown/Positive.hs index 7edc8349d5..f2e07c694d 100644 --- a/test/BackendMarkdown/Positive.hs +++ b/test/BackendMarkdown/Positive.hs @@ -83,6 +83,7 @@ tests = "Test Markdown" $(mkRelDir ".") $(mkRelFile "Test.juvix.md") + -- Cmd to regenerate the expected file: juvix markdown --prefix-url X --prefix-id Y --no-path Test.juvix.md $(mkRelFile "markdown/Test.md") "X" "Y" diff --git a/tests/positive/Markdown/markdown/Test.md b/tests/positive/Markdown/markdown/Test.md index a803ebfec1..a2d23af825 100644 --- a/tests/positive/Markdown/markdown/Test.md +++ b/tests/positive/Markdown/markdown/Test.md @@ -9,11 +9,11 @@ Certain blocks can be hidden from the output by adding the `hide` attribute, as -
fib : Nat → Nat → Nat → Nat
  | zero x1 _ := x1
  | (suc n) x1 x2 := fib n x2 (x1 + x2);

fibonacci (n : Nat) : Nat := fib n 0 1;
+
fib : Nat → Nat → Nat → Nat
  | zero x1 _ := x1
  | (suc n) x1 x2 := fib n x2 (x1 + x2);

fibonacci (n : Nat) : Nat := fib n 0 1;
Commands like `typecheck` and `compile` can be used with Juvix Markdown files. -
main : IO := readLn (printNatLn ∘ fibonacci ∘ stringToNat);
+
main : IO := readLn (printNatLn ∘ fibonacci ∘ stringToNat);
Other code blocks are not touched, e.g: @@ -57,8 +57,8 @@ We also use other markup for documentation such as: Initial function arguments that match variables or wildcards in all clauses can be moved to the left of the colon in the function definition. For example, - 
module move-to-left;
  import Stdlib.Data.Nat open;
  
  add (n : Nat) : Nat -> Nat
    | zero := n
    | (suc m) := suc (add n m);
end;
+ 
module move-to-left;
  import Stdlib.Data.Nat open;
  
  add (n : Nat) : Nat -> Nat
    | zero := n
    | (suc m) := suc (add n m);
end;
is equivalent to - 
module example-add;
  import Stdlib.Data.Nat open;
  
  add : Nat -> Nat -> Nat
    | n zero := n
    | n (suc m) := suc (add n m);
end;
+ 
module example-add;
  import Stdlib.Data.Nat open;
  
  add : Nat -> Nat -> Nat
    | n zero := n
    | n (suc m) := suc (add n m);
end;