diff options
Diffstat (limited to 'lib/configuration')
| -rwxr-xr-x | lib/configuration/dune | 1 | ||||
| -rw-r--r-- | lib/configuration/importConf.ml | 12 | ||||
| -rw-r--r-- | lib/configuration/locale.c | 12 | ||||
| -rw-r--r-- | lib/configuration/of_json.ml | 1 | ||||
| -rw-r--r-- | lib/configuration/read_conf.ml | 9 | ||||
| -rw-r--r-- | lib/configuration/syntax.ml | 1 |
6 files changed, 31 insertions, 5 deletions
diff --git a/lib/configuration/dune b/lib/configuration/dune index 27d31a6..b08e9bd 100755 --- a/lib/configuration/dune +++ b/lib/configuration/dune @@ -12,6 +12,7 @@ importExpression
importErrors
)
+ (foreign_stubs (language c) (names locale))
(preprocess (pps ppx_yojson_conv ppx_deriving.ord))
)
diff --git a/lib/configuration/importConf.ml b/lib/configuration/importConf.ml index 3406a11..aa0e2f3 100644 --- a/lib/configuration/importConf.ml +++ b/lib/configuration/importConf.ml @@ -5,6 +5,8 @@ module Path = ImportDataTypes.Path module T = Read_conf module Expression = ImportExpression.T +external set_locale : string -> unit = "set_locale" + let current_syntax = 1 let t_of_yojson : Yojson.Safe.t -> Syntax.t = @@ -39,7 +41,14 @@ let t_of_toml : Otoml.t -> (Syntax.t, string) result = [ "version" ] in match version with - | n when n = latest_version -> TomlReader.read toml + | n when n = latest_version -> + let conf = TomlReader.read toml in + let () = + Result.iter + (fun conf -> set_locale (Option.value ~default:"" conf.Syntax.locale)) + conf + in + conf | _ -> Printf.eprintf "Unsuported version : %d\n" version; exit 1 @@ -49,6 +58,7 @@ let dummy_conf = { source = { file = ""; tab = 0; name = "" }; version = 1; + locale = Some "C"; externals = []; columns = []; filters = []; diff --git a/lib/configuration/locale.c b/lib/configuration/locale.c new file mode 100644 index 0000000..eeafd26 --- /dev/null +++ b/lib/configuration/locale.c @@ -0,0 +1,12 @@ +#include <stdio.h> +#include <locale.h> +#include <caml/memory.h> +#include <caml/alloc.h> + +CAMLprim value set_locale( value param ) +{ + const char *s; + s = String_val(param); + setlocale(LC_NUMERIC, s); + return Val_unit; +} diff --git a/lib/configuration/of_json.ml b/lib/configuration/of_json.ml index e6ee7a4..6ac59a2 100644 --- a/lib/configuration/of_json.ml +++ b/lib/configuration/of_json.ml @@ -123,6 +123,7 @@ let yojson_of_predicate () = `Null type t = Syntax.t = { version : int; [@default current_syntax] + locale : string option; source : table; externals : syntax_v1_extern list; [@default []] columns : path expression list; diff --git a/lib/configuration/read_conf.ml b/lib/configuration/read_conf.ml index 952c43c..df1a728 100644 --- a/lib/configuration/read_conf.ml +++ b/lib/configuration/read_conf.ml @@ -184,17 +184,18 @@ module Make (S : Decoders.Decode.S) = struct S.field_opt_or ~default:[] "uniq" @@ S.list (self#parse_expression ExpressionParser.path) in - S.succeed @@ fun version source externals -> - Syntax.{ version; source; externals; columns; filters; sort; uniq } + S.succeed @@ fun version source externals locale -> + Syntax. + { version; source; externals; columns; filters; sort; uniq; locale } method conf = let* source = S.field "source" self#source and* externals = S.field_opt_or ~default:[] "externals" (S.key_value_pairs_seq self#external_) - in + and* locale = S.field_opt "locale" S.string in let* sheet = - S.field "sheet" self#sheet >|= fun v -> v 1 source externals + S.field "sheet" self#sheet >|= fun v -> v 1 source externals locale in S.succeed sheet diff --git a/lib/configuration/syntax.ml b/lib/configuration/syntax.ml index 1eb3c70..253720e 100644 --- a/lib/configuration/syntax.ml +++ b/lib/configuration/syntax.ml @@ -54,6 +54,7 @@ end type t = { version : int; + locale : string option; source : Table.t; externals : Extern.t list; columns : Path.t E.t list; |