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.

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

Fix stdlib mlis #178

Merged
merged 3 commits into from
Oct 19, 2023
Merged

Fix stdlib mlis #178

merged 3 commits into from
Oct 19, 2023

Conversation

ncik-roberts
Copy link
Contributor

Resolve conflicts in stdlib mlis. These are almost always resolutions that prefer tip-5, but a handful of cases incorporate comments/documentation from tip-jst.

I make one update to gc.ml because, while we're still using the ocaml 4 runtime, we don't have to replace these functions with no-ops. When we finish merging the ocaml 5 runtime, we'll be flagged that these external functions don't exist and can figure out that they should be replaced with no-ops then.

Testing:

for x in stdlib/*.mli; do
  file=$(basename ${x%.mli});
  if echo $file | grep 'camlinternal\|stdlib\|std_exit'; then
    cmi=$file
  else
    cmi=stdlib__${file^}
  fi

  dune b --workspace=duneconf/runtime_stdlib.ws _build/runtime_stdlib/stdlib/.stdlib.objs/byte/$cmi.cmi
done

You'll see some syntax errors for JS-internal features: local_, float#, global_, but things otherwise build

@goldfirere
Copy link
Contributor

Reviewing

stdlib/gc.mli Show resolved Hide resolved
stdlib/moreLabels.mli Outdated Show resolved Hide resolved
@goldfirere goldfirere merged commit 2fabc85 into main Oct 19, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants