Merge branch 'ZackerySpytz-OCaml-fix-typedef_mptr'

* ZackerySpytz-OCaml-fix-typedef_mptr:
  [OCaml] Fix and re-enable typedef_mptr_runme.ml
This commit is contained in:
William S Fulton 2019-02-09 22:29:18 +00:00
commit 5c66ed3d0b
2 changed files with 9 additions and 13 deletions

View file

@ -29,7 +29,6 @@ li_windows \
member_pointer_const \ member_pointer_const \
preproc_constants \ preproc_constants \
smart_pointer_inherit \ smart_pointer_inherit \
typedef_mptr \
FAILING_C_TESTS = \ FAILING_C_TESTS = \
enums \ enums \

View file

@ -1,16 +1,13 @@
open Swig open Swig
open Typedef_mptr open Typedef_mptr
let soci x = (string_of_int (get_int x))
let x = new_Foo C_void
let add_res = _do_op (C_list [ x ; C_int 2 ; C_int 1 ; _add ])
and sub_res = _do_op (C_list [ x ; C_int 2 ; C_int 1 ; _sub ])
let _ = let _ =
if add_res <> (C_int 3) || sub_res <> (C_int 1) then let f = new_Foo '() in
raise (Failure ("Bad result:" ^ let args = C_list [ C_int 2 ; C_int 1 ; _add '() ] in
" (add " ^ (soci add_res) ^ ") " ^ assert (f -> do_op (args) as int = 3);
" (sub " ^ (soci sub_res) ^ ")")) let args = C_list [ C_int 2 ; C_int 1 ; _sub '() ] in
let _ = Printf.printf "2 + 1 = %d, 2 - 1 = %d\n" assert (f -> do_op (args) as int = 1);
(get_int add_res)
(get_int sub_res) assert (_do_op (C_list [ f ; C_int 2 ; C_int 1 ; _add '() ]) = C_int 3);
assert (_do_op (C_list [ f ; C_int 2 ; C_int 1 ; _sub '() ]) = C_int 1);
;;