Commit 59c08ff4 authored by Kim Nguyễn's avatar Kim Nguyễn
Browse files

Relax dependencies yet again.

parent be15ecdc
......@@ -13,3 +13,4 @@ cduce.modules
cduce.opt
configure.log
_build/**
**/.merlin
......@@ -13,7 +13,7 @@ license: "MIT"
homepage: "https://www.cduce.org"
bug-reports: "https://gitlab.math.univ-paris-diderot.fr/cduce/cduce/-/issues"
build: [
["dune" "subst"] {dev}
["dune" "subst"] {pinned}
[
"dune"
"build"
......
......@@ -14,7 +14,7 @@ license: "MIT"
homepage: "https://www.cduce.org"
bug-reports: "https://gitlab.math.univ-paris-diderot.fr/cduce/cduce/-/issues"
build: [
["dune" "subst"] {dev}
["dune" "subst"] {pinned}
[
"dune"
"build"
......@@ -31,13 +31,15 @@ dev-repo: "git+https://gitlab.math.univ-paris-diderot.fr/cduce/cduce/"
depends: [
"ocaml" {>= "4.07.0"}
"dune" {build & >= "2.8"}
"menhir" {build & >= "20181026"}
"cduce-types"
"odoc" {with-doc}
"sedlex" {>= "2.0"}
("ocurl" { >= "0.9.1" } |
"ocamlnet" { >= "4.1.8"})
("ocaml-expat" {>= "1.1.0" } |
"pxp" {>= "1.2.9"})
]
depopts: [
"ocaml-compiler-libs" {>= "0.11.0"}
"ocaml-compiler-libs" {>= "v0.9.0"}
]
depends: [
"ocaml" {>= "4.07.0"}
"dune" {build & >= "2.8"}
"dune" {build & >= "2.4"}
"menhir" {build & >= "20181026"}
"cduce-types"
"odoc" {with-doc}
"sedlex" {>= "2.0"}
......
......@@ -10,7 +10,7 @@
cduce.lib.ocamliface))
(env
(dev
(_
(flags
(:standard -w -58))))
......
(lang dune 2.8)
(lang dune 2.3)
(name cduce)
......
(menhir
(modules parser))
(modules parser)
(infer false)
)
......@@ -128,7 +128,7 @@ let id_dummy = U.mk "$$$"
%token EQ "=" LTEQ "<=" LTLT "<<" GTGT ">>" GTEQ ">=" BANGEQ "!="
%token PLUS "+" MINUS "-" AT "@"
%token BARBAR "||" BAR "|"
%token SETMINUS "\\"
%token SETMINUS
%token STAR "*"
%token AMPAMP "&&" AMP "&"
%token STARSTAR "**"
......@@ -177,7 +177,7 @@ let id_dummy = U.mk "$$$"
%left "=" "<<" ">>" "<=" ">=" "!="
%left "+" "-" "@"
%left "*" "div" "mod"
%left "\\" "//" "/@" "/"
%left SETMINUS "//" "/@" "/"
%nonassoc ":"
%nonassoc "!" unary_op
%left "."
......@@ -312,7 +312,7 @@ or_pat:
and_pat:
| x = and_pat "&" y = var_pat { mk $sloc (And(x, y)) }
| x = and_pat "\\" y = var_pat { mk $sloc (Diff(x, y)) }
| x = and_pat SETMINUS y = var_pat { mk $sloc (Diff(x, y)) }
| x = var_pat { x }
;
......@@ -535,7 +535,7 @@ regexp_and:
| _ -> parsing_error $sloc
"Conjunction not allowed in regular expression"
}
| x = regexp_and "\\" y = regexp_acc {
| x = regexp_and SETMINUS y = regexp_acc {
match x, y with
Elem x, Elem y -> Elem (mk $sloc (Diff (x, y)))
| _ -> parsing_error $sloc
......@@ -757,7 +757,7 @@ expr:
| "&&" -> exp $sloc (logical_and e1 e2)
| _ -> apply_op2 $sloc op e1 e2
}
| e = expr "\\" l = ident_or_keyword { exp $sloc (RemoveField(e, label l)) }
| e = expr SETMINUS l = ident_or_keyword { exp $sloc (RemoveField(e, label l)) }
| e = expr "/" p = var_pat {
let tag = mk $sloc (Internal (Types.atom (Atoms.any))) in
let att = mk $sloc (Internal Types.Record.any) in
......
(* -*- tuareg -*- *)
let () =
let suffix = match
List.map int_of_string (
String.split_on_char '.' Jbuild_plugin.V1.ocaml_version
) with
4 :: 7 :: _ -> "407"
| 4 :: (8|9) :: _ -> "408_9"
| _ -> "410"
in Jbuild_plugin.V1.send (Printf.sprintf {|
(library
(name cduce_ocamliface)
(public_name cduce.lib.ocamliface)
......@@ -18,27 +29,7 @@
))
(rule
(enabled_if
(< %{ocaml_version} 4.08))
(deps mlcompat_407.ml)
(target mlcompat.ml)
(action
(copy# %{deps} %{target})))
(rule
(enabled_if
(and
(>= %{ocaml_version} 4.08)
(< %{ocaml_version} 4.10)))
(deps mlcompat_408_9.ml)
(target mlcompat.ml)
(action
(copy# %{deps} %{target})))
(rule
(enabled_if
(>= %{ocaml_version} 4.10))
(deps mlcompat_410.ml)
(target mlcompat.ml)
(action
(copy# %{deps} %{target})))
(copy# mlcompat_%s.ml mlcompat.ml)))
|} suffix)
;;
\ No newline at end of file
......@@ -4,5 +4,5 @@
(package cduce)
(optional)
(modules dtd2cduce)
(libraries threads netcgi2 pxp)
(libraries netcgi2 pxp threads)
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment