Skip to content

Commit

Permalink
Update Stdlib overrides to 5.1.1
Browse files Browse the repository at this point in the history
Based off of changes between 5.0.0 and 5.1.1 in the OCaml repository.
ocaml/ocaml@5.0.0...5.1.1
  • Loading branch information
just-max committed Apr 15, 2024
1 parent 96f8e88 commit 578e263
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The LP framework was presented at the OCaml Users and Developers Workshop 2023.

## Install

The framework is currently fixed to OCaml 5.0.0. Hence, from an OCaml 5.0.0. switch, LP can be installed using opam:
The framework is currently fixed to OCaml 5.1.1. Hence, from an OCaml 5.1.1. switch, LP can be installed using opam:

```sh
opam pin add less-power https://github.com/just-max/less-power.git#main
Expand All @@ -18,6 +18,8 @@ Alternatively, the provided Docker image may be used:
docker pull ghcr.io/just-max/less-power:main
```

A specific tag may instead be substituted for `main`.

# Development

To make changes to the framework, first clone this repository. Then add a local pin:
Expand Down Expand Up @@ -45,7 +47,7 @@ opam upgrade --working-dir less-power # make changes available

For running real programming courses, programming exercises built for the Less Power framework are best run with [Artemis](https://github.com/ls1intum/Artemis). Artemis is an interactive learning platform that handles student participation and provides CI-based automated testing.

However, the framework using only standard OCaml tooling, and may be adapted for use with other platforms that offer some from of continuous integration.
However, the framework uses only standard OCaml tooling, and may be adapted for use with other platforms that offer some from of continuous integration.

## Examples

Expand Down
2 changes: 1 addition & 1 deletion dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"\| and at scale.
)
(depends
(ocaml (= 5.0.0))
(ocaml (= 5.1.1))
(xmlm (and (>= 1.4) (< 1.5)))
(fileutils (and (>= 0.6) (< 0.7)))
(qcheck-core (and (>= 0.21) (< 0.22)))
Expand Down
2 changes: 1 addition & 1 deletion less-power.opam
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ homepage: "https://github.com/just-max/less-power"
bug-reports: "https://github.com/just-max/less-power/issues"
depends: [
"dune" {>= "3.0"}
"ocaml" {= "5.0.0"}
"ocaml" {= "5.1.1"}
"xmlm" {>= "1.4" & < "1.5"}
"fileutils" {>= "0.6" & < "0.7"}
"qcheck-core" {>= "0.21" & < "0.22"}
Expand Down
3 changes: 3 additions & 0 deletions src/stdlib-variants/signatures/sig_float.ml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ module type SafeFloat = sig
val infinity : float
val neg_infinity : float
val nan : float
val signaling_nan : float
val quiet_nan : float
val pi : float
val max_float : float
val min_float : float
Expand Down Expand Up @@ -179,6 +181,7 @@ module type SafeFloat = sig
val min_num : t -> t -> t
val max_num : t -> t -> t
val min_max_num : float -> float -> float * float
val seeded_hash : int -> t -> int
val hash : t -> int

end
2 changes: 2 additions & 0 deletions src/stdlib-variants/signatures/sig_seq.ml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ module type SafeSeq = sig
val for_all : ('a -> bool) -> 'a t -> bool
val exists : ('a -> bool) -> 'a t -> bool
val find : ('a -> bool) -> 'a t -> 'a option
val find_index : ('a -> bool) -> 'a t -> int option
val find_map : ('a -> 'b option) -> 'a t -> 'b option
val find_mapi : (int -> 'a -> 'b option) -> 'a t -> 'b option
val iter2 : ('a -> 'b -> unit) -> 'a t -> 'b t -> unit
val fold_left2 : ('a -> 'b -> 'c -> 'a) -> 'a -> 'b t -> 'c t -> 'a
val for_all2 : ('a -> 'b -> bool) -> 'a t -> 'b t -> bool
Expand Down
2 changes: 1 addition & 1 deletion src/test-lib/grading.mli
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ val evaluate_grading :
(** {1 Reading and writing}
Functionality to read tests from JUnit XML files, cleanup the files,
and write evaluated grading to a JUnix XML files. *)
and write evaluated grading to JUnit XML files. *)

(** {2 Reading and cleanup} *)

Expand Down

0 comments on commit 578e263

Please sign in to comment.