Skip to content

Commit

Permalink
resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mbacarella committed Nov 20, 2021
2 parents 6e616d4 + aa38e1d commit a23a03d
Show file tree
Hide file tree
Showing 4 changed files with 229 additions and 144 deletions.
65 changes: 65 additions & 0 deletions .ocamlformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
profile=janestreet
quiet=false
max-iters=10
comment-check=true
wrap-fun-args=false
wrap-comments=false
type-decl-indent=2
type-decl=sparse
stritem-extension-indent=0
space-around-variants=true
space-around-records=true
space-around-lists=true
space-around-arrays=true
single-case=sparse
sequence-style=terminator
sequence-blank-line=compact
parse-docstrings=false
parens-tuple-patterns=multi-line-only
parens-tuple=multi-line-only
parens-ite=true
ocp-indent-compat=true
nested-match=wrap
module-item-spacing=compact
max-indent=68
match-indent-nested=never
match-indent=0
margin=100
let-module=sparse
let-binding-spacing=compact
let-binding-indent=2
let-and=sparse
leading-nested-match-parens=true
infix-precedence=parens
indicate-nested-or-patterns=unsafe-no
indicate-multiline-delimiters=no
indent-after-in=0
if-then-else=keyword-first
function-indent-nested=never
function-indent=2
field-space=loose
extension-indent=2
exp-grouping=parens
dock-collection-brackets=false
doc-comments-tag-only=fit
doc-comments-padding=1
doc-comments=before
disambiguate-non-breaking-match=false
disable=false
cases-matching-exp-indent=normal
cases-exp-indent=2
break-struct=force
break-string-literals=auto
break-sequences=true
break-separators=after
break-infix-before-func=true
break-infix=fit-or-vertical
break-fun-sig=fit-or-vertical
break-fun-decl=fit-or-vertical
break-collection-expressions=fit-or-vertical
break-cases=fit-or-vertical
break-before-in=fit-or-vertical
assignment-operator=begin-line
align-variants-decl=false
align-constructors-decl=false
align-cases=false
27 changes: 10 additions & 17 deletions discover.ml
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,31 @@ let () =
let ml_file = "config.ml" in
let ml_code = [ "let wide_ncurses = true" ] in
C.Flags.write_lines ml_file ml_code;

let stale_ncursesw : C.Pkg_config.package_conf =
{ libs = [ "-lncursesw" ]; cflags = [] }
in

