Skip to content
Snippets Groups Projects
Commit a35f0541 authored by Allan Blanchard's avatar Allan Blanchard
Browse files

Merge branch 'fix/blanchard/all/warnings' into 'master'

Fix warnings 67 and 69

See merge request frama-c/frama-c!4287
parents 43aabbbe 0def89be
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 36 deletions
...@@ -59,7 +59,6 @@ module C_preprocessor = struct (* This could be put in Dune? *) ...@@ -59,7 +59,6 @@ module C_preprocessor = struct (* This could be put in Dune? *)
type t = type t =
{ preprocessor: string { preprocessor: string
; pp_opt: string option ; pp_opt: string option
; is_gnu: bool
} }
let stdout_contains out str = let stdout_contains out str =
...@@ -97,24 +96,9 @@ module C_preprocessor = struct (* This could be put in Dune? *) ...@@ -97,24 +96,9 @@ module C_preprocessor = struct (* This could be put in Dune? *)
Temp.create ~dir ~suffix:".c" (fun name -> write_file name code) in Temp.create ~dir ~suffix:".c" (fun name -> write_file name code) in
C.Process.run configurator ~dir preprocessor (options @ [ file ]) C.Process.run configurator ~dir preprocessor (options @ [ file ])
let is_gnu configurator preprocessor =
let code = {|#ifdef _FC_UNDEFINED_SYMBOL
#error This should not remain after preprocessing
#endif
int kept_after_preprocessing = 42;
|}
in
(* GNU preprocessors are always compatible with '-E'.
For 'cpp', the '-E' flag is unnecessary, but still works. *)
let result = call configurator preprocessor ["-E"] code in
result.exit_code = 0 &&
stdout_contains result.stdout "kept_after_preprocessing" &&
not (stdout_contains result.stdout "should not remain")
let get configurator = let get configurator =
let preprocessor, pp_opt = find_preprocessor configurator in let preprocessor, pp_opt = find_preprocessor configurator in
let is_gnu = is_gnu configurator preprocessor in { preprocessor ; pp_opt }
{ preprocessor ; pp_opt; is_gnu }
let preprocess configurator t options code = let preprocess configurator t options code =
call configurator t.preprocessor (Option.to_list t.pp_opt @ options) code call configurator t.preprocessor (Option.to_list t.pp_opt @ options) code
......
(lang dune 3.2) (lang dune 3.3)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;; ;; ;;
;; This file is part of Frama-C. ;; ;; This file is part of Frama-C. ;;
......
(lang dune 3.2) (lang dune 3.3)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;; ;; ;;
;; This file is part of Frama-C. ;; ;; This file is part of Frama-C. ;;
......
(lang dune 3.2) (lang dune 3.3)
(context (context
(default (default
(name bench) (name bench)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-example) (name frama-c-example)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-example) (name frama-c-example)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-example) (name frama-c-example)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-example) (name frama-c-example)
......
(lang dune 3.2) (lang dune 3.3)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;; ;; ;;
;; This file is part of Frama-C. ;; ;; This file is part of Frama-C. ;;
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-hello) (name frama-c-hello)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-hello) (name frama-c-hello)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-hello) (name frama-c-hello)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-hello) (name frama-c-hello)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-hello) (name frama-c-hello)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-hello) (name frama-c-hello)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-hello) (name frama-c-hello)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-view-cfg) (name frama-c-view-cfg)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-view-cfg) (name frama-c-view-cfg)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-view-cfg) (name frama-c-view-cfg)
......
(lang dune 3.2) (lang dune 3.3)
(using dune_site 0.1) (using dune_site 0.1)
(name frama-c-view-cfg) (name frama-c-view-cfg)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment