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

Jump to bottom

Rename ocamlopttoplevel.cmxa to ocamltoplevel.cmxa #10078

Merged
merged 1 commit into from
Dec 15, 2020
Merged

Rename ocamlopttoplevel.cmxa to ocamltoplevel.cmxa #10078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ Working version
to the implementation and the coercion.
(Leandro Ostera, review by Gabriel Scherer and Thomas Refis)

* #10061: remove modules `Opttoploop`, `Opttopstart`, which are replaced by
`Toploop` and `Topstart`, made available in native code.
* #10061, #10078: remove library `ocamlopttoplevel`, remove modules
`Opttoploop`, `Opttopstart`, which are replaced by `Toploop` and `Topstart` in
library `ocamltoplevel`, made available in native code.

### Build system:

Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,7 @@ endif
ocamlnat$(EXE): compilerlibs/ocamlcommon.cmxa compilerlibs/ocamloptcomp.cmxa \
compilerlibs/ocamlbytecomp.cmxa \
otherlibs/dynlink/dynlink.cmxa \
compilerlibs/ocamlopttoplevel.cmxa \
compilerlibs/ocamltoplevel.cmxa \
$(TOPLEVELSTART:.cmo=.cmx)
$(CAMLOPT_CMD) $(LINKFLAGS) -linkall -I toplevel/native -o $@ $^

Expand All @@ -1025,7 +1025,7 @@ $(TOPLEVELSTART:.cmo=.cmx): $(TOPLEVELSTART:.cmo=.ml) \
partialclean::
rm -f ocamlnat ocamlnat.exe

toplevel/opttoploop.cmx: otherlibs/dynlink/dynlink.cmxa
toplevel/native/toploop.cmx: otherlibs/dynlink/dynlink.cmxa

# The numeric opcodes

Expand Down
6 changes: 3 additions & 3 deletions compilerlibs/Makefile.compilerlibs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@ compilerlibs/ocamltoplevel.cma: $(TOPLEVEL_CMI) $(TOPLEVEL)
partialclean::
rm -f compilerlibs/ocamltoplevel.cma

compilerlibs/ocamlopttoplevel.cmxa: $(OPTTOPLEVEL_CMI) $(OPTTOPLEVEL:.cmo=.cmx)
compilerlibs/ocamltoplevel.cmxa: $(OPTTOPLEVEL_CMI) $(OPTTOPLEVEL:.cmo=.cmx)
$(CAMLOPT) -a -o $@ -I toplevel/native $(OPTTOPLEVEL:.cmo=.cmx)
partialclean::
rm -f compilerlibs/ocamlopttoplevel.cmxa \
compilerlibs/ocamlopttoplevel.a compilerlibs/ocamlopttoplevel.lib
rm -f compilerlibs/ocamltoplevel.cmxa \
compilerlibs/ocamltoplevel.a compilerlibs/ocamltoplevel.lib
2 changes: 1 addition & 1 deletion toplevel/native/topdirs.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ let match_printer_type ppf desc typename =
let printer_type =
match
Env.find_type_by_name
(Ldot(Lident "Opttopdirs", typename)) !toplevel_env
(Ldot(Lident "Topdirs", typename)) !toplevel_env
with
| (path, _) -> path
| exception Not_found ->
Expand Down
4 changes: 2 additions & 2 deletions toplevel/native/toploop.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ let global_symbol id =
let sym = Compilenv.symbol_for_global id in
match Dynlink.unsafe_get_global_value ~bytecode_or_asm_symbol:sym with
| None ->
fatal_error ("Opttoploop.global_symbol " ^ (Ident.unique_name id))
fatal_error ("Toploop.global_symbol " ^ (Ident.unique_name id))
| Some obj -> obj

let need_symbol sym =
Expand All @@ -50,7 +50,7 @@ let dll_run dll entry =
| Result r ->
match Obj.magic r with
| Ok x -> Result x
| Err s -> fatal_error ("Opttoploop.dll_run " ^ s)
| Err s -> fatal_error ("Toploop.dll_run " ^ s)


type directive_fun =
Expand Down