From bd8cf09f9ee5ad1b72647d7820a781e4ea48c69d Mon Sep 17 00:00:00 2001 From: Sander Spies Date: Mon, 17 Feb 2020 13:41:59 +0100 Subject: [PATCH 1/4] Promote generated error files by dune. --- src/passes/1-parser/cameligo/.gitignore | 4 +++- src/passes/1-parser/cameligo/dune | 2 ++ src/passes/1-parser/pascaligo/.gitignore | 4 +++- src/passes/1-parser/pascaligo/dune | 2 ++ src/passes/1-parser/reasonligo/.gitignore | 4 +++- src/passes/1-parser/reasonligo/dune | 2 ++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/passes/1-parser/cameligo/.gitignore b/src/passes/1-parser/cameligo/.gitignore index cca52dc59..1a88cfbcd 100644 --- a/src/passes/1-parser/cameligo/.gitignore +++ b/src/passes/1-parser/cameligo/.gitignore @@ -10,4 +10,6 @@ _build/* /Parser.ml /Lexer.ml /LexToken.ml -/Tests \ No newline at end of file +/Tests +error.messages +error.messages.new \ No newline at end of file diff --git a/src/passes/1-parser/cameligo/dune b/src/passes/1-parser/cameligo/dune index 85a06d174..0cbda7ed5 100644 --- a/src/passes/1-parser/cameligo/dune +++ b/src/passes/1-parser/cameligo/dune @@ -95,6 +95,7 @@ (rule (targets error.messages) + (mode promote-until-clean) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} @@ -114,6 +115,7 @@ (rule (target error.messages.new) + (mode promote-until-clean) (action (with-stdout-to %{target} (run diff --git a/src/passes/1-parser/pascaligo/.gitignore b/src/passes/1-parser/pascaligo/.gitignore index cca52dc59..1a88cfbcd 100644 --- a/src/passes/1-parser/pascaligo/.gitignore +++ b/src/passes/1-parser/pascaligo/.gitignore @@ -10,4 +10,6 @@ _build/* /Parser.ml /Lexer.ml /LexToken.ml -/Tests \ No newline at end of file +/Tests +error.messages +error.messages.new \ No newline at end of file diff --git a/src/passes/1-parser/pascaligo/dune b/src/passes/1-parser/pascaligo/dune index a63252fe7..cc5cf52c8 100644 --- a/src/passes/1-parser/pascaligo/dune +++ b/src/passes/1-parser/pascaligo/dune @@ -96,6 +96,7 @@ (rule (targets error.messages) + (mode promote-until-clean) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} @@ -115,6 +116,7 @@ (rule (target error.messages.new) + (mode promote-until-clean) (action (with-stdout-to %{target} (run diff --git a/src/passes/1-parser/reasonligo/.gitignore b/src/passes/1-parser/reasonligo/.gitignore index cca52dc59..1a88cfbcd 100644 --- a/src/passes/1-parser/reasonligo/.gitignore +++ b/src/passes/1-parser/reasonligo/.gitignore @@ -10,4 +10,6 @@ _build/* /Parser.ml /Lexer.ml /LexToken.ml -/Tests \ No newline at end of file +/Tests +error.messages +error.messages.new \ No newline at end of file diff --git a/src/passes/1-parser/reasonligo/dune b/src/passes/1-parser/reasonligo/dune index f89578a4c..2b0dc00f4 100644 --- a/src/passes/1-parser/reasonligo/dune +++ b/src/passes/1-parser/reasonligo/dune @@ -96,6 +96,7 @@ (rule (targets error.messages) + (mode promote-until-clean) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} @@ -115,6 +116,7 @@ (rule (target error.messages.new) + (mode promote-until-clean) (action (with-stdout-to %{target} (run From eafbe83151b4c48780863a6f8753ad2f9601e91e Mon Sep 17 00:00:00 2001 From: Sander Spies Date: Mon, 17 Feb 2020 17:49:48 +0100 Subject: [PATCH 2/4] Also promote ParErr.ml --- src/passes/1-parser/cameligo/.gitignore | 3 ++- src/passes/1-parser/cameligo/dune | 1 + src/passes/1-parser/pascaligo/.gitignore | 3 ++- src/passes/1-parser/pascaligo/dune | 1 + src/passes/1-parser/reasonligo/.gitignore | 3 ++- src/passes/1-parser/reasonligo/dune | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/passes/1-parser/cameligo/.gitignore b/src/passes/1-parser/cameligo/.gitignore index 1a88cfbcd..29e7b3c41 100644 --- a/src/passes/1-parser/cameligo/.gitignore +++ b/src/passes/1-parser/cameligo/.gitignore @@ -12,4 +12,5 @@ _build/* /LexToken.ml /Tests error.messages -error.messages.new \ No newline at end of file +error.messages.new +ParErr.ml \ No newline at end of file diff --git a/src/passes/1-parser/cameligo/dune b/src/passes/1-parser/cameligo/dune index 0cbda7ed5..e40be06a7 100644 --- a/src/passes/1-parser/cameligo/dune +++ b/src/passes/1-parser/cameligo/dune @@ -156,6 +156,7 @@ (rule (targets ParErr.ml) + (mode promote-until-clean) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} diff --git a/src/passes/1-parser/pascaligo/.gitignore b/src/passes/1-parser/pascaligo/.gitignore index 1a88cfbcd..29e7b3c41 100644 --- a/src/passes/1-parser/pascaligo/.gitignore +++ b/src/passes/1-parser/pascaligo/.gitignore @@ -12,4 +12,5 @@ _build/* /LexToken.ml /Tests error.messages -error.messages.new \ No newline at end of file +error.messages.new +ParErr.ml \ No newline at end of file diff --git a/src/passes/1-parser/pascaligo/dune b/src/passes/1-parser/pascaligo/dune index cc5cf52c8..b5764aa15 100644 --- a/src/passes/1-parser/pascaligo/dune +++ b/src/passes/1-parser/pascaligo/dune @@ -157,6 +157,7 @@ (rule (targets ParErr.ml) + (mode promote-until-clean) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} diff --git a/src/passes/1-parser/reasonligo/.gitignore b/src/passes/1-parser/reasonligo/.gitignore index 1a88cfbcd..29e7b3c41 100644 --- a/src/passes/1-parser/reasonligo/.gitignore +++ b/src/passes/1-parser/reasonligo/.gitignore @@ -12,4 +12,5 @@ _build/* /LexToken.ml /Tests error.messages -error.messages.new \ No newline at end of file +error.messages.new +ParErr.ml \ No newline at end of file diff --git a/src/passes/1-parser/reasonligo/dune b/src/passes/1-parser/reasonligo/dune index 2b0dc00f4..8a64c75ed 100644 --- a/src/passes/1-parser/reasonligo/dune +++ b/src/passes/1-parser/reasonligo/dune @@ -157,6 +157,7 @@ (rule (targets ParErr.ml) + (mode promote-until-clean) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} From 1fbbc0931345bfa8734c08deda0615461d9c56de Mon Sep 17 00:00:00 2001 From: Tom Jack Date: Wed, 22 Apr 2020 11:37:18 -0500 Subject: [PATCH 3/4] promote (until-clean) (only *) ? --- src/passes/1-parser/cameligo/dune | 6 +++--- src/passes/1-parser/pascaligo/dune | 6 +++--- src/passes/1-parser/reasonligo/dune | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/passes/1-parser/cameligo/dune b/src/passes/1-parser/cameligo/dune index e40be06a7..808fc54ed 100644 --- a/src/passes/1-parser/cameligo/dune +++ b/src/passes/1-parser/cameligo/dune @@ -95,7 +95,7 @@ (rule (targets error.messages) - (mode promote-until-clean) + (mode (promote (until-clean) (only *)))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} @@ -115,7 +115,7 @@ (rule (target error.messages.new) - (mode promote-until-clean) + (mode (promote (until-clean) (only *)))) (action (with-stdout-to %{target} (run @@ -156,7 +156,7 @@ (rule (targets ParErr.ml) - (mode promote-until-clean) + (mode (promote (until-clean) (only *)))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} diff --git a/src/passes/1-parser/pascaligo/dune b/src/passes/1-parser/pascaligo/dune index b5764aa15..2cdf3ec94 100644 --- a/src/passes/1-parser/pascaligo/dune +++ b/src/passes/1-parser/pascaligo/dune @@ -96,7 +96,7 @@ (rule (targets error.messages) - (mode promote-until-clean) + (mode (promote (until-clean) (only *)))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} @@ -116,7 +116,7 @@ (rule (target error.messages.new) - (mode promote-until-clean) + (mode (promote (until-clean) (only *)))) (action (with-stdout-to %{target} (run @@ -157,7 +157,7 @@ (rule (targets ParErr.ml) - (mode promote-until-clean) + (mode (promote (until-clean) (only *)))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} diff --git a/src/passes/1-parser/reasonligo/dune b/src/passes/1-parser/reasonligo/dune index 8a64c75ed..85d4a2671 100644 --- a/src/passes/1-parser/reasonligo/dune +++ b/src/passes/1-parser/reasonligo/dune @@ -96,7 +96,7 @@ (rule (targets error.messages) - (mode promote-until-clean) + (mode (promote (until-clean) (only *)))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} @@ -116,7 +116,7 @@ (rule (target error.messages.new) - (mode promote-until-clean) + (mode (promote (until-clean) (only *)))) (action (with-stdout-to %{target} (run @@ -157,7 +157,7 @@ (rule (targets ParErr.ml) - (mode promote-until-clean) + (mode (promote (until-clean) (only *)))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} From c58e3220a7dae9a8872d2f2b134652b074bc627c Mon Sep 17 00:00:00 2001 From: Tom Jack Date: Wed, 22 Apr 2020 12:04:21 -0500 Subject: [PATCH 4/4] fix bad sed --- src/passes/1-parser/cameligo/dune | 6 +++--- src/passes/1-parser/pascaligo/dune | 6 +++--- src/passes/1-parser/reasonligo/dune | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/passes/1-parser/cameligo/dune b/src/passes/1-parser/cameligo/dune index 808fc54ed..02b8f3663 100644 --- a/src/passes/1-parser/cameligo/dune +++ b/src/passes/1-parser/cameligo/dune @@ -95,7 +95,7 @@ (rule (targets error.messages) - (mode (promote (until-clean) (only *)))) + (mode (promote (until-clean) (only *))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} @@ -115,7 +115,7 @@ (rule (target error.messages.new) - (mode (promote (until-clean) (only *)))) + (mode (promote (until-clean) (only *))) (action (with-stdout-to %{target} (run @@ -156,7 +156,7 @@ (rule (targets ParErr.ml) - (mode (promote (until-clean) (only *)))) + (mode (promote (until-clean) (only *))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} diff --git a/src/passes/1-parser/pascaligo/dune b/src/passes/1-parser/pascaligo/dune index 2cdf3ec94..ca4865ae9 100644 --- a/src/passes/1-parser/pascaligo/dune +++ b/src/passes/1-parser/pascaligo/dune @@ -96,7 +96,7 @@ (rule (targets error.messages) - (mode (promote (until-clean) (only *)))) + (mode (promote (until-clean) (only *))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} @@ -116,7 +116,7 @@ (rule (target error.messages.new) - (mode (promote (until-clean) (only *)))) + (mode (promote (until-clean) (only *))) (action (with-stdout-to %{target} (run @@ -157,7 +157,7 @@ (rule (targets ParErr.ml) - (mode (promote (until-clean) (only *)))) + (mode (promote (until-clean) (only *))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} diff --git a/src/passes/1-parser/reasonligo/dune b/src/passes/1-parser/reasonligo/dune index 85d4a2671..b8f57b665 100644 --- a/src/passes/1-parser/reasonligo/dune +++ b/src/passes/1-parser/reasonligo/dune @@ -96,7 +96,7 @@ (rule (targets error.messages) - (mode (promote (until-clean) (only *)))) + (mode (promote (until-clean) (only *))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets} @@ -116,7 +116,7 @@ (rule (target error.messages.new) - (mode (promote (until-clean) (only *)))) + (mode (promote (until-clean) (only *))) (action (with-stdout-to %{target} (run @@ -157,7 +157,7 @@ (rule (targets ParErr.ml) - (mode (promote (until-clean) (only *)))) + (mode (promote (until-clean) (only *))) (deps Parser.mly ParToken.mly error.messages.checked-in LexToken.mli) (action (with-stdout-to %{targets}