- Notifications
You must be signed in to change notification settings - Fork1.1k
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Fix -nostdlib option to ocaml#1041
Conversation
See#1039 |
I have not reviewed the proposed change in detail yet, but this could be an invasive change, so we should not rush it. |
It's rebased onto trunk, so hopefully will pass the CI this time. I agree - given the comments about initialisation timing in toploop.ml (and the fact that I haven't tested the native toplevel), this change does need reviewing by someone more familiar with the code... |
I don't remember how all this toplevel code works, but note the comment in toploop.ml:
So, I think it's safer to keep |
To elaborate on my previous comment, the "user code linked in with ocamlmktop" I have in mind is Coq, and more precisely its (Adding@maximedenes to this discussion for his information. No action expected yet.) |
@xavierleroy - thanks for the test case! With the original PR, I got an error from |
Search path was initialised before options were parsed, meaning that-nostdlib had no effect.
Rebased and squashed.@xavierleroy - are you happy to merge this? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Looks OK to me.
* Refactor: don't need res variable* Format* Refactor: move reorder_blocks slightly earlier* Remove test_cfgize* Move dump_linear slightly later* Bypass linearlize with -ocamlcfg flagReplacingmach->linear->cfg->linear->cfg withmach->cfg->linearRandom reordering of blocks is no longer tested after linearize, onlyafter cfgize.
Save cfg after simplify when compiling with IRCAdding back a hook mistakenly dropped in recent refactorig in PR#ocaml#1041to bypass linearize with -ocamlcfg.
…th (ocaml#1041)1021 fixed the bug of the missing right sidebar when navigatingvia htmx to a tutorial from the main "Learn" page, but itcaused a reset of the scroll position on the left sidebar.We fix that here:* we change back to the default mode of `htmx`, which replaces `innerHTML` (we know scroll position is preserved when replacing `innerHTML`)* the right sidebar htmx container is always rendered, but we do not specify a width - so that on pages without right sidebar content, the right sidebar shrinks to a width of zero as the main content area grows* if the page in question has right sidebar content, we set the width of the sidebar
Search path was initialised before options were parsed, meaning that
-nostdlib had no effect.