CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-09-07 10:35:56 +03:00
Code Issues Projects Releases Wiki Activity

Update some dependencies

Browse Source 
- more recent sedlex fixes a bug that needed a workaround in our code
- we need recent dates_calc to avoid extra runtime dependency on `Str` that our
  build system won't handle
This commit is contained in:
Louis Gesbert 2024-05-17 15:32:51 +02:00
parent 1cb2763587
commit 2471c60beb
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
catala.opam
View File

@ -22,7 +22,7 @@ depends: [
"bindlib" {>= "6.0"}
"cmdliner" {>= "1.1.0"}
"cppo" {>= "1"}
"dates_calc" {>= "0.0.4"}
"dates_calc" {>= "0.0.6"}
"dune" {>= "3.11"}
"js_of_ocaml-ppx" {= "4.1.0"}
"menhir" {>= "20200211"}
@ -31,7 +31,7 @@ depends: [
"ocamlfind" {!= "1.9.5"}
"ocamlgraph" {>= "1.8.8"}
"re" {>= "1.10"}
"sedlex" {>= "2.4"}
"sedlex" {>= "3.1"}
"uutf" {>= "1.0.3"}
"ubase" {>= "0.05"}
"unionFind" {>= "20220109"}

6
compiler/surface/lexer.cppo.ml
View File

@ -778,9 +778,6 @@ let lex_raw (lexbuf : lexbuf) : token =
| _ -> (
(* Nested match for lower priority; `_` matches length 0 so we effectively retry the
sub-match at the same point *)
let lexbuf = lexbuf in
(* workaround sedlex bug, see https://github.com/ocaml-community/sedlex/issues/12
(fixed in 3.1) *)
match%sedlex lexbuf with
| Star (Compl '\n'), ('\n' | eof) -> LAW_TEXT (Utf8.lexeme lexbuf)
| _ -> L.raise_lexer_error (Pos.from_lpos prev_pos) prev_lexeme)
@ -817,9 +814,6 @@ let lex_law (lexbuf : lexbuf) : token =
| _ -> (
(* Nested match for lower priority; `_` matches length 0 so we effectively retry the
sub-match at the same point *)
let lexbuf = lexbuf in
(* workaround sedlex bug, see https://github.com/ocaml-community/sedlex/issues/12
(fixed in 3.1) *)
match%sedlex lexbuf with
| Star (Compl '\n'), ('\n' | eof) -> LAW_TEXT (Utf8.lexeme lexbuf)
| _ -> L.raise_lexer_error (Pos.from_lpos prev_pos) prev_lexeme)