Skip to content

Fix nullable to opt conversion. #7193

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

Merged
merged 3 commits into from
Dec 5, 2024
Merged

Fix nullable to opt conversion. #7193

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6bc53e
Fix nullable to opt conversion.
cristianoc Dec 5, 2024
8657a49
One more typo.
cristianoc Dec 5, 2024
35bb5e4
Update CHANGELOG.md
cristianoc Dec 5, 2024
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
4 changes: 2 additions & 2 deletions compiler/ml/translcore.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,8 @@ let primitives_table =
("#undefined", Pundefined);
("#typeof", Ptypeof);
("#is_nullable", Pisnullable);
("#null_to_opt", Pnullable_to_opt);
("#nullable_to_opt", Pnull_to_opt);
("#null_to_opt", Pnull_to_opt);
("#nullable_to_opt", Pnullable_to_opt);
("#undefined_to_opt", Pundefined_to_opt);
("#makemutablelist", Pmakelist Mutable);
("#import", Pimport);
Expand Down
32 changes: 16 additions & 16 deletions lib/es6/Null.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ function fromOption(option) {
}

function equal(a, b, eq) {
return Option.equal((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), eq);
return Option.equal(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), eq);
}

function compare(a, b, cmp) {
return Option.compare((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), cmp);
return Option.compare(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), cmp);
}

function getOr(value, $$default) {
if (value == null) {
return $$default;
} else {
if (value !== null) {
return value;
} else {
return $$default;
}
}

function getExn(value) {
if (!(value == null)) {
if (value !== null) {
return value;
}
throw {
Expand All @@ -39,33 +39,33 @@ function getExn(value) {
}

function forEach(value, f) {
if (!(value == null)) {
if (value !== null) {
return f(value);
}

}

function map(value, f) {
if (value == null) {
return null;
} else {
if (value !== null) {
return f(value);
} else {
return null;
}
}

function mapOr(value, $$default, f) {
if (value == null) {
return $$default;
} else {
if (value !== null) {
return f(value);
} else {
return $$default;
}
}

function flatMap(value, f) {
if (value == null) {
return null;
} else {
if (value !== null) {
return f(value);
} else {
return null;
}
}

Expand Down
32 changes: 16 additions & 16 deletions lib/es6/Nullable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ function fromOption(option) {
}

function equal(a, b, eq) {
return Option.equal(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), eq);
return Option.equal((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), eq);
}

function compare(a, b, cmp) {
return Option.compare(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), cmp);
return Option.compare((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), cmp);
}

function getOr(value, $$default) {
if (value !== null) {
return value;
} else {
if (value == null) {
return $$default;
} else {
return value;
}
}

function getExn(value) {
if (value !== null) {
if (!(value == null)) {
return value;
}
throw {
Expand All @@ -38,33 +38,33 @@ function getExn(value) {
}

function forEach(value, f) {
if (value !== null) {
if (!(value == null)) {
return f(value);
}

}

function map(value, f) {
if (value !== null) {
return f(value);
} else {
if (value == null) {
return value;
} else {
return f(value);
}
}

function mapOr(value, $$default, f) {
if (value !== null) {
return f(value);
} else {
if (value == null) {
return $$default;
} else {
return f(value);
}
}

function flatMap(value, f) {
if (value !== null) {
return f(value);
} else {
if (value == null) {
return value;
} else {
return f(value);
}
}

Expand Down
32 changes: 16 additions & 16 deletions lib/js/Null.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ function fromOption(option) {
}

function equal(a, b, eq) {
return Option.equal((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), eq);
return Option.equal(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), eq);
}

function compare(a, b, cmp) {
return Option.compare((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), cmp);
return Option.compare(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), cmp);
}

function getOr(value, $$default) {
if (value == null) {
return $$default;
} else {
if (value !== null) {
return value;
} else {
return $$default;
}
}

function getExn(value) {
if (!(value == null)) {
if (value !== null) {
return value;
}
throw {
Expand All @@ -39,33 +39,33 @@ function getExn(value) {
}

function forEach(value, f) {
if (!(value == null)) {
if (value !== null) {
return f(value);
}

}

function map(value, f) {
if (value == null) {
return null;
} else {
if (value !== null) {
return f(value);
} else {
return null;
}
}

function mapOr(value, $$default, f) {
if (value == null) {
return $$default;
} else {
if (value !== null) {
return f(value);
} else {
return $$default;
}
}

function flatMap(value, f) {
if (value == null) {
return null;
} else {
if (value !== null) {
return f(value);
} else {
return null;
}
}

Expand Down
32 changes: 16 additions & 16 deletions lib/js/Nullable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@ function fromOption(option) {
}

function equal(a, b, eq) {
return Option.equal(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), eq);
return Option.equal((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), eq);
}

function compare(a, b, cmp) {
return Option.compare(a === null ? undefined : Primitive_option.some(a), b === null ? undefined : Primitive_option.some(b), cmp);
return Option.compare((a == null) ? undefined : Primitive_option.some(a), (b == null) ? undefined : Primitive_option.some(b), cmp);
}

function getOr(value, $$default) {
if (value !== null) {
return value;
} else {
if (value == null) {
return $$default;
} else {
return value;
}
}

function getExn(value) {
if (value !== null) {
if (!(value == null)) {
return value;
}
throw {
Expand All @@ -38,33 +38,33 @@ function getExn(value) {
}

function forEach(value, f) {
if (value !== null) {
if (!(value == null)) {
return f(value);
}

}

function map(value, f) {
if (value !== null) {
return f(value);
} else {
if (value == null) {
return value;
} else {
return f(value);
}
}

function mapOr(value, $$default, f) {
if (value !== null) {
return f(value);
} else {
if (value == null) {
return $$default;
} else {
return f(value);
}
}

function flatMap(value, f) {
if (value !== null) {
return f(value);
} else {
if (value == null) {
return value;
} else {
return f(value);
}
}

Expand Down
Loading