Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
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

Merged
dra27 merged 1 commit intoocaml:trunkfromdra27:toplevel-nostdlib
Aug 17, 2017
Merged

Conversation

dra27
Copy link
Member

Search path was initialised before options were parsed, meaning that
-nostdlib had no effect.

@dra27
Copy link
MemberAuthor

See#1039

@gasche
Copy link
Member

I have not reviewed the proposed change in detail yet, but this could be an invasive change, so we should not rush it.

@dra27
Copy link
MemberAuthor

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...

@xavierleroy
Copy link
Contributor

I don't remember how all this toplevel code works, but note the comment in toploop.ml:

(* Toplevel initialization. Performed here instead of at the   beginning of loop() so that user code linked in with ocamlmktop   can call directives from Topdirs. *)

So, I think it's safer to keepCompmisc.init_path false; in the initialization code of Toploop. But it should be OK to re-doCompmisc.init_path false; in Topmain.main so that the command-line flags are taken into account.

@xavierleroy
Copy link
Contributor

To elaborate on my previous comment, the "user code linked in with ocamlmktop" I have in mind is Coq, and more precisely itsDrop. command, which runs a Caml toplevel loop inside Coq for debugging purposes. See section 3.4 ofhttps://coq.inria.fr/cocorico/CoqCustomizationHowTo2006 . The procedure outlined there (compile Coq locally, run coqtop.byte,Drop.,#use "include";;) looks like a good regression test for us.

(Adding@maximedenes to this discussion for his information. No action expected yet.)

@dra27
Copy link
MemberAuthor

@xavierleroy - thanks for the test case! With the original PR, I got an error fromDrop. for being unable to find the standard library, so the PR definitely broke that. With the new commit I just pushed, I get to an OCaml toplevel - I get an error with the#use "include" (with either of theinclude files on offer), but I think that the ability to get to the toploop was the key thing here?

Search path was initialised before options were parsed, meaning that-nostdlib had no effect.
@dra27
Copy link
MemberAuthor

Rebased and squashed.@xavierleroy - are you happy to merge this?

Copy link
Contributor

@xavierleroyxavierleroy left a 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.

@dra27dra27 merged commit12b20f3 intoocaml:trunkAug 17, 2017
@dra27dra27 mentioned this pull requestNov 20, 2018
@dra27dra27 deleted the toplevel-nostdlib branchJuly 6, 2021 14:05
stedolan pushed a commit to stedolan/ocaml that referenced this pull requestMar 21, 2023
* 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.
stedolan pushed a commit to stedolan/ocaml that referenced this pull requestMar 21, 2023
Save cfg after simplify when compiling with IRCAdding back a hook mistakenly dropped in recent refactorig in PR#ocaml#1041to bypass linearize with -ocamlcfg.
EmileTrotignon pushed a commit to EmileTrotignon/ocaml that referenced this pull requestJan 12, 2024
…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
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@xavierleroyxavierleroyxavierleroy approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

3 participants
@dra27@gasche@xavierleroy

[8]ページ先頭

©2009-2025 Movatter.jp