Skip to content

Commit

Permalink
Revert "Spurious commit that makes rule generation unstable"
Browse files Browse the repository at this point in the history
This reverts commit 3fe8fe0.
  • Loading branch information
mbarbin committed Apr 5, 2024
1 parent 3fe8fe0 commit 133607e
Show file tree
Hide file tree
Showing 27 changed files with 159 additions and 159 deletions.
6 changes: 3 additions & 3 deletions doc/reference/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
and2_recursive.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:and2_recursive.bop}")))
(run %{bin:bopkit} fmt file %{dep:and2_recursive.bop})))

(rule
(alias fmt)
Expand All @@ -13,7 +13,7 @@
(rule
(with-stdout-to
one-of-each.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:one-of-each.bop}")))
(run %{bin:bopkit} fmt file %{dep:one-of-each.bop})))

(rule
(alias fmt)
Expand All @@ -23,7 +23,7 @@
(rule
(with-stdout-to
parametrized-block.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:parametrized-block.bop}")))
(run %{bin:bopkit} fmt file %{dep:parametrized-block.bop})))

(rule
(alias fmt)
Expand Down
6 changes: 3 additions & 3 deletions project/digital-watch/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
main.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:main.bop}")))
(run %{bin:bopkit} fmt file %{dep:main.bop})))

(rule
(alias fmt)
Expand All @@ -13,7 +13,7 @@
(rule
(with-stdout-to
watch.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:watch.bop}")))
(run %{bin:bopkit} fmt file %{dep:watch.bop})))

(rule
(alias fmt)
Expand All @@ -23,7 +23,7 @@
(rule
(with-stdout-to
watch_with_bopboard.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:watch_with_bopboard.bop}")))
(run %{bin:bopkit} fmt file %{dep:watch_with_bopboard.bop})))

(rule
(alias fmt)
Expand Down
4 changes: 2 additions & 2 deletions project/subleq/circuit/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
main.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:main.bop}")))
(run %{bin:bopkit} fmt file %{dep:main.bop})))

(rule
(alias fmt)
Expand All @@ -13,7 +13,7 @@
(rule
(with-stdout-to
subleq.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:subleq.bop}")))
(run %{bin:bopkit} fmt file %{dep:subleq.bop})))

(rule
(alias fmt)
Expand Down
2 changes: 1 addition & 1 deletion project/visa/circuit/dune.asm.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
calendar.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:calendar.asm}")))
(run %{bin:visa} fmt file %{dep:calendar.asm})))

(rule
(alias fmt)
Expand Down
6 changes: 3 additions & 3 deletions project/visa/circuit/dune.bop.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
calendar-output.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:calendar-output.bop}")))
(run %{bin:bopkit} fmt file %{dep:calendar-output.bop})))

(rule
(alias fmt)
Expand All @@ -13,7 +13,7 @@
(rule
(with-stdout-to
main.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:main.bop}")))
(run %{bin:bopkit} fmt file %{dep:main.bop})))

(rule
(alias fmt)
Expand All @@ -23,7 +23,7 @@
(rule
(with-stdout-to
visa.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:visa.bop}")))
(run %{bin:bopkit} fmt file %{dep:visa.bop})))

(rule
(alias fmt)
Expand Down
22 changes: 11 additions & 11 deletions project/visa/test/assembler/error/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
duplicated-constant.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:duplicated-constant.asm}")))
(run %{bin:visa} fmt file %{dep:duplicated-constant.asm})))

(rule
(alias fmt)
Expand All @@ -13,7 +13,7 @@
(rule
(with-stdout-to
duplicated-label.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:duplicated-label.asm}")))
(run %{bin:visa} fmt file %{dep:duplicated-label.asm})))

(rule
(alias fmt)
Expand All @@ -23,7 +23,7 @@
(rule
(with-stdout-to
duplicated-macro-parameter.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:duplicated-macro-parameter.asm}")))
(run %{bin:visa} fmt file %{dep:duplicated-macro-parameter.asm})))

(rule
(alias fmt)
Expand All @@ -35,7 +35,7 @@
(rule
(with-stdout-to
duplicated-macro.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:duplicated-macro.asm}")))
(run %{bin:visa} fmt file %{dep:duplicated-macro.asm})))

(rule
(alias fmt)
Expand All @@ -45,7 +45,7 @@
(rule
(with-stdout-to
invalid-arguments.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:invalid-arguments.asm}")))
(run %{bin:visa} fmt file %{dep:invalid-arguments.asm})))

(rule
(alias fmt)
Expand All @@ -55,7 +55,7 @@
(rule
(with-stdout-to
label-without-instruction.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:label-without-instruction.asm}")))
(run %{bin:visa} fmt file %{dep:label-without-instruction.asm})))

(rule
(alias fmt)
Expand All @@ -67,7 +67,7 @@
(rule
(with-stdout-to
undefined-macro.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:undefined-macro.asm}")))
(run %{bin:visa} fmt file %{dep:undefined-macro.asm})))

