From 3df6e4cf7ee3d47eded58ad3f0ec62aeeb5f6d00 Mon Sep 17 00:00:00 2001 From: ncihnegn Date: Mon, 16 Apr 2018 02:01:24 -0700 Subject: [PATCH] Replace deprecated CamomileLibraryDyn with CamomileLibraryDefault for camomile >= 1.0.0 --- examples/editor.ml | 2 +- examples/read_yes_no.ml | 2 +- examples/shell.ml | 2 +- src/lTerm.ml | 2 +- src/lTerm_buttons_impl.ml | 2 +- src/lTerm_draw.ml | 2 +- src/lTerm_edit.ml | 2 +- src/lTerm_history.ml | 2 +- src/lTerm_inputrc.mll | 2 +- src/lTerm_key.ml | 2 +- src/lTerm_read_line.ml | 2 +- src/lTerm_text.ml | 2 +- src/lTerm_unix.ml | 2 +- src/lTerm_unix.mli | 2 +- src/lTerm_widget.ml | 2 +- src/lTerm_windows.ml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/editor.ml b/examples/editor.ml index 29a2d6bf..25655ee7 100644 --- a/examples/editor.ml +++ b/examples/editor.ml @@ -7,7 +7,7 @@ * This file is a part of Lambda-Term. *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile open Lwt let main () = diff --git a/examples/read_yes_no.ml b/examples/read_yes_no.ml index 4dd7a8b7..87cc6a63 100644 --- a/examples/read_yes_no.ml +++ b/examples/read_yes_no.ml @@ -11,7 +11,7 @@ open Lwt let rec read_char term = LTerm.read_event term >>= function - | LTerm_event.Key { LTerm_key.code = LTerm_key.Char ch; LTerm_key.control = true ; _ } when ch = CamomileLibraryDyn.Camomile.UChar.of_char 'c' -> + | LTerm_event.Key { LTerm_key.code = LTerm_key.Char ch; LTerm_key.control = true ; _ } when ch = CamomileLibraryDefault.Camomile.UChar.of_char 'c' -> (* Exit on Ctrl+C *) Lwt.fail (Failure "interrupted") | LTerm_event.Key { LTerm_key.code = LTerm_key.Char ch ; _ } -> diff --git a/examples/shell.ml b/examples/shell.ml index 8ba7ad22..c4e11842 100644 --- a/examples/shell.ml +++ b/examples/shell.ml @@ -9,7 +9,7 @@ (* A mini shell *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile open React open Lwt open LTerm_style diff --git a/src/lTerm.ml b/src/lTerm.ml index 5215b02e..3888025a 100644 --- a/src/lTerm.ml +++ b/src/lTerm.ml @@ -7,7 +7,7 @@ * This file is a part of Lambda-Term. *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile open Lwt_react open LTerm_geom diff --git a/src/lTerm_buttons_impl.ml b/src/lTerm_buttons_impl.ml index 6abde1f0..fc771333 100644 --- a/src/lTerm_buttons_impl.ml +++ b/src/lTerm_buttons_impl.ml @@ -7,7 +7,7 @@ * This file is a part of Lambda-Term. *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile open LTerm_geom open LTerm_key open LTerm_mouse diff --git a/src/lTerm_draw.ml b/src/lTerm_draw.ml index 9d7c8816..8450d5dd 100644 --- a/src/lTerm_draw.ml +++ b/src/lTerm_draw.ml @@ -7,7 +7,7 @@ * This file is a part of Lambda-Term. *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile open LTerm_geom let unsafe_get matrix line column = diff --git a/src/lTerm_edit.ml b/src/lTerm_edit.ml index 23972d82..385e6342 100644 --- a/src/lTerm_edit.ml +++ b/src/lTerm_edit.ml @@ -7,7 +7,7 @@ * This file is a part of Lambda-Term. *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile open Zed_edit open LTerm_key open LTerm_geom diff --git a/src/lTerm_history.ml b/src/lTerm_history.ml index 19304ee9..5f766f70 100644 --- a/src/lTerm_history.ml +++ b/src/lTerm_history.ml @@ -7,7 +7,7 @@ * This file is a part of Lambda-Term. *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile let return, (>>=) = Lwt.return, Lwt.(>>=) diff --git a/src/lTerm_inputrc.mll b/src/lTerm_inputrc.mll index e9ddd859..a8baefb7 100644 --- a/src/lTerm_inputrc.mll +++ b/src/lTerm_inputrc.mll @@ -8,7 +8,7 @@ *) { - open CamomileLibraryDyn.Camomile + open CamomileLibraryDefault.Camomile open LTerm_key let return, (>>=) = Lwt.return, Lwt.(>>=) diff --git a/src/lTerm_key.ml b/src/lTerm_key.ml index 1f417dad..1946def2 100644 --- a/src/lTerm_key.ml +++ b/src/lTerm_key.ml @@ -14,7 +14,7 @@ module String = struct include String end -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile type code = | Char of UChar.t diff --git a/src/lTerm_read_line.ml b/src/lTerm_read_line.ml index d1d2afa8..089b1845 100644 --- a/src/lTerm_read_line.ml +++ b/src/lTerm_read_line.ml @@ -7,7 +7,7 @@ * This file is a part of Lambda-Term. *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile open Lwt_react open LTerm_geom open LTerm_style diff --git a/src/lTerm_text.ml b/src/lTerm_text.ml index 871f64b4..c6af7980 100644 --- a/src/lTerm_text.ml +++ b/src/lTerm_text.ml @@ -7,7 +7,7 @@ * This file is a part of Lambda-Term. *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile open LTerm_style type t = (UChar.t * LTerm_style.t) array diff --git a/src/lTerm_unix.ml b/src/lTerm_unix.ml index 172bc56b..47a822e7 100644 --- a/src/lTerm_unix.ml +++ b/src/lTerm_unix.ml @@ -7,7 +7,7 @@ * This file is a part of Lambda-Term. *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile open LTerm_key let return, (>>=), (>|=) = Lwt.return, Lwt.(>>=), Lwt.(>|=) diff --git a/src/lTerm_unix.mli b/src/lTerm_unix.mli index 0e1b61f2..502aee23 100644 --- a/src/lTerm_unix.mli +++ b/src/lTerm_unix.mli @@ -9,7 +9,7 @@ (** Unix specific functions *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile val sigwinch : int option (** The number of the signal used to indicate that the terminal size diff --git a/src/lTerm_widget.ml b/src/lTerm_widget.ml index 891b05e9..1dd76bce 100644 --- a/src/lTerm_widget.ml +++ b/src/lTerm_widget.ml @@ -7,7 +7,7 @@ * This file is a part of Lambda-Term. *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile open LTerm_geom open LTerm_draw diff --git a/src/lTerm_windows.ml b/src/lTerm_windows.ml index a05a9a2d..b611b5d1 100644 --- a/src/lTerm_windows.ml +++ b/src/lTerm_windows.ml @@ -7,7 +7,7 @@ * This file is a part of Lambda-Term. *) -open CamomileLibraryDyn.Camomile +open CamomileLibraryDefault.Camomile let (>|=) = Lwt.(>|=)