From 6d758cd63cb400bec6613bbc21b1a5d9e62a157d Mon Sep 17 00:00:00 2001
From: Mark Shinwell <mshinwell@pm.me>
Date: Tue, 1 Nov 2022 08:52:40 +0000
Subject: [PATCH] flambda-backend: Revert whitespace changes in dune files, to
 match upstream

---
 runtime/caml/dune    | 153 +++++++++++++++++++++----------------------
 tools/dune           |  88 +++++++++++++------------
 toplevel/native/dune |  52 +++++++--------
 3 files changed, 148 insertions(+), 145 deletions(-)

diff --git a/runtime/caml/dune b/runtime/caml/dune
index 98c39d82f32..d0fe7f4e314 100644
--- a/runtime/caml/dune
+++ b/runtime/caml/dune
@@ -14,90 +14,87 @@
 
 (rule
  (targets jumptbl.h)
- (mode fallback)
- (deps
-  (:h instruct.h))
+ (mode    fallback)
+ (deps (:h instruct.h))
  (action
-  (with-stdout-to
-   %{targets}
-   (bash
-    "cat %{h} | tr -d '\\r' | sed -n -e '/^  /s/ \\([A-Z]\\)/ \\&\\&lbl_\\1/gp' -e '/^}/q'"))))
+   (with-stdout-to %{targets}
+     (bash "cat %{h} | tr -d '\\r' | \
+            sed -n -e '/^  /s/ \\([A-Z]\\)/ \\&\\&lbl_\\1/gp' -e '/^}/q'"))))
 
 (rule
- (targets opnames.h)
- (deps instruct.h ../sak)
- (action
-  (run make -s -C .. COMPUTE_DEPS=false caml/opnames.h)))
+  (targets opnames.h)
+  (deps instruct.h ../sak)
+  (action (run make -s -C .. COMPUTE_DEPS=false caml/opnames.h)))
 
 (rule
  (targets version.h)
- (mode fallback)
+ (mode    fallback)
  (action
-  (with-stdout-to
-   %{targets}
-   (run %{dep:../../tools/make-version-header.sh} %{dep:../../VERSION}))))
+   (with-stdout-to %{targets}
+     (run %{dep:../../tools/make-version-header.sh} %{dep:../../VERSION}))))
 
 (install
- (files
-  (domain_state.tbl as caml/domain_state.tbl)
-  (address_class.h as caml/address_class.h)
-  (alloc.h as caml/alloc.h)
-  (backtrace.h as caml/backtrace.h)
-  (backtrace_prim.h as caml/backtrace_prim.h)
-  (bigarray.h as caml/bigarray.h)
-  (callback.h as caml/callback.h)
-  (codefrag.h as caml/codefrag.h)
-  (compact.h as caml/compact.h)
-  (compare.h as caml/compare.h)
-  (compatibility.h as caml/compatibility.h)
-  (config.h as caml/config.h)
-  (custom.h as caml/custom.h)
-  (debugger.h as caml/debugger.h)
-  (domain.h as caml/domain.h)
-  (domain_state.h as caml/domain_state.h)
-  (dynlink.h as caml/dynlink.h)
-  (eventlog.h as caml/eventlog.h)
-  (exec.h as caml/exec.h)
-  (fail.h as caml/fail.h)
-  (finalise.h as caml/finalise.h)
-  (fix_code.h as caml/fix_code.h)
-  (freelist.h as caml/freelist.h)
-  (gc.h as caml/gc.h)
-  (gc_ctrl.h as caml/gc_ctrl.h)
-  (globroots.h as caml/globroots.h)
-  (hash.h as caml/hash.h)
-  (hooks.h as caml/hooks.h)
-  (instrtrace.h as caml/instrtrace.h)
-  (instruct.h as caml/instruct.h)
-  (interp.h as caml/interp.h)
-  (intext.h as caml/intext.h)
-  (io.h as caml/io.h)
-  (jumptbl.h as caml/jumptbl.h)
-  (m.h as caml/m.h)
-  (major_gc.h as caml/major_gc.h)
-  (md5.h as caml/md5.h)
-  (memory.h as caml/memory.h)
-  (memprof.h as caml/memprof.h)
-  (minor_gc.h as caml/minor_gc.h)
-  (misc.h as caml/misc.h)
-  (mlvalues.h as caml/mlvalues.h)
-  (opnames.h as caml/opnames.h)
-  (osdeps.h as caml/osdeps.h)
-  (prims.h as caml/prims.h)
-  (printexc.h as caml/printexc.h)
-  (reverse.h as caml/reverse.h)
-  (roots.h as caml/roots.h)
-  (s.h as caml/s.h)
-  (signals.h as caml/signals.h)
-  (skiplist.h as caml/skiplist.h)
-  (signals_machdep.h as caml/signals_machdep.h)
-  (stack.h as caml/stack.h)
-  (stacks.h as caml/stacks.h)
-  (startup.h as caml/startup.h)
-  (startup_aux.h as caml/startup_aux.h)
-  (sys.h as caml/sys.h)
-  (ui.h as caml/ui.h)
-  (version.h as caml/version.h)
-  (weak.h as caml/weak.h))
- (section lib)
- (package ocaml_runtime_stdlib))
+  (files
+    (domain_state.tbl as caml/domain_state.tbl)
+    (address_class.h as caml/address_class.h)
+    (alloc.h as caml/alloc.h)
+    (backtrace.h as caml/backtrace.h)
+    (backtrace_prim.h as caml/backtrace_prim.h)
+    (bigarray.h as caml/bigarray.h)
+    (callback.h as caml/callback.h)
+    (codefrag.h as caml/codefrag.h)
+    (compact.h as caml/compact.h)
+    (compare.h as caml/compare.h)
+    (compatibility.h as caml/compatibility.h)
+    (config.h as caml/config.h)
+    (custom.h as caml/custom.h)
+    (debugger.h as caml/debugger.h)
+    (domain.h as caml/domain.h)
+    (domain_state.h as caml/domain_state.h)
+    (dynlink.h as caml/dynlink.h)
+    (eventlog.h as caml/eventlog.h)
+    (exec.h as caml/exec.h)
+    (fail.h as caml/fail.h)
+    (finalise.h as caml/finalise.h)
+    (fix_code.h as caml/fix_code.h)
+    (freelist.h as caml/freelist.h)
+    (gc.h as caml/gc.h)
+    (gc_ctrl.h as caml/gc_ctrl.h)
+    (globroots.h as caml/globroots.h)
+    (hash.h as caml/hash.h)
+    (hooks.h as caml/hooks.h)
+    (instrtrace.h as caml/instrtrace.h)
+    (instruct.h as caml/instruct.h)
+    (interp.h as caml/interp.h)
+    (intext.h as caml/intext.h)
+    (io.h as caml/io.h)
+    (jumptbl.h as caml/jumptbl.h)
+    (m.h as caml/m.h)
+    (major_gc.h as caml/major_gc.h)
+    (md5.h as caml/md5.h)
+    (memory.h as caml/memory.h)
+    (memprof.h as caml/memprof.h)
+    (minor_gc.h as caml/minor_gc.h)
+    (misc.h as caml/misc.h)
+    (mlvalues.h as caml/mlvalues.h)
+    (opnames.h as caml/opnames.h)
+    (osdeps.h as caml/osdeps.h)
+    (prims.h as caml/prims.h)
+    (printexc.h as caml/printexc.h)
+    (reverse.h as caml/reverse.h)
+    (roots.h as caml/roots.h)
+    (s.h as caml/s.h)
+    (signals.h as caml/signals.h)
+    (skiplist.h as caml/skiplist.h)
+    (signals_machdep.h as caml/signals_machdep.h)
+    (stack.h as caml/stack.h)
+    (stacks.h as caml/stacks.h)
+    (startup.h as caml/startup.h)
+    (startup_aux.h as caml/startup_aux.h)
+    (sys.h as caml/sys.h)
+    (ui.h as caml/ui.h)
+    (version.h as caml/version.h)
+    (weak.h as caml/weak.h)
+  )
+  (section lib)
+  (package ocaml_runtime_stdlib))
diff --git a/tools/dune b/tools/dune
index 666cb7cc39e..878c3b6836e 100644
--- a/tools/dune
+++ b/tools/dune
@@ -13,71 +13,77 @@
 ;**************************************************************************
 
 (executable
- (name objinfo)
- (modes byte native)
- (modules objinfo)
- (libraries ocamlcommon ocamlbytecomp ocamloptcomp))
+  (name objinfo)
+  (modes byte native)
+  (modules objinfo)
+  (libraries ocamlcommon ocamlbytecomp ocamloptcomp))
 
 (executables
- (names make_opcodes cvt_emit)
+ (names   make_opcodes cvt_emit)
  (modules make_opcodes cvt_emit))
 
 (ocamllex
  (modules make_opcodes)
- (mode fallback))
+ (mode    fallback))
 
 (ocamllex
  (modules cvt_emit)
- (mode fallback))
+ (mode    fallback))
 
 (executable
- (name ocamldep)
- (modes byte native)
- (modules ocamldep)
- (libraries ocamlcommon ocamlbytecomp))
+  (name ocamldep)
+  (modes byte native)
+  (modules ocamldep)
+  (libraries ocamlcommon ocamlbytecomp))
 
 (install
- (files
-  (ocamldep.bc as ocamldep.byte)
-  (ocamldep.exe as ocamldep.opt))
- (section bin)
- (package ocaml))
+  (files
+    (ocamldep.bc as ocamldep.byte)
+    (ocamldep.exe as ocamldep.opt)
+  )
+  (section bin)
+  (package ocaml))
 
 (executable
- (name cmpbyt)
- (modes byte)
- (modules cmpbyt)
- (libraries ocamlcommon ocamlbytecomp))
+  (name cmpbyt)
+  (modes byte)
+  (modules cmpbyt)
+  (libraries ocamlcommon ocamlbytecomp))
 
 (executable
- (name ocamlmklib)
- (modes byte native)
- (modules ocamlmklib)
- (libraries ocamlcommon ocamlbytecomp))
+  (name ocamlmklib)
+  (modes byte native)
+  (modules ocamlmklib)
+  (libraries ocamlcommon ocamlbytecomp))
 
 (install
- (files
-  (ocamlmklib.bc as ocamlmklib.byte)
-  (ocamlmklib.exe as ocamlmklib.opt))
- (section bin)
- (package ocaml))
+  (files
+    (ocamlmklib.bc as ocamlmklib.byte)
+    (ocamlmklib.exe as ocamlmklib.opt)
+  )
+  (section bin)
+  (package ocaml))
 
 (executable
- (name ocamlmktop)
- (modes byte native)
- (modules ocamlmktop)
- (libraries ocamlcommon ocamlbytecomp))
+  (name ocamlmktop)
+  (modes byte native)
+  (modules ocamlmktop)
+  (libraries ocamlcommon ocamlbytecomp))
 
 (install
- (files
-  (ocamlmktop.bc as ocamlmktop.byte)
-  (ocamlmktop.exe as ocamlmktop.opt))
- (section bin)
- (package ocaml))
+  (files
+    (ocamlmktop.bc as ocamlmktop.byte)
+    (ocamlmktop.exe as ocamlmktop.opt)
+  )
+  (section bin)
+  (package ocaml))
 
 (install
- (files eventlog_metadata)
- (section lib)
- (package ocaml))
+  (files
+    eventlog_metadata
+  )
+  (section lib)
+  (package ocaml))
+
 
 ; ocamlcp, ocamloptp and ocamlprof are not currently supported.