(rule
(alias fmt)
Expand All @@ -77,7 +77,7 @@
(rule
(with-stdout-to
unused-label.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:unused-label.asm}")))
(run %{bin:visa} fmt file %{dep:unused-label.asm})))

(rule
(alias fmt)
Expand All @@ -87,7 +87,7 @@
(rule
(with-stdout-to
unused-macro-parameter.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:unused-macro-parameter.asm}")))
(run %{bin:visa} fmt file %{dep:unused-macro-parameter.asm})))

(rule
(alias fmt)
Expand All @@ -97,7 +97,7 @@
(rule
(with-stdout-to
unused-macro.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:unused-macro.asm}")))
(run %{bin:visa} fmt file %{dep:unused-macro.asm})))

(rule
(alias fmt)
Expand All @@ -107,7 +107,7 @@
(rule
(with-stdout-to
unused-var.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:unused-var.asm}")))
(run %{bin:visa} fmt file %{dep:unused-var.asm})))

(rule
(alias fmt)
Expand Down
6 changes: 3 additions & 3 deletions project/visa/test/runtime/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
constant.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:constant.asm}")))
(run %{bin:visa} fmt file %{dep:constant.asm})))

(rule
(alias fmt)
Expand All @@ -13,7 +13,7 @@
(rule
(with-stdout-to
loop.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:loop.asm}")))
(run %{bin:visa} fmt file %{dep:loop.asm})))

(rule
(alias fmt)
Expand All @@ -23,7 +23,7 @@
(rule
(with-stdout-to
minus.asm.pp.output
(bash "%{bin:visa} fmt file %{dep:minus.asm}")))
(run %{bin:visa} fmt file %{dep:minus.asm})))

(rule
(alias fmt)
Expand Down
2 changes: 1 addition & 1 deletion stdlib/7-segment/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
7_segment.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:7_segment.bop}")))
(run %{bin:bopkit} fmt file %{dep:7_segment.bop})))

(rule
(alias fmt)
Expand Down
2 changes: 1 addition & 1 deletion stdlib/bopboard/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
bopboard.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:bopboard.bop}")))
(run %{bin:bopkit} fmt file %{dep:bopboard.bop})))

(rule
(alias fmt)
Expand Down
8 changes: 4 additions & 4 deletions stdlib/bopboard/example/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
bit_shift.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:bit_shift.bop}")))
(run %{bin:bopkit} fmt file %{dep:bit_shift.bop})))

(rule
(alias fmt)
Expand All @@ -13,7 +13,7 @@
(rule
(with-stdout-to
lights.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:lights.bop}")))
(run %{bin:bopkit} fmt file %{dep:lights.bop})))

(rule
(alias fmt)
Expand All @@ -23,7 +23,7 @@
(rule
(with-stdout-to
lights_bdd.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:lights_bdd.bop}")))
(run %{bin:bopkit} fmt file %{dep:lights_bdd.bop})))

(rule
(alias fmt)
Expand All @@ -33,7 +33,7 @@
(rule
(with-stdout-to
ram.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:ram.bop}")))
(run %{bin:bopkit} fmt file %{dep:ram.bop})))

(rule
(alias fmt)
Expand Down
4 changes: 2 additions & 2 deletions stdlib/counter/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
and.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:and.bop}")))
(run %{bin:bopkit} fmt file %{dep:and.bop})))

(rule
(alias fmt)
Expand All @@ -13,7 +13,7 @@
(rule
(with-stdout-to
out.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:out.bop}")))
(run %{bin:bopkit} fmt file %{dep:out.bop})))

(rule
(alias fmt)
Expand Down
2 changes: 1 addition & 1 deletion stdlib/counter/test/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
main.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:main.bop}")))
(run %{bin:bopkit} fmt file %{dep:main.bop})))

(rule
(alias fmt)
Expand Down
4 changes: 2 additions & 2 deletions stdlib/pulse/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
example.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:example.bop}")))
(run %{bin:bopkit} fmt file %{dep:example.bop})))

(rule
(alias fmt)
Expand All @@ -13,7 +13,7 @@
(rule
(with-stdout-to
pulse.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:pulse.bop}")))
(run %{bin:bopkit} fmt file %{dep:pulse.bop})))

(rule
(alias fmt)
Expand Down
2 changes: 1 addition & 1 deletion stdlib/pulse/test/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
main.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:main.bop}")))
(run %{bin:bopkit} fmt file %{dep:main.bop})))

(rule
(alias fmt)
Expand Down
2 changes: 1 addition & 1 deletion stdlib/stdlib/dune.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(rule
(with-stdout-to
stdlib.bop.pp.output
(bash "%{bin:bopkit} fmt file %{dep:stdlib.bop}")))
(run %{bin:bopkit} fmt file %{dep:stdlib.bop})))

(rule
(alias fmt)
Expand Down
Loading

0 comments on commit 133607e

Please sign in to comment.