diff options
| author | Emilio Jesus Gallego Arias | 2018-09-27 02:28:30 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2018-10-01 05:00:01 +0200 |
| commit | 4de95593380294b3d2c4f10f346aaf9bb5d4d6eb (patch) | |
| tree | e65e843f7bd461348be11369efb7b28d84dc2cb7 | |
| parent | c403fa491bb4ef9710c6251e5d5c47c046c95e39 (diff) | |
[lib] [flags] Move private IDE functions to `ide`
| -rw-r--r-- | ide/preferences.ml | 19 | ||||
| -rw-r--r-- | lib/flags.ml | 17 | ||||
| -rw-r--r-- | lib/flags.mli | 7 |
3 files changed, 17 insertions, 26 deletions
diff --git a/ide/preferences.ml b/ide/preferences.ml index 955ee87840..3f10af04c9 100644 --- a/ide/preferences.ml +++ b/ide/preferences.ml @@ -345,8 +345,15 @@ let _ = attach_modifiers modifier_for_queries "<Actions>/Queries/" let modifiers_valid = new preference ~name:["modifiers_valid"] ~init:"<Alt><Control><Shift>" ~repr:Repr.(string) +let browser_cmd_fmt = + try + let coq_netscape_remote_var = "COQREMOTEBROWSER" in + Sys.getenv coq_netscape_remote_var + with + Not_found -> Coq_config.browser + let cmd_browse = - new preference ~name:["cmd_browse"] ~init:Flags.browser_cmd_fmt ~repr:Repr.(string) + new preference ~name:["cmd_browse"] ~init:browser_cmd_fmt ~repr:Repr.(string) let cmd_editor = let init = if Sys.os_type = "Win32" then "NOTEPAD %s" else "emacs %s" in @@ -359,6 +366,14 @@ let text_font = in new preference ~name:["text_font"] ~init ~repr:Repr.(string) +let is_standard_doc_url url = + let wwwcompatprefix = "http://www.lix.polytechnique.fr/coq/" in + let n = String.length Coq_config.wwwcoq in + let n' = String.length Coq_config.wwwrefman in + url = Coq_config.localwwwrefman || + url = Coq_config.wwwrefman || + url = wwwcompatprefix ^ String.sub Coq_config.wwwrefman n (n'-n) + let doc_url = object inherit [string] preference @@ -366,7 +381,7 @@ object as super method! set v = - if not (Flags.is_standard_doc_url v) && + if not (is_standard_doc_url v) && v <> use_default_doc_url && (* Extra hack to support links to last released doc version *) v <> Coq_config.wwwcoq ^ "doc" && diff --git a/lib/flags.ml b/lib/flags.ml index 7e0065beba..54f25e209d 100644 --- a/lib/flags.ml +++ b/lib/flags.ml @@ -121,23 +121,6 @@ let warn = ref true let make_warn flag = warn := flag; () let if_warn f x = if !warn then f x -(* Flags for external tools *) - -let browser_cmd_fmt = - try - let coq_netscape_remote_var = "COQREMOTEBROWSER" in - Sys.getenv coq_netscape_remote_var - with - Not_found -> Coq_config.browser - -let is_standard_doc_url url = - let wwwcompatprefix = "http://www.lix.polytechnique.fr/coq/" in - let n = String.length Coq_config.wwwcoq in - let n' = String.length Coq_config.wwwrefman in - url = Coq_config.localwwwrefman || - url = Coq_config.wwwrefman || - url = wwwcompatprefix ^ String.sub Coq_config.wwwrefman n (n'-n) - (* Options for changing coqlib *) let coqlib_spec = ref false let coqlib = ref "(not initialized yet)" diff --git a/lib/flags.mli b/lib/flags.mli index 02d8a3adc1..0faad1a541 100644 --- a/lib/flags.mli +++ b/lib/flags.mli @@ -118,13 +118,6 @@ val without_option : bool ref -> ('a -> 'b) -> 'a -> 'b (** Temporarily extends the reference to a list *) val with_extra_values : 'c list ref -> 'c list -> ('a -> 'b) -> 'a -> 'b -(** Options for external tools *) - -(** Returns string format for default browser to use from Coq or CoqIDE *) -val browser_cmd_fmt : string - -val is_standard_doc_url : string -> bool - (** Options for specifying where coq librairies reside *) val coqlib_spec : bool ref val coqlib : string ref |
