Skip to content

Compilation_unit optimisations #1035

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ fmt:
ocamlformat -i \
$$(find utils \
\( -name "*.ml" -or -name "*.mli" \))
ocamlformat -i \
$$(find ocaml/utils \
\( -name "*.ml" -or -name "*.mli" \))

.PHONY: check-fmt
check-fmt:
Expand All @@ -113,6 +116,7 @@ check-fmt:
[ "$$(git status --porcelain backend/cmm_helpers.ml{,i})" != "" ] || \
[ "$$(git status --porcelain backend/checkmach.ml{,i})" != "" ] || \
[ "$$(git status --porcelain tools/merge_archives.ml)" != "" ] || \
[ "$$(git status --porcelain ocaml/utils)" != "" ] || \
[ "$$(git status --porcelain utils)" != "" ]; then \
echo; \
echo "Tree must be clean before running 'make check-fmt'"; \
Expand All @@ -128,6 +132,7 @@ check-fmt:
[ "$$(git diff backend/cmm_helpers.ml{,i})" != "" ] || \
[ "$$(git diff backend/checkmach.ml{,i})" != "" ] || \
[ "$$(git diff tools/merge_archives.ml)" != "" ] || \
[ "$$(git diff ocaml/utils)" != "" ] || \
[ "$$(git diff utils)" != "" ]; then \
echo; \
echo "The following code was not formatted correctly:"; \
Expand Down
Binary file modified ocaml/boot/ocamlc
Binary file not shown.
Binary file modified ocaml/boot/ocamllex
Binary file not shown.
17 changes: 17 additions & 0 deletions ocaml/utils/.ocamlformat
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Please make a pull request to change this file.
disable=true
# There is an .ocamlformat-enable file in this directory.
# Keep the remainder of this file in sync with other .ocamlformat files in this repo.
assignment-operator=begin-line
cases-exp-indent=2
doc-comments=before
dock-collection-brackets=false
if-then-else=keyword-first
module-item-spacing=sparse
parens-tuple=multi-line-only
sequence-blank-line=compact
space-around-lists=false
space-around-variants=false
type-decl=sparse
wrap-comments=true
version=0.24.1
2 changes: 2 additions & 0 deletions ocaml/utils/.ocamlformat-enable
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
compilation_unit.ml
compilation_unit.mli
Loading