diff --git a/toplevel/native/dune b/toplevel/native/dune
index 7da3d8421b6..40e6dea42d4 100644
--- a/toplevel/native/dune
+++ b/toplevel/native/dune
@@ -12,31 +12,31 @@
 ;*                                                                        *
 ;**************************************************************************
 
-;(copy_files# ../*.ml*)
-;
-;(library
-; (name ocamltoplevel_native)
-; (wrapped false)
-; (modes native)
-; (flags (:standard -principal))
-; (libraries ocamlcommon ocamloptcomp dynlink_internal)
-; (modules :standard \ topstart expunge))
-;
-;(executable
-; (name topstart)
-; (modes native)
-; (flags (:standard -principal))
-; (modules topstart)
-; (libraries ocamltoplevel_native))
-;
-;(install
-;  (files
-;    (topstart.exe as ocamlnat)
-;  )
-;  (section bin)
-;  (package ocaml))
-;
-;
+; (copy_files# ../*.ml*)
+; 
+; (library
+;  (name ocamltoplevel_native)
+;  (wrapped false)
+;  (modes native)
+;  (flags (:standard -principal))
+;  (libraries ocamlcommon ocamloptcomp dynlink_internal)
+;  (modules :standard \ topstart expunge))
+; 
+; (executable
+;  (name topstart)
+;  (modes native)
+;  (flags (:standard -principal))
+;  (modules topstart)
+;  (libraries ocamltoplevel_native))
+; 
+; (install
+;   (files
+;     (topstart.exe as ocamlnat)
+;   )
+;   (section bin)
+;   (package ocaml))
+; 
+; 
 ; (install
 ;   (files
 ;     (ocamltoplevel.cma as compiler-libs/ocamltoplevel.cma)
@@ -63,4 +63,4 @@
 ;   )
 ;   (section lib)
 ;   (package ocaml))
-;
+;