[options] -cxx-parseable-output implies no unmangling

frama_Clang_option.ml

@@ -142,11 +142,16 @@ module ParseableOutput =
       let option_name = "-cxx-parseable-output"
       let help = "set up Frama-C pretty-printer to output C code that can be reparsed by Frama-C"
     end)
-let () =
-  ParseableOutput.add_set_hook
-    (fun _ f ->
-      let k = Kernel.dkey_print_attrs in
-      if f then Kernel.add_debug_keys k else Kernel.del_debug_keys k)
+
+let parseable_output_hook _ f =
+  let k = Kernel.dkey_print_attrs in
+  if f then begin
+      Kernel.add_debug_keys k;
+      Unmangling.set "none"
+    end
+  else Kernel.del_debug_keys k
+
+let () = ParseableOutput.add_set_hook parseable_output_hook
 
 module C_std_headers = 
   String(

tests/basic/printer.cpp

 /* run.config
 NOFRAMAC:
-EXECNOW: LOG printer.res.c @frama-c@ @PTEST_FILE@ @CXX@ @MACHDEP@ -cxx-unmangling none -cxx-parseable-output -ocode @PTEST_RESULT@/printer.res.c -print
+EXECNOW: LOG printer.res.c @frama-c@ @PTEST_FILE@ @CXX@ @MACHDEP@ -cxx-parseable-output -ocode @PTEST_RESULT@/printer.res.c -print
 EXECNOW: LOG printer.res2.c @frama-c@ @CXX@ @MACHDEP@ -cxx-unmangling without-qualifier @PTEST_RESULT@/printer.res.c -ocode @PTEST_RESULT@/printer.res2.c -print
 */