From 305770510c1e53861ff1f76b2df9ca99439ea758 Mon Sep 17 00:00:00 2001
From: Valentin Perrelle <valentin.perrelle@cea.fr>
Date: Fri, 21 Jun 2019 14:05:47 +0200
Subject: [PATCH] [Kernel] allow escaping percent signs in -cpp-command
---
src/kernel_services/ast_queries/file.ml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/kernel_services/ast_queries/file.ml b/src/kernel_services/ast_queries/file.ml
index f825e1abdab..76162715fd6 100644
--- a/src/kernel_services/ast_queries/file.ml
+++ b/src/kernel_services/ast_queries/file.ml
@@ -398,12 +398,13 @@ let build_cpp_cmd cmdl supp_args in_file out_file =
and out_file = Filename.quote out_file in
let substitute s =
match Str.matched_string s with
+ | "%%" -> "%"
| "%args" -> supp_args
| "%1" | "%i" | "%input" -> in_file
| "%2" | "%o" | "%output" -> out_file
| s -> s (* Unrocognized parameters are left intact *)
in
- let regexp = Str.regexp "%[a-z0-9]+" in
+ let regexp = Str.regexp "%%\\|%[a-z0-9]+" in
try
ignore (Str.search_forward regexp cmdl 0); (* Try to find one match *)
Str.global_substitute regexp substitute cmdl
--
GitLab