let stale_ncursesw : C.Pkg_config.package_conf = { libs = [ "-lncursesw" ]; cflags = [] } in
let conf =
match C.Pkg_config.get c with
| None -> C.die "'pkg-config' missing"
| Some pc -> (
match C.Pkg_config.query pc ~package:"ncursesw" with
| None -> stale_ncursesw
| Some deps -> deps)
| Some pc ->
(match C.Pkg_config.query pc ~package:"ncursesw" with
| None -> stale_ncursesw
| Some deps -> deps)
in
let config_h =
match Sys.os_type with
| "Unix" ->
[
"#define CURSES_HEADER <curses.h>";
[ "#define CURSES_HEADER <curses.h>";
"#define CURSES_TERM_H <term.h>";
"#define HAVE_TERMIOS_H 1";
"#define HAVE_SYS_IOCTL_H 1";
"#define HAVE_SYS_IOCTL_H 1"
]
| "Win32" | "Cygwin" ->
[
"#define CURSES_HEADER <curses.h>";
[ "#define CURSES_HEADER <curses.h>";
"#define CURSES_TERM_H <term.h>";
"#define HAVE_WINDOWS_H 1";
"#define HAVE_WINDOWS_H 1"
]
| os -> failwith (Printf.sprintf "Sys.os_type: %s: unknown os type" os)
| os -> failwith (Printf.sprintf "Sys.os_type: %s: unknown os type" os)
in
C.Flags.write_lines "_config.h" config_h;

let extra_cflags = [ "-DHAVE_CONFIG_H" ] in
C.Flags.write_sexp "c_flags.sexp" (List.append conf.cflags extra_cflags);
C.Flags.write_sexp "c_library_flags.sexp" conf.libs)
188 changes: 94 additions & 94 deletions keys.ml
Original file line number Diff line number Diff line change
@@ -1,94 +1,94 @@
let code_yes = 0o400
let min = 0o401
let break = 0o401
let down = 0o402
let up = 0o403
let left = 0o404
let right = 0o405
let home = 0o406
let backspace = 0o407
let f0 = 0o410
let dl = 0o510
let il = 0o511
let dc = 0o512
let ic = 0o513
let eic = 0o514
let clear = 0o515
let eos = 0o516
let eol = 0o517
let sf = 0o520
let sr = 0o521
let npage = 0o522
let ppage = 0o523
let stab = 0o524
let ctab = 0o525
let catab = 0o526
let enter = 0o527
let sreset = 0o530
let reset = 0o531
let print = 0o532
let ll = 0o533
let a1 = 0o534
let a3 = 0o535
let b2 = 0o536
let c1 = 0o537
let c3 = 0o540
let btab = 0o541
let beg = 0o542
let cancel = 0o543
let close = 0o544
let command = 0o545
let copy = 0o546
let create = 0o547
let end_ = 0o550
let exit = 0o551
let find = 0o552
let help = 0o553
let mark = 0o554
let message = 0o555
let move = 0o556
let next = 0o557
let open_ = 0o560
let options = 0o561
let previous = 0o562
let redo = 0o563
let reference = 0o564
let refresh = 0o565
let replace = 0o566
let restart = 0o567
let resume = 0o570
let save = 0o571
let sbeg = 0o572
let scancel = 0o573
let scommand = 0o574
let scopy = 0o575
let screate = 0o576
let sdc = 0o577
let sdl = 0o600
let select = 0o601
let send = 0o602
let seol = 0o603
let sexit = 0o604
let sfind = 0o605
let shelp = 0o606
let shome = 0o607
let sic = 0o610
let sleft = 0o611
let smessage = 0o612
let smove = 0o613
let snext = 0o614
let soptions = 0o615
let sprevious = 0o616
let sprint = 0o617
let sredo = 0o620
let sreplace = 0o621
let sright = 0o622
let srsume = 0o623
let ssave = 0o624
let ssuspend = 0o625
let sundo = 0o626
let suspend = 0o627
let undo = 0o630
let mouse = 0o631
let resize = 0o632
let max = 0o777
let code_yes = 0o400
let min = 0o401
let break = 0o401
let down = 0o402
let up = 0o403
let left = 0o404
let right = 0o405
let home = 0o406
let backspace = 0o407
let f0 = 0o410
let dl = 0o510
let il = 0o511
let dc = 0o512
let ic = 0o513
let eic = 0o514
let clear = 0o515
let eos = 0o516
let eol = 0o517
let sf = 0o520
let sr = 0o521
let npage = 0o522
let ppage = 0o523
let stab = 0o524
let ctab = 0o525
let catab = 0o526
let enter = 0o527
let sreset = 0o530
let reset = 0o531
let print = 0o532
let ll = 0o533
let a1 = 0o534
let a3 = 0o535
let b2 = 0o536
let c1 = 0o537
let c3 = 0o540
let btab = 0o541
let beg = 0o542
let cancel = 0o543
let close = 0o544
let command = 0o545
let copy = 0o546
let create = 0o547
let end_ = 0o550
let exit = 0o551
let find = 0o552
let help = 0o553
let mark = 0o554
let message = 0o555
let move = 0o556
let next = 0o557
let open_ = 0o560
let options = 0o561
let previous = 0o562
let redo = 0o563
let reference = 0o564
let refresh = 0o565
let replace = 0o566
let restart = 0o567
let resume = 0o570
let save = 0o571
let sbeg = 0o572
let scancel = 0o573
let scommand = 0o574
let scopy = 0o575
let screate = 0o576
let sdc = 0o577
let sdl = 0o600
let select = 0o601
let send = 0o602
let seol = 0o603
let sexit = 0o604
let sfind = 0o605
let shelp = 0o606
let shome = 0o607
let sic = 0o610
let sleft = 0o611
let smessage = 0o612
let smove = 0o613
let snext = 0o614
let soptions = 0o615
let sprevious = 0o616
let sprint = 0o617
let sredo = 0o620
let sreplace = 0o621
let sright = 0o622
let srsume = 0o623
let ssave = 0o624
let ssuspend = 0o625
let sundo = 0o626
let suspend = 0o627
let undo = 0o630
let mouse = 0o631
let resize = 0o632
let max = 0o777
Loading

0 comments on commit a23a03d

Please sign in to comment.