Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forbid (never, never) #6800

Merged
merged 2 commits into from
Jan 10, 2018
Merged

Forbid (never, never) #6800

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5caeefb
Forbid (never, never)
elnabo Jan 1, 2018
9092c5d
simplify notation
elnabo Jan 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
simplify notation
  • Loading branch information
@elnabo
elnabo committed Jan 9, 2018
commit 9092c5d4d9cad5940bfcec77c6146b77044c6e7a
2 changes: 1 addition & 1 deletion src/typing/typeload.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2735,7 +2735,7 @@ module ClassInitializer = struct
if not cctx.is_lib then delay_check (fun() -> check_method set t_set (if set <> "set" && set <> "set_" ^ name then Some ("set_" ^ name) else None));
AccCall
) in
if (set = AccNormal && (match get with AccCall -> true | _ -> false)) || (set = AccNever && (match get with AccNever -> true | _ -> false)) then error (name ^ ": Unsupported property combination") p;
if (set = AccNormal && get = AccCall) || (set = AccNever && get = AccNever) then error (name ^ ": Unsupported property combination") p;
let cf = {
(mk_field name ret f.cff_pos (pos f.cff_name)) with
cf_doc = f.cff_doc;
Expand Down