diff options
Diffstat (limited to 'source/xi')
-rw-r--r-- | source/xi/.merlin | 15 | ||||
-rw-r--r-- | source/xi/pipeline.ml | 2 | ||||
-rw-r--r-- | source/xi/xi.ml | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/source/xi/.merlin b/source/xi/.merlin new file mode 100644 index 0000000..dc01a8e --- /dev/null +++ b/source/xi/.merlin @@ -0,0 +1,15 @@ +B /home/wieczyk/.opam/4.07.0/lib/bytes +B /home/wieczyk/.opam/4.07.0/lib/cmdliner +B /home/wieczyk/.opam/4.07.0/lib/ocaml +B /home/wieczyk/.opam/4.07.0/lib/ocamlgraph +B /home/wieczyk/.opam/4.07.0/lib/result +B ../../_build/default/source/xi/.xi.eobjs +B ../../_build/default/source/xi_lib/.xi_lib.objs +S /home/wieczyk/.opam/4.07.0/lib/bytes +S /home/wieczyk/.opam/4.07.0/lib/cmdliner +S /home/wieczyk/.opam/4.07.0/lib/ocaml +S /home/wieczyk/.opam/4.07.0/lib/ocamlgraph +S /home/wieczyk/.opam/4.07.0/lib/result +S . +S ../xi_lib +FLG -w @a-4-29-40-41-42-44-45-48-58-59-60-40 -strict-sequence -strict-formats -short-paths -keep-locs -g -w -39-33-26-27 diff --git a/source/xi/pipeline.ml b/source/xi/pipeline.ml index ae9a4c9..190a3f3 100644 --- a/source/xi/pipeline.ml +++ b/source/xi/pipeline.ml @@ -22,7 +22,7 @@ module Make(Steps:COMPILER_STEPS)(Params:PARAMS) = struct let describe_register_mapping mapping = let describe_map k v xs = - let entry = Format.sprintf "%s -> %s" (Ir.string_of_reg k) (Ir.string_of_reg v) in + let entry = Format.sprintf "%s -> %s" (Ir_utils.string_of_reg k) (Ir_utils.string_of_reg v) in entry :: xs in String.concat "\n" @@ Hashtbl.fold describe_map mapping [] diff --git a/source/xi/xi.ml b/source/xi/xi.ml index d59dbf6..c54a499 100644 --- a/source/xi/xi.ml +++ b/source/xi/xi.ml @@ -72,7 +72,7 @@ module CommandLine = struct let cmd = let doc = "Compile Xi Program" in - let version = "pracownia2.3-0-g63fd12e" in + let version = "pracownia3.1-0-g147dd61" in Term.(const compile $ xi_log $ extra_debug $ mod_uwr $ plugin $ reg_descr $ stop_after $ output $ source_file), Term.info "xi" ~doc ~version |