equal
deleted
inserted
replaced
495 if is_function_type ty then SOME (ary sym ty) else NONE |
495 if is_function_type ty then SOME (ary sym ty) else NONE |
496 | _ => NONE) |
496 | _ => NONE) |
497 |> commas |> enclose "functions [" "]." |
497 |> commas |> enclose "functions [" "]." |
498 val pred_aries = |
498 val pred_aries = |
499 filt (fn Decl (_, sym, ty) => |
499 filt (fn Decl (_, sym, ty) => |
500 if is_nontrivial_predicate_type ty then SOME (ary sym ty) |
500 if is_predicate_type ty then SOME (ary sym ty) else NONE |
501 else NONE |
|
502 | _ => NONE) |
501 | _ => NONE) |
503 |> commas |> enclose "predicates [" "]." |
502 |> commas |> enclose "predicates [" "]." |
504 fun sorts () = |
503 fun sorts () = |
505 filt (fn Decl (_, sym, AType (s, [])) => |
504 filt (fn Decl (_, sym, AType (s, [])) => |
506 if s = tptp_type_of_types then SOME sym else NONE |
505 if s = tptp_type_of_types then SOME sym else NONE |
511 filt (fn Decl (_, sym, ty) => |
510 filt (fn Decl (_, sym, ty) => |
512 if is_function_type ty then SOME (fun_typ sym ty) else NONE |
511 if is_function_type ty then SOME (fun_typ sym ty) else NONE |
513 | _ => NONE) |
512 | _ => NONE) |
514 fun pred_sigs () = |
513 fun pred_sigs () = |
515 filt (fn Decl (_, sym, ty) => |
514 filt (fn Decl (_, sym, ty) => |
516 if is_predicate_type ty then SOME (pred_typ sym ty) else NONE |
515 if is_nontrivial_predicate_type ty then SOME (pred_typ sym ty) |
|
516 else NONE |
517 | _ => NONE) |
517 | _ => NONE) |
518 val decls = if sorted then func_sigs () @ pred_sigs () else [] |
518 val decls = if sorted then func_sigs () @ pred_sigs () else [] |
519 val axioms = filt (formula (curry (op <>) Conjecture)) |
519 val axioms = filt (formula (curry (op <>) Conjecture)) |
520 val conjs = filt (formula (curry (op =) Conjecture)) |
520 val conjs = filt (formula (curry (op =) Conjecture)) |
521 fun list_of _ [] = [] |
521 fun list_of _ [] = [] |