summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pouillard <np@nicolaspouillard.fr>2010-02-03 13:11:20 +0000
committerNicolas Pouillard <np@nicolaspouillard.fr>2010-02-03 13:11:20 +0000
commitee0f1a1bb2d7f652182be81d504882cff6f660ab (patch)
treec8cc33d227ad859ea5e923e28c85708f213b4239
parent3a2a72f0b7bd8e858138678f1dbc614db4c48d52 (diff)
downloadocaml-ee0f1a1bb2d7f652182be81d504882cff6f660ab.tar.gz
ocamlbuild: no longer open Lexers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9613 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--ocamlbuild/findlib.ml9
1 files changed, 4 insertions, 5 deletions
diff --git a/ocamlbuild/findlib.ml b/ocamlbuild/findlib.ml
index 2282e8bf96..873adbabf8 100644
--- a/ocamlbuild/findlib.ml
+++ b/ocamlbuild/findlib.ml
@@ -13,7 +13,6 @@
(* Original author: Romain Bardou *)
open My_std
-open Lexers
open My_unix
open Command
@@ -74,15 +73,15 @@ let rec query name =
with Not_found ->
try
let n, d, v, a_byte, lo, l =
- run_and_parse ocamlfind_query
+ run_and_parse Lexers.ocamlfind_query
"%s query -l -predicates byte %s" ocamlfind name
in
let a_native =
- run_and_parse trim_blanks
+ run_and_parse Lexers.trim_blanks
"%s query -a-format -predicates native %s" ocamlfind name
in
let deps =
- run_and_parse blank_sep_strings "%s query -r -p-format %s" ocamlfind name
+ run_and_parse Lexers.blank_sep_strings "%s query -r -p-format %s" ocamlfind name
in
let deps = List.filter ((<>) n) deps in
let deps =
@@ -114,7 +113,7 @@ let rec query name =
error (Cannot_parse_query (name, s))
let list () =
- run_and_parse blank_sep_strings "%s list | cut -d' ' -f1" ocamlfind
+ run_and_parse Lexers.blank_sep_strings "%s list | cut -d' ' -f1" ocamlfind
(* The closure algorithm is easy because the dependencies are already closed
and sorted for each package. We only have to make the union. We could also