mirror of
https://github.com/CatalaLang/catala.git
synced 2024-09-19 00:15:39 +03:00
Update some dependencies
- 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:
parent
1cb2763587
commit
2471c60beb
@ -22,7 +22,7 @@ depends: [
|
|||||||
"bindlib" {>= "6.0"}
|
"bindlib" {>= "6.0"}
|
||||||
"cmdliner" {>= "1.1.0"}
|
"cmdliner" {>= "1.1.0"}
|
||||||
"cppo" {>= "1"}
|
"cppo" {>= "1"}
|
||||||
"dates_calc" {>= "0.0.4"}
|
"dates_calc" {>= "0.0.6"}
|
||||||
"dune" {>= "3.11"}
|
"dune" {>= "3.11"}
|
||||||
"js_of_ocaml-ppx" {= "4.1.0"}
|
"js_of_ocaml-ppx" {= "4.1.0"}
|
||||||
"menhir" {>= "20200211"}
|
"menhir" {>= "20200211"}
|
||||||
@ -31,7 +31,7 @@ depends: [
|
|||||||
"ocamlfind" {!= "1.9.5"}
|
"ocamlfind" {!= "1.9.5"}
|
||||||
"ocamlgraph" {>= "1.8.8"}
|
"ocamlgraph" {>= "1.8.8"}
|
||||||
"re" {>= "1.10"}
|
"re" {>= "1.10"}
|
||||||
"sedlex" {>= "2.4"}
|
"sedlex" {>= "3.1"}
|
||||||
"uutf" {>= "1.0.3"}
|
"uutf" {>= "1.0.3"}
|
||||||
"ubase" {>= "0.05"}
|
"ubase" {>= "0.05"}
|
||||||
"unionFind" {>= "20220109"}
|
"unionFind" {>= "20220109"}
|
||||||
|
@ -778,9 +778,6 @@ let lex_raw (lexbuf : lexbuf) : token =
|
|||||||
| _ -> (
|
| _ -> (
|
||||||
(* Nested match for lower priority; `_` matches length 0 so we effectively retry the
|
(* Nested match for lower priority; `_` matches length 0 so we effectively retry the
|
||||||
sub-match at the same point *)
|
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
|
match%sedlex lexbuf with
|
||||||
| Star (Compl '\n'), ('\n' | eof) -> LAW_TEXT (Utf8.lexeme lexbuf)
|
| Star (Compl '\n'), ('\n' | eof) -> LAW_TEXT (Utf8.lexeme lexbuf)
|
||||||
| _ -> L.raise_lexer_error (Pos.from_lpos prev_pos) prev_lexeme)
|
| _ -> 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
|
(* Nested match for lower priority; `_` matches length 0 so we effectively retry the
|
||||||
sub-match at the same point *)
|
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
|
match%sedlex lexbuf with
|
||||||
| Star (Compl '\n'), ('\n' | eof) -> LAW_TEXT (Utf8.lexeme lexbuf)
|
| Star (Compl '\n'), ('\n' | eof) -> LAW_TEXT (Utf8.lexeme lexbuf)
|
||||||
| _ -> L.raise_lexer_error (Pos.from_lpos prev_pos) prev_lexeme)
|
| _ -> L.raise_lexer_error (Pos.from_lpos prev_pos) prev_lexeme)
|
||||||
|
Loading…
Reference in New Issue
Block